Version bump, fixes XSS vulnerability, bug #212731, thank Robert Buchholz.

Package-Manager: portage-2.1.4.4

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index 1efda58006734cece420d62f295986e095389274..c3afa7a2f2ceaf03e15765b84fc8af30429244d4 100644 (file)
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/sarg
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.38 2008/03/06 13:50:38 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.39 2008/03/08 19:51:30 pva Exp $
+
+*sarg-2.2.5 (08 Mar 2008)
+
+  08 Mar 2008; <pva@gentoo.org> -sarg-2.2.2.ebuild, +sarg-2.2.5.ebuild:
+  Version bump, fixes XSS vulnerability, bug #212731, thank Robert Buchholz.
 
   06 Mar 2008; Steve Dibb <beandog@gentoo.org> sarg-2.2.4.ebuild:
   amd64 stable, bug 212208

diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 626ef225f96c8a18726e938bf95a761c06092ab2..63f64424df84be4837ec143dd79bccb266cc0c04 100644 (file)
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,8 +1,8 @@
 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
 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
+DIST sarg-2.2.5.tar.gz 639563 RMD160 df88b592b4425a4d2d4a79a13ed8a47a5dc1bc20 SHA1 ac885a617d8701c548267db0d12e7e56bb14ed90 SHA256 4798d8219c3d8e06fe122f0ae49754d18abfb901463e5edd71f4b7a529c1e81d
 EBUILD sarg-2.2.4.ebuild 2123 RMD160 125b5effb2bab06ae5c81119f08a17f38f339723 SHA1 3f5615fb39a0196a241c04dd8087501cda1ae34a SHA256 a375b38db8bcbd879f86dd411e8c823863298a26cbd843bbf148507f323d521d
-MISC ChangeLog 5058 RMD160 93aec6dd241c3330da0add1d68fdf2cac91c5544 SHA1 8acca8cc2342bedd89aa22cf3109d687a9568142 SHA256 1ba42f85265dd284729e55f1fb9edd9d693dfe7bb29a8140f61caf052b101984
+EBUILD sarg-2.2.5.ebuild 2122 RMD160 71fa1415eb1e942b25dcc724bc4c1ea367965095 SHA1 f55bd8a7da1d798fd913e74678752373525eef3b SHA256 85921315ac6f5b49953a0130b00b67a7ef856421a17b3b9d042415791111a68d
+MISC ChangeLog 5231 RMD160 45baa434738f9bcd13a3455436092367ff8d34f5 SHA1 c2b662bc1373e85a0934e01d3376049c763837e5 SHA256 ba8f9050088d997cfc0f9d228d177498a901f0860480c52612c879652aa48e01
 MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0

diff --git a/net-analyzer/sarg/sarg-2.2.2.ebuild b/net-analyzer/sarg/sarg-2.2.5.ebuild
similarity index 76%
rename from net-analyzer/sarg/sarg-2.2.2.ebuild
rename to net-analyzer/sarg/sarg-2.2.5.ebuild
index 6b3f7c098f9cc48dbe039a550c703104bc266f02..150711993a5048f3f6ff8d2260a304b8e865259a 100644 (file)
--- a/net-analyzer/sarg/sarg-2.2.2.ebuild
+++ b/net-analyzer/sarg/sarg-2.2.5.ebuild
@@ -1,15 +1,16 @@
 # 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.5 2008/03/03 16:25:05 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.5.ebuild,v 1.1 2008/03/08 19:51:30 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=""
 
@@ -24,6 +25,9 @@ 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":' \
@@ -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