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