Vulnerable (bug #222121).
authorJeroen Roovers <jer@gentoo.org>
Sat, 10 Apr 2010 05:08:16 +0000 (05:08 +0000)
committerJeroen Roovers <jer@gentoo.org>
Sat, 10 Apr 2010 05:08:16 +0000 (05:08 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux i686

net-analyzer/sarg/Manifest
net-analyzer/sarg/files/sarg-2.2.3.1-rewind.patch [deleted file]
net-analyzer/sarg/sarg-2.2.5-r1.ebuild [deleted file]
net-analyzer/sarg/sarg-2.2.5.ebuild [deleted file]

index 9f4b67cfef5624afa8f3117e93b7c31f8f0c48c7..e6701dadf0f77027b838f7e48ac2cf4abed9bb2e 100644 (file)
@@ -1,10 +1,5 @@
-AUX sarg-2.2.3.1-rewind.patch 450 RMD160 02eb366d4dfef00bdeb1683de09f48d79c6206bc SHA1 4ab1874a13ad580a1074387ea78593672381c855 SHA256 5652fa70ac5f074f43fbabd4f4cbd1875a39924da6550f4a821b826e0efa0cc6
-DIST sarg-2.2.3.1-lots-of-compiler-warnings.patch.gz 6237 RMD160 67353fb39434bb5af8ac4c620643da1baf9336d1 SHA1 25630404296156565489d506ddd09b3c0991a8a0 SHA256 d68a9cfddf4886714fe53c4264cbbd992c8f0780c488515af2a9e1fbad016f89
-DIST sarg-2.2.5-patchset-1.tar.bz2 17368 RMD160 10f90c3417c37e21f3bbb543fccd1b92941738cc SHA1 e2ec5de58ce6a8eb40fad21f1c716f82fc360a30 SHA256 4d2478bd07042c788b8b3fc4edc2c1d1ac200863eb361e97e695538681e3a9b1
 DIST sarg-2.2.5-patchset-5.tar.bz2 19830 RMD160 af81d065b8f9148052cb48c06ccc16267af7df7b SHA1 4abc7999a90d7e86fed182c44b9348e68acb9dd3 SHA256 e2660de19c117743077667fad002ebd8813d6dc40b381b0c056eb42b47139e0a
 DIST sarg-2.2.5.tar.gz 639563 RMD160 df88b592b4425a4d2d4a79a13ed8a47a5dc1bc20 SHA1 ac885a617d8701c548267db0d12e7e56bb14ed90 SHA256 4798d8219c3d8e06fe122f0ae49754d18abfb901463e5edd71f4b7a529c1e81d
-EBUILD sarg-2.2.5-r1.ebuild 2440 RMD160 124eb61a683dc80c862a2ca8a6e379810c607b0e SHA1 ce4174c4c2d003472527e535cd411be3f7c20909 SHA256 41b4ec4b37a273be80b77772f8be0004cea8e00853986593873ad18ee9af9f02
 EBUILD sarg-2.2.5-r5.ebuild 2440 RMD160 337d452068f06c18e66a78dea526d25cd00ecbb7 SHA1 d79631a5a2b4fa1c84ec47b6d5be82a37d965e63 SHA256 ab84c1fa11ec62e7f67bf09d18ac4ce1d850599d656b70a3fcb26331dcb431e2
-EBUILD sarg-2.2.5.ebuild 2021 RMD160 bae6c2141111afa6c615ad91e0e0eef5b8a61e77 SHA1 8bee25106df1bd6afcffb8db677c6afec98f7bff SHA256 96b8b14276c93872fed571ebd7a09fa6ff7fdc25f8870006133275424ef9e0fd
 MISC ChangeLog 7459 RMD160 874503ca4e6c55fb506eea2352ec775328648111 SHA1 433b504cbed482972272aeabb1b9c0e9cc174bfc SHA256 b033e46786a0ca9a2d8a2a81dcf0d136c3f47fb3eb824116df69afaaa720ebe3
 MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0
diff --git a/net-analyzer/sarg/files/sarg-2.2.3.1-rewind.patch b/net-analyzer/sarg/files/sarg-2.2.3.1-rewind.patch
deleted file mode 100644 (file)
index 14e5f3e..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur sarg-2.2.2/log.c sarg-2.2.2-new/log.c
---- sarg-2.2.2/log.c   2006-08-29 15:09:32.000000000 +0400
-+++ sarg-2.2.2-new/log.c       2006-09-06 13:37:50.000000000 +0400
-@@ -733,7 +733,7 @@
-       getword(val3,arqtt,'_');
-       sprintf(period,"%s-%s",val2,val3);
-       sarglog=1;
--   } else lseek(fileno(fp_in), 0, 0);
-+   } else rewind(fp_in);
- 
-    if(strcmp(ParsedOutputLog, "no") != 0 && !sarglog) {
-       if(access(ParsedOutputLog,R_OK) != 0) {
diff --git a/net-analyzer/sarg/sarg-2.2.5-r1.ebuild b/net-analyzer/sarg/sarg-2.2.5-r1.ebuild
deleted file mode 100644 (file)
index 71a0a5e..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.5-r1.ebuild,v 1.3 2009/03/24 18:54:14 ranger Exp $
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="Squid Analysis Report Generator"
-HOMEPAGE="http://sarg.sourceforge.net/sarg.php"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-               mirror://gentoo/${P}-patchset-1.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="media-libs/gd[png,truetype]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-       EPATCH_SOURCE="${WORKDIR}/patches/" EPATCH_SUFFIX="patch" epatch
-
-       einfo "Running sed to substitute paths..."
-       sed \
-               -e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \
-               -e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
-               -e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \
-               -i sarg.conf || die
-
-       sed \
-               -e 's:"/usr/local/squid/var/logs/access.log":"/var/log/squid/access.log":' \
-               -e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
-               -e 's:"/usr/local/sarg/passwd":"/etc/sarg/passwd":' \
-                       -i log.c || die #43132
-
-       sed     -e 's:/usr/local/sarg/passwd:/etc/sarg/passwd:' \
-               -i htaccess || die
-
-       sed -e 's:/usr/local/squid/logs/access.log:/var/log/squid/access.log:' \
-               -i splitlog.c convlog.c || die
-
-       sed -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
-               -e 's:/usr/local/squid/etc/passwd:/etc/squid/passwd:' \
-               -i user_limit_block || die
-
-       sed -e 's:/usr/local/squid/etc/block.txt:/etc/squid/etc/block.txt:' \
-               -i sarg-php/sarg-block-it.php || die
-
-       sed -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
-               -e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
-               -e 's:/usr/local/squid/logs/access.log:/var/log/squid/access.log:' \
-                       -i sarg.1 sarg-php/sarg-squidguard-block.php || die
-
-       sed -i -e 's:sarg_tmp:sarg:' email.c || die #64743
-       eautoreconf
-}
-
-src_configure() {
-       econf \
-               --enable-bindir=/usr/bin \
-               --enable-mandir=/usr/share/man/man1 \
-               --enable-sysconfdir=/etc/sarg/
-}
-
-src_install() {
-       # This is workaround for sarg installation script, which does not create dirs
-       dodir /etc/sarg /usr/sbin
-
-       make \
-               BINDIR="${D}"/usr/sbin \
-               MANDIR="${D}"/usr/share/man/man1 \
-               SYSCONFDIR="${D}"/etc/sarg \
-               HTMLDIR="${D}"/var/www/html \
-               install || die "sarg installation failed"
-
-       dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess
-}
diff --git a/net-analyzer/sarg/sarg-2.2.5.ebuild b/net-analyzer/sarg/sarg-2.2.5.ebuild
deleted file mode 100644 (file)
index afb66ca..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.5.ebuild,v 1.6 2009/03/16 16:30:01 pva Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Squid Analysis Report Generator"
-HOMEPAGE="http://sarg.sourceforge.net/sarg.php"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-               mirror://gentoo/sarg-2.2.3.1-lots-of-compiler-warnings.patch.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="media-libs/gd[png,truetype]"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       epatch "${WORKDIR}"/${PN}-2.2.3.1-lots-of-compiler-warnings.patch
-       epatch "${FILESDIR}"/${PN}-2.2.3.1-rewind.patch
-
-       # Fixes bug #43132
-       sed -i \
-       -e 's:"/usr/local/squid/var/logs/access.log":"/var/log/squid/access.log":' \
-       -e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
-       log.c || die "setting default for gentoo directories... failed"
-
-       sed -i \
-       -e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \
-       -e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \
-       sarg.conf || die "setting default for gentoo directories... failed"
-
-       # Fixes bug #64743
-       sed -i -e 's:sarg_tmp:sarg:' email.c || die "fixing dir in email.c failed"
-
-       sed -i \
-       -e 's:/usr/local/sarg/sarg.conf:/etc/sarg/sarg.conf:' \
-       -e 's:/usr/local/squid/logs/access.log:/var/log/squid/access.log:' \
-       sarg.1 || die "Failed to fix man page."
-}
-
-src_configure() {
-       econf \
-               --enable-bindir=/usr/bin \
-               --enable-mandir=/usr/share/man/man1 \
-               --enable-sysconfdir=/etc/sarg/ || die "econf failed"
-}
-
-src_install() {
-       # This is workaround for sarg installation script, which does not create dirs
-       dodir /etc/sarg /usr/sbin
-
-       make \
-               BINDIR="${D}"/usr/sbin \
-               MANDIR="${D}"/usr/share/man/man1 \
-               SYSCONFDIR="${D}"/etc/sarg \
-               HTMLDIR="${D}"/var/www/html \
-               install || die "sarg installation failed"
-
-       dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess
-}