Gentoo Archives: gentoo-commits

From: "Peter Volkov (pva)" <pva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/sarg: ChangeLog sarg-2.2.5-r1.ebuild
Date: Mon, 23 Mar 2009 09:05:31
Message-Id: E1Llg62-0007Zi-FU@stork.gentoo.org
1 pva 09/03/23 09:05:26
2
3 Modified: ChangeLog
4 Added: sarg-2.2.5-r1.ebuild
5 Log:
6 Fixed misc security vulnerabilities, bug #222121, thank Robert Buchholz for report and Klaus Singvogel for investigation/fixes.
7 (Portage version: 2.2_rc26/cvs/Linux i686)
8
9 Revision Changes Path
10 1.45 net-analyzer/sarg/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/ChangeLog?rev=1.45&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/ChangeLog?rev=1.45&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/ChangeLog?r1=1.44&r2=1.45
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v
19 retrieving revision 1.44
20 retrieving revision 1.45
21 diff -u -r1.44 -r1.45
22 --- ChangeLog 16 Mar 2009 16:30:01 -0000 1.44
23 +++ ChangeLog 23 Mar 2009 09:05:26 -0000 1.45
24 @@ -1,6 +1,12 @@
25 # ChangeLog for net-analyzer/sarg
26 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.44 2009/03/16 16:30:01 pva Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.45 2009/03/23 09:05:26 pva Exp $
29 +
30 +*sarg-2.2.5-r1 (23 Mar 2009)
31 +
32 + 23 Mar 2009; Peter Volkov <pva@g.o> +sarg-2.2.5-r1.ebuild:
33 + Fixed misc security vulnerabilities, bug #222121, thank Robert Buchholz
34 + for report and Klaus Singvogel for investigation/fixes.
35
36 16 Mar 2009; Peter Volkov <pva@g.o> -sarg-2.2.4.ebuild,
37 sarg-2.2.5.ebuild:
38
39
40
41 1.1 net-analyzer/sarg/sarg-2.2.5-r1.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/sarg-2.2.5-r1.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/sarg-2.2.5-r1.ebuild?rev=1.1&content-type=text/plain
45
46 Index: sarg-2.2.5-r1.ebuild
47 ===================================================================
48 # Copyright 1999-2009 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.5-r1.ebuild,v 1.1 2009/03/23 09:05:26 pva Exp $
51
52 EAPI="2"
53
54 inherit eutils autotools
55
56 DESCRIPTION="Squid Analysis Report Generator"
57 HOMEPAGE="http://sarg.sourceforge.net/sarg.php"
58 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
59 mirror://gentoo/${P}-patchset-1.tar.bz2"
60
61 LICENSE="GPL-2"
62 KEYWORDS="~amd64 ~ppc ~x86"
63 SLOT="0"
64 IUSE=""
65
66 DEPEND="media-libs/gd[png,truetype]"
67 RDEPEND="${DEPEND}"
68
69 src_prepare() {
70 EPATCH_SOURCE="${WORKDIR}/patches/" EPATCH_SUFFIX="patch" epatch
71
72 einfo "Running sed to substitute paths..."
73 sed \
74 -e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \
75 -e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
76 -e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \
77 -i sarg.conf || die
78
79 sed \
80 -e 's:"/usr/local/squid/var/logs/access.log":"/var/log/squid/access.log":' \
81 -e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
82 -e 's:"/usr/local/sarg/passwd":"/etc/sarg/passwd":' \
83 -i log.c || die #43132
84
85 sed -e 's:/usr/local/sarg/passwd:/etc/sarg/passwd:' \
86 -i htaccess || die
87
88 sed -e 's:/usr/local/squid/logs/access.log:/var/log/squid/access.log:' \
89 -i splitlog.c convlog.c || die
90
91 sed -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
92 -e 's:/usr/local/squid/etc/passwd:/etc/squid/passwd:' \
93 -i user_limit_block || die
94
95 sed -e 's:/usr/local/squid/etc/block.txt:/etc/squid/etc/block.txt:' \
96 -i sarg-php/sarg-block-it.php || die
97
98 sed -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
99 -e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
100 -e 's:/usr/local/squid/logs/access.log:/var/log/squid/access.log:' \
101 -i sarg.1 sarg-php/sarg-squidguard-block.php || die
102
103 sed -i -e 's:sarg_tmp:sarg:' email.c || die #64743
104 eautoreconf
105 }
106
107 src_configure() {
108 econf \
109 --enable-bindir=/usr/bin \
110 --enable-mandir=/usr/share/man/man1 \
111 --enable-sysconfdir=/etc/sarg/
112 }
113
114 src_install() {
115 # This is workaround for sarg installation script, which does not create dirs
116 dodir /etc/sarg /usr/sbin
117
118 make \
119 BINDIR="${D}"/usr/sbin \
120 MANDIR="${D}"/usr/share/man/man1 \
121 SYSCONFDIR="${D}"/etc/sarg \
122 HTMLDIR="${D}"/var/www/html \
123 install || die "sarg installation failed"
124
125 dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess
126 }