Apply upstream patch 20080718 correctly (#247607).

Package-Manager: portage-2.1.4.5
RepoMan-Options: --force

4 files changed, 38 insertions, 10 deletions

diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog
index ea5b6c1d61a1..01c405595df9 100644
--- a/net-proxy/squidguard/ChangeLog
+++ b/net-proxy/squidguard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/squidguard
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.27 2008/10/12 07:58:25 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.28 2008/12/16 07:38:24 mrness Exp $
+
+*squidguard-1.3-r4 (16 Dec 2008)
+
+  16 Dec 2008; Alin Năstac <mrness@gentoo.org>
+  -files/squidguard-1.3-bison.patch, +files/squidguard-1.3-nolog.patch,
+  -squidguard-1.3-r3.ebuild, +squidguard-1.3-r4.ebuild:
+  Apply upstream patch 20080718 correctly (#247607).
 
   12 Oct 2008; Alin Năstac <mrness@gentoo.org>
   -files/squidguard-1.2.1-gentoo.patch,
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index a2d1e53b6874..f331fbcaa9e3 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -5,17 +5,17 @@ AUX blockedsites 8 RMD160 69ecf774374ab43c8e3950977ac155bd475d1336 SHA1 d36a84e9
 AUX squidGuard.conf.blocksites 192 RMD160 7831192143b0db590872d6dd41a9504ef49b5bad SHA1 a328f9b6eb6d5c27816fde8317f6b821d49d93bd SHA256 6fab8600cbc8945f94260c68a5c4743244dd35ce195edaf3da453e284c4f8f3a
 AUX squidGuard.conf.minimal 61 RMD160 2cc5cc97f0c74e80e76f7ae3fb5fb7d09e29627b SHA1 ed963e093429e9fdf9c1fa06716781dd161d9448 SHA256 7070372be0dca55ade0a1beea8ac8d0461c38a8f5ef9d0a71ab47a9678f8f5df
 AUX squidguard-1.3-autoheader.patch 1517 RMD160 75caa54a404eb93713f7cc29a6c9144c3867f957 SHA1 9729db3a9134f61f011514176f1ad20d90800cbe SHA256 70783a9141f4507ef309de2066c8f250ff1ec90545ed8c099969e13f29232e2b
-AUX squidguard-1.3-bison.patch 3835 RMD160 74454f76e25e4fb946d39a889e54232a2f8f8f69 SHA1 b36cdd65e917049b5f759e8934adc33444bcc7eb SHA256 afd526a6ad7ca573dd5b044fe88ba19f552933000edd07f802e31b69b2c8a46e
 AUX squidguard-1.3-gentoo.patch 4238 RMD160 a24e51a3170dec1595348d8e3c5e611eca279a25 SHA1 b062fcfedf3506f609046080501ee515cc0ecb73 SHA256 bedfd2445aeec584d4720cecdb88002697254a2ca7d5c25043010a2b62c8e8bc
+AUX squidguard-1.3-nolog.patch 4902 RMD160 a4a4f6a147d06afa2f4d25b208c5c2ef1518c3f2 SHA1 b1ca4d1f747b87ef85a68c0222618e1e16b178b8 SHA256 cc6d96bf4c9fc4608519e834db3e6d69094723d385549df5bbd00b1e007b820f
 DIST squidGuard-1.3-patch-20080714.tar.gz 10502 RMD160 493a6a868f34d0b066c943f1969cf1e39debe6e2 SHA1 4345b0da96ca3470e55a4fe4df66217acbcf63cc SHA256 77bc306482059e231e3a3c3ee0d906a4d6dd40942421e12679e2d38e03eeee74
 DIST squidGuard-1.3.tar.gz 1905252 RMD160 4a6a9b5cf36d9e1d0994b3ec410f741a7b7955d3 SHA1 4a1e359679f328cff5970e92e93cc94236ead6c7 SHA256 be3342be74dadbf5c27ce0396db675a989c4f919a19e5c8240ce72c6b3c361a4
-EBUILD squidguard-1.3-r3.ebuild 2100 RMD160 629ff7541c95b340ff4fa31babed5a3e35463ad9 SHA1 673ad4cf36cfe4c560a4530ebbda5f5c2bc81538 SHA256 247133bd88ece3e53316c4ac3d96417bafefa37f32b541c847b3aea51c19e4cf
-MISC ChangeLog 6744 RMD160 613e61469f072fd9f710509845b1214b3d19a148 SHA1 1255684fef19f34ffddfbc124256283296dec986 SHA256 3e728674cb6e14e39f5d80f21053c69d52f39a81cddbd5666dbe785cc06d4b80
+EBUILD squidguard-1.3-r4.ebuild 2100 RMD160 8cd37e4a7a5b773f9f8c8ce0c787e5a2b3fefeab SHA1 4264a68b07506d814338b629c199816323241f24 SHA256 14fbde253c088b6fdf2ff3dcd9e6d7f3389ce9b0da103f516fdfc325479ee699
+MISC ChangeLog 7008 RMD160 4d689467767bb604bdb5855b01b5317a7d115b54 SHA1 d232b9a08a52262c39ad62114f46ab9d392b67d9 SHA256 6f6ceef8e02cd7725e08f7fa6218c4a3e47a3f0730f24c2edd11c0a51a79beea
 MISC metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 SHA1 d2fece889cd4f6e8b3b1242a7e6e4ae6eb064afa SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjxrikACgkQPrHvTlXvhtvPCgCfRorntWWhWzTER81huzBSuRKi
-xpYAn1MFFl+ylg8iEgq4vX2zU/EYIZe3
-=Opsu
+iEYEARECAAYFAklHWvoACgkQPrHvTlXvhtseeACfZftzgiaw/5ouq2oTjY91URav
+EF0AnAxRLl88uLMumEbo0zQ6+FJLCQ8a
+=N7+B
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squidguard/files/squidguard-1.3-bison.patch b/net-proxy/squidguard/files/squidguard-1.3-nolog.patch
index 1c2fee88515f..04746c992f42 100644
--- a/net-proxy/squidguard/files/squidguard-1.3-bison.patch
+++ b/net-proxy/squidguard/files/squidguard-1.3-nolog.patch
@@ -6,7 +6,7 @@ diff -Nru squidGuard-1.3.orig/configure.in squidGuard-1.3/configure.in
  AC_SUBST(BLACKLISTS)
  
 -AC_OUTPUT(Makefile src/Makefile src/sg.h doc/Makefile test/Makefile test/test1.conf test/test2.conf samples/Makefile samples/sample.conf samples/squidGuard.cgi samples/squidGuard-simple.cgi contrib/Makefile contrib/squidGuardRobot/squidGuardRobot contrib/sgclean/sgclean contrib/hostbyname/hostbyname)
-+AC_OUTPUT(Makefile src/Makefile src/sg.h src/sg.y doc/Makefile test/Makefile test/test1.conf test/test2.conf samples/Makefile samples/sample.conf samples/squidGuard.cgi samples/squidGuard-simple.cgi contrib/Makefile contrib/squidGuardRobot/squidGuardRobot contrib/sgclean/sgclean contrib/hostbyname/hostbyname)
++AC_OUTPUT(Makefile src/Makefile src/sg.h src/sg.y src/sgDiv.c doc/Makefile test/Makefile test/test1.conf test/test2.conf samples/Makefile samples/sample.conf samples/squidGuard.cgi samples/squidGuard-simple.cgi contrib/Makefile contrib/squidGuardRobot/squidGuardRobot contrib/sgclean/sgclean contrib/hostbyname/hostbyname)
 diff -Nru squidGuard-1.3.orig/src/sg.y.in squidGuard-1.3/src/sg.y.in
 --- squidGuard-1.3/src/sg.y.in          2007-11-03 18:59:49.000000000 +0500
 +++ squidGuard-1.3/src/sg.y.in          2008-07-06 15:35:08.000000000 +0600
@@ -92,3 +92,24 @@ diff -Nru squidGuard-1.3.orig/src/sg.y.in squidGuard-1.3/src/sg.y.in
  
                 ldap_unbind(ld);
                 ldap_free_urldesc(lud);
+diff -Nru squidGuard-1.3.orig/src/sgDiv.c.in squidGuard-1.3/src/sgDiv.c.in
+--- squidGuard-1.3.orig/src/sgDiv.c.in	2008-12-16 07:26:28.000000000 +0000
++++ squidGuard-1.3/src/sgDiv.c.in	2008-12-16 07:31:50.000000000 +0000
+@@ -145,7 +145,7 @@
+          strncpy(p+ndx,p+ndx+1, sz);
+          p[ndx+sz] = '\0';
+           if(1 == report_once) {
+-            @NOLOG1@ sgLogError("Warning: Possible bypass attempt. Found multiple slashes where only one is expected: %s", s->orig); @NOLOG2@
++            sgLogError("Warning: Possible bypass attempt. Found multiple slashes where only one is expected: %s", s->orig);
+             report_once--;
+           }
+       }
+@@ -157,7 +157,7 @@
+          size_t sz = strlen(p+ndx+1);
+          strncpy(p+ndx,p+ndx+1, sz);
+          p[ndx+sz] = '\0';
+-         @NOLOG1@ sgLogError("Warning: Possible bypass attempt. Found a trailing dot in the domain name: %s", s->orig); @NOLOG2@
++         sgLogError("Warning: Possible bypass attempt. Found a trailing dot in the domain name: %s", s->orig);
+       }
+       else
+       {
diff --git a/net-proxy/squidguard/squidguard-1.3-r3.ebuild b/net-proxy/squidguard/squidguard-1.3-r4.ebuild
index a34faee29c5c..ca6c248b640b 100644
--- a/net-proxy/squidguard/squidguard-1.3-r3.ebuild
+++ b/net-proxy/squidguard/squidguard-1.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.3-r3.ebuild,v 1.2 2008/10/12 07:58:25 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.3-r4.ebuild,v 1.1 2008/12/16 07:38:24 mrness Exp $
 
 WANT_AUTOMAKE=none
 
@@ -34,7 +34,7 @@ src_unpack() {
 	cp ../squidGuard-${PV}-patch-20080714/src/sgDiv.c.in src/ || die "failed to replace sgDiv.c.in"
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 	epatch "${FILESDIR}/${P}-autoheader.patch"
-	epatch "${FILESDIR}/${P}-bison.patch"
+	epatch "${FILESDIR}/${P}-nolog.patch"
 	eautoreconf
 }