diff options
| -rw-r--r-- | net-analyzer/sarg/ChangeLog | 12 | ||||
| -rw-r--r-- | net-analyzer/sarg/Manifest | 15 | ||||
| -rw-r--r-- | net-analyzer/sarg/files/sarg-2.1-datafile.patch | 31 | ||||
| -rw-r--r-- | net-analyzer/sarg/files/sarg-2.1-laslog.patch | 15 | ||||
| -rw-r--r-- | net-analyzer/sarg/files/sarg-2.1-sort-options.patch | 15 | ||||
| -rw-r--r-- | net-analyzer/sarg/files/sarg-2.2.3.1-rewind.patch | 12 | ||||
| -rw-r--r-- | net-analyzer/sarg/sarg-2.1-r1.ebuild | 72 | ||||
| -rw-r--r-- | net-analyzer/sarg/sarg-2.2.2.ebuild | 6 | ||||
| -rw-r--r-- | net-analyzer/sarg/sarg-2.2.4.ebuild (renamed from net-analyzer/sarg/sarg-2.2.1.ebuild) | 22 |
9 files changed, 44 insertions, 156 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/Manifest b/net-analyzer/sarg/Manifest index 6e0cdbfa2215..acdd4a64cafd 100644 --- a/net-analyzer/sarg/Manifest +++ b/net-analyzer/sarg/Manifest @@ -1,11 +1,8 @@ -AUX sarg-2.1-datafile.patch 1300 RMD160 a158013cbb19620f1942201cec0d7896d5a6ebfc SHA1 15e5c4f6d7dd7bb0d978a67fd8163eda5cadc7d5 SHA256 328bdd49a7bc6e0649af6c91620a7f6ddf7cd95f56425a2228e6c1f97fd4e9ed -AUX sarg-2.1-laslog.patch 406 RMD160 e72fec0af3ce48df9a3aa43656d8be5cf3c1044b SHA1 c4af4ff498baa5d2a124b52ca84b984169c9eea8 SHA256 9fc56675e99a3d427c22cab90e1e79e3b11382578b1f4c5047c10dcdd910b224 -AUX sarg-2.1-sort-options.patch 757 RMD160 37d4b96a5af7132ff16548cc85837792b048c1c9 SHA1 a5ff1551fdd8053172ec3e143f634ebd1d6a6b40 SHA256 f71d573c2031308f34cc6f4cf3967949b214a9199a95965f523786ce4b7fbb61 -DIST sarg-2.1.tar.gz 352935 RMD160 5b2732d5e4a5bcd4c2b24e5694a3d19581d87b05 SHA1 e35239d076f8b4bf9b9c41ea68f7711fa9a6d920 SHA256 89ec31f3b7b8187de1e4ee4fa0a4abf6867f2404bd9059bbfbe4beb609dd5818 -DIST sarg-2.2.1.tar.gz 385693 RMD160 ff0eb80ebac162b44e8f9a0ae93f51dd1c8a0f16 SHA1 2daa5ccfd7201501367cf5fbc64ac855115c6421 SHA256 1f7ad24d7afa18279c232ce0b97f35b6145e33de824abfe7ea6ff058f7045cc0 +AUX sarg-2.2.3.1-rewind.patch 450 RMD160 02eb366d4dfef00bdeb1683de09f48d79c6206bc SHA1 4ab1874a13ad580a1074387ea78593672381c855 SHA256 5652fa70ac5f074f43fbabd4f4cbd1875a39924da6550f4a821b826e0efa0cc6 DIST sarg-2.2.2.tar.gz 381797 RMD160 dc6599ca3766067c1e6a027757139b70bb2a1d0c SHA1 9510c93383d9d882ebf31c245be99fb818c2f1a9 SHA256 7a80750c87616d3c576e81d73ac5ea4f04e9f8ba7e5cfed1ebdd7986eecc99d9 -EBUILD sarg-2.1-r1.ebuild 2084 RMD160 4f123bdd6b1143e76e7c66a2857eb22e22b49cd6 SHA1 447f3da4080daa80c49f6c971943a1d1984a8f50 SHA256 96afc99383ae291ebbddae75e3f9e6bb28beb1bbc72dcbac81e5494393cdd602 -EBUILD sarg-2.2.1.ebuild 1934 RMD160 1b2ddc14b6994618cf1ec87de8391704f2d1d73e SHA1 520c93c094304aa1f61469b7645b8ba96b73b559 SHA256 3550632f039f6483a5a60449c174aa7777b7f7f8ece43f689ef5d688aff9ffa3 -EBUILD sarg-2.2.2.ebuild 1928 RMD160 7407164c8d6a12f3015601335fc44b65d341bff3 SHA1 66db564abe22e060e2d6d4546c4d324a0a3f19f1 SHA256 89f395d200a2dc2114676a0b8e3cc4bc6ce07617ee699703951ca268230abae2 -MISC ChangeLog 4428 RMD160 7e87f0a0c5b20aec5f49b682fee1e80456224f73 SHA1 8b44cabfeeea3b55333850bf6b2f2c66fb387910 SHA256 0228c59e062deb7e78277be9ba16e4e2a3ebe72c8afd4c858516f2a2164d6b83 +DIST sarg-2.2.3.1-lots-of-compiler-warnings.patch.gz 6237 RMD160 67353fb39434bb5af8ac4c620643da1baf9336d1 SHA1 25630404296156565489d506ddd09b3c0991a8a0 SHA256 d68a9cfddf4886714fe53c4264cbbd992c8f0780c488515af2a9e1fbad016f89 +DIST sarg-2.2.4.tar.gz 639369 RMD160 470a8d78890f92471c92cc08e83d61fb21d0a508 SHA1 74c0e62e3391dbfe6c0f249f9e944f2b816c8d4e SHA256 7859e47d0511f5f593d903fe71fbcbdfbaa4cefb63aeedc472dfb0cfc28a70b5 +EBUILD sarg-2.2.2.ebuild 1928 RMD160 6acd1025ddcc1450238cde86b12fc934077af135 SHA1 2e71dd33438f393a709aca69d3964eb4b36663a3 SHA256 7eaa5f4062f94795df80644140ccc5cb9b4ae4e59ff34072c7345fd9ea770abc +EBUILD sarg-2.2.4.ebuild 2122 RMD160 08fa3f5f96141aaa8592b8d97f81426879726a8c SHA1 fcb283ceb23417774786e08fef81337a1073490b SHA256 541d7374956c917518f806f5b220b152966973582ac5a2c25d622b36467bc9b7 +MISC ChangeLog 4755 RMD160 7649637dfdb28cd277f6a123974b067638c6682e SHA1 bd26d79e76b6c40233b0000de4581388d148b32e SHA256 69f6aab59d0dbc8e93ccd4340e26fd24597f398d7744a9836c75fe967cc1f6ed MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0 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 |