Version bump, fixes security issue, bug #212208.

(Portage version: 2.1.4.4)

8 files changed, 38 insertions, 147 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index db35063269b8..7394bf6b1456 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/sarg
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.34 2007/02/20 00:28:25 jokey Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.35 2008/03/03 16:25:05 pva Exp $
+
+*sarg-2.2.4 (03 Mar 2008)
+
+  03 Mar 2008; <pva@gentoo.org> -files/sarg-2.1-datafile.patch,
+  -files/sarg-2.1-laslog.patch, -files/sarg-2.1-sort-options.patch,
+  +files/sarg-2.2.3.1-rewind.patch, -sarg-2.1-r1.ebuild, -sarg-2.2.1.ebuild,
+  sarg-2.2.2.ebuild, +sarg-2.2.4.ebuild:
+  Version bump, fixes security issue, bug #212208.
 
   20 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/net-analyzer/sarg/files/sarg-2.1-datafile.patch b/net-analyzer/sarg/files/sarg-2.1-datafile.patch
deleted file mode 100644
index d309703aead4..000000000000
--- a/net-analyzer/sarg/files/sarg-2.1-datafile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- datafile.c	2005-12-07 07:22:36.000000000 -0200
-+++ new/datafile.c	2005-12-07 07:32:00.000000000 -0200
-@@ -115,7 +115,7 @@
-             strcpy(wdirname,dirname);
-             gravatmp(oldaccuser,wdirname,oldurl,nacc,nbytes,oldmsg,nelap,indexonly,incache,oucache);
-             strcpy(wdirname,dirname);
--            saverecs2(wdirname,oldaccuser,nacc,oldurl,nbytes,oldaccip,oldacchora,oldaccdia,nelap,incache,oucache);
-+            saverecs(wdirname,oldaccuser,nacc,oldurl,nbytes,oldaccip,oldacchora,oldaccdia,nelap,incache,oucache);
-             nacc=0;
-             nbytes=0;
-             nelap=0;
-@@ -156,7 +156,7 @@
-    return;
- }
- 
--void saverecs2(char *dirname, char *user, long long int nacc, char *url, long long int nbytes, char *ip, char *hora, char *dia, long long int nelap, long long int incache, long long int oucache)
-+void saverecs(char *dirname, char *user, long long int nacc, char *url, long long int nbytes, char *ip, char *hora, char *dia, long long int nelap, long long int incache, long long int oucache)
- {
- 
-    FILE *fp_ou;
---- realtime.c	2005-11-29 14:39:45.000000000 -0200
-+++ new/realtime.c	2005-12-07 07:31:15.000000000 -0200
-@@ -27,6 +27,8 @@
- 
- void getdata(char *, FILE *);
- void datashow(char *);
-+void getlog();
-+void header();
- 
- char dat[128];
- char tim[128];
diff --git a/net-analyzer/sarg/files/sarg-2.1-laslog.patch b/net-analyzer/sarg/files/sarg-2.1-laslog.patch
deleted file mode 100644
index 42d676651d66..000000000000
--- a/net-analyzer/sarg/files/sarg-2.1-laslog.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- lastlog.c   2005-12-08 10:33:36.000000000 -0200
-+++ new/lastlog.c       2005-12-08 10:33:10.000000000 -0200
-@@ -59,11 +59,9 @@
-       local = localtime(&t);
-       strftime(ftime, 127, "%Y%m%d%H%M%S", local);
-       sprintf(buf,"%s %s\n",ftime,direntp->d_name);
--printf("BUF=%s\n",buf);
-       fputs(buf,fp_ou);
-       ftot++;
-    }
--exit(0);
-
-    (void)rewinddir( dirp );
-    (void)closedir( dirp );
-
diff --git a/net-analyzer/sarg/files/sarg-2.1-sort-options.patch b/net-analyzer/sarg/files/sarg-2.1-sort-options.patch
deleted file mode 100644
index 78a2d68330a2..000000000000
--- a/net-analyzer/sarg/files/sarg-2.1-sort-options.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur sarg-2.1/index.c sarg-2.1-patched/index.c
---- sarg-2.1/index.c	2005-11-29 11:39:45.000000000 -0500
-+++ sarg-2.1-patched/index.c	2006-04-12 13:49:25.000000000 -0400
-@@ -369,9 +369,9 @@
-       unlink(wdir_tmp2);
-    } else {
-       if(strcmp(IndexSortOrder,"A") == 0)
--         sprintf(warea,"sort -t';' +6.5n +6.2M +6.0n '%s' -o '%s'", wdir_tmp, wdir_tmp2);
-+         sprintf(warea,"sort -t';' -k 7,5n -k 7,2M -k 7n '%s' -o '%s'", wdir_tmp, wdir_tmp2);
-       else
--         sprintf(warea,"sort -t';' +6.5nr +6.2Mr +6.0nr '%s' -o '%s'", wdir_tmp, wdir_tmp2);
-+         sprintf(warea,"sort -t';' -k 7,5nr -k 7,2Mr -k 7nr '%s' -o '%s'", wdir_tmp, wdir_tmp2);
-       system(warea);
-       unlink(wdir_tmp);
-       if((fp_ou=fopen(wdir,"w"))==NULL) {
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
new file mode 100644
index 000000000000..14e5f3e6bbe9
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.2.3.1-rewind.patch
@@ -0,0 +1,12 @@
+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.1-r1.ebuild b/net-analyzer/sarg/sarg-2.1-r1.ebuild
deleted file mode 100644
index 681e422d158c..000000000000
--- a/net-analyzer/sarg/sarg-2.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.1-r1.ebuild,v 1.3 2006/06/05 17:27:35 blubb Exp $
-
-inherit eutils
-
-DESCRIPTION="Squid Analysis Report Generator"
-HOMEPAGE="http://sarg.sourceforge.net/sarg.php"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="media-libs/gd"
-
-pkg_setup() {
-	built_with_use -a media-libs/gd png || die \
-	"Please recompile media-libs/gd with USE=\"png\""
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fixes bug #43132
-	sed -i \
-	-e 's:"/usr/local/squid/var/logs/access.log":"/var/log/squid/access.log":' \
-	-e 's:"/usr/local/etc/httpd/htdocs/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/logs/access.log:' \
-	sarg.1 || die "Failed to fix man page."
-
-	epatch ${FILESDIR}/sarg-2.1-datafile.patch
-	epatch ${FILESDIR}/sarg-2.1-laslog.patch
-	epatch ${FILESDIR}/sarg-2.1-sort-options.patch
-}
-
-src_compile() {
-	econf \
-		--enable-bindir=/usr/bin \
-		--enable-mandir=/usr/share/man/man1 \
-		--enable-sysconfdir=/etc/sarg/ || die "econf failed"
-
-	emake || die "emake 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
-}
diff --git a/net-analyzer/sarg/sarg-2.2.2.ebuild b/net-analyzer/sarg/sarg-2.2.2.ebuild
index f9b2eb0913a7..6b3f7c098f9c 100644
--- a/net-analyzer/sarg/sarg-2.2.2.ebuild
+++ b/net-analyzer/sarg/sarg-2.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.2.ebuild,v 1.4 2006/11/03 17:25:05 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.2.ebuild,v 1.5 2008/03/03 16:25:05 pva Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Fixes bug #43132
 	sed -i \
diff --git a/net-analyzer/sarg/sarg-2.2.1.ebuild b/net-analyzer/sarg/sarg-2.2.4.ebuild
index 77acffaac1bb..4a79edcbf90a 100644
--- a/net-analyzer/sarg/sarg-2.2.1.ebuild
+++ b/net-analyzer/sarg/sarg-2.2.4.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.1.ebuild,v 1.3 2006/07/30 17:35:51 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.4.ebuild,v 1.1 2008/03/03 16:25:05 pva Exp $
 
 inherit eutils
 
 DESCRIPTION="Squid Analysis Report Generator"
 HOMEPAGE="http://sarg.sourceforge.net/sarg.php"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+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"
+KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 IUSE=""
 
@@ -22,7 +23,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	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 \
@@ -58,10 +62,10 @@ src_install() {
 	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 \
+		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