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