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-r2.ebuild
Date: Sun, 05 Apr 2009 20:39:20
Message-Id: E1LqZ7d-0000zB-9Y@stork.gentoo.org
1 pva 09/04/05 20:39:17
2
3 Modified: ChangeLog
4 Added: sarg-2.2.5-r2.ebuild
5 Log:
6 Small rework of getword-boundary-limit.patch, now we issue warning instead of exit(1) in case a limit at getword was not enough to handle word. Add fix for bug #263802, thank cpa for report and Dmitriy Bogun for usefull backtrace.
7 (Portage version: 2.2_rc28/cvs/Linux i686)
8
9 Revision Changes Path
10 1.48 net-analyzer/sarg/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/ChangeLog?rev=1.48&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/ChangeLog?rev=1.48&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/ChangeLog?r1=1.47&r2=1.48
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v
19 retrieving revision 1.47
20 retrieving revision 1.48
21 diff -u -r1.47 -r1.48
22 --- ChangeLog 24 Mar 2009 18:54:14 -0000 1.47
23 +++ ChangeLog 5 Apr 2009 20:39:17 -0000 1.48
24 @@ -1,6 +1,14 @@
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.47 2009/03/24 18:54:14 ranger Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.48 2009/04/05 20:39:17 pva Exp $
29 +
30 +*sarg-2.2.5-r2 (05 Apr 2009)
31 +
32 + 05 Apr 2009; Peter Volkov <pva@g.o> +sarg-2.2.5-r2.ebuild:
33 + Small rework of getword-boundary-limit.patch, now we issue warning instead
34 + of exit(1) in case a limit at getword was not enough to handle word. Add
35 + fix for bug #263802, thank cpa for report and Dmitriy Bogun for usefull
36 + backtrace.
37
38 24 Mar 2009; Brent Baude <ranger@g.o> sarg-2.2.5-r1.ebuild:
39 Marking sarg-2.2.5-r1 ppc for bug 222121
40
41
42
43 1.1 net-analyzer/sarg/sarg-2.2.5-r2.ebuild
44
45 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/sarg-2.2.5-r2.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/sarg-2.2.5-r2.ebuild?rev=1.1&content-type=text/plain
47
48 Index: sarg-2.2.5-r2.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-r2.ebuild,v 1.1 2009/04/05 20:39:17 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-2.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 }