Version bump to 1.5_beta. EAPI 5. Dropped the patches that were applied upstream. Fixes bug #485148, reported by Manuel Rüger (mrueg).

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 145 insertions, 7 deletions

diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog
index a173809ffc57..efeeb8622b69 100644
--- a/net-proxy/squidguard/ChangeLog
+++ b/net-proxy/squidguard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/squidguard
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.44 2012/09/03 21:26:47 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.45 2013/09/17 12:51:48 tomwij Exp $
+
+*squidguard-1.5_beta (17 Sep 2013)
+
+  17 Sep 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/squidguard-1.5_beta-gentoo.patch, +squidguard-1.5_beta.ebuild:
+  Version bump to 1.5_beta. EAPI 5. Dropped the patches that were applied
+  upstream. Fixes bug #485148, reported by Manuel Rüger (mrueg).
 
   03 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
   squidguard-1.4-r4.ebuild:
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index b572e71569ea..1baf0bb9e3b6 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -9,14 +9,21 @@ AUX squidguard-1.4-cross-compile.patch 1409 SHA256 609f13039d0cff196a7c44a16cc5a
 AUX squidguard-1.4-gentoo.patch 2492 SHA256 01d0270a2f8d0b7f4dcce096b4eccb3d65c4397fbc9a0208d6b16b31ae3e855d SHA512 ddd22792fdeeda7beac82fba2c3e033d7c768e064ce578659303b0da93eee18101cce4aa87658328064da38ede3fac0076c926d68bbed051fcd79cc7dacab4d7 WHIRLPOOL 6eb84c4062b94cf42883fcda4fc290473e20b0b5883952dd6427875d7680892ab2938afc2da92e08ed8a99d5ed55802155be8c24e943b1f538704eafa6118885
 AUX squidguard-1.4-upstream-fixes.patch 839 SHA256 a9c65ac0e473b3ae05413cd895a2605bb59d0c7eee070b1138b9ea62e548fc66 SHA512 38b91e3d6c52c701900a2d27279fd9ad134e6a8d84195a7252de8a8cf98f8b94d5328af5880c8cea116976c5fd7edd49001fb2d455d4dcdce90d4a0a17ff59df WHIRLPOOL 38d29e46b55c5712e422fb0476c218e5c3f328cd55c998845b7c1331e682fbd616eb6165c966b9b3bb27fbd8c8fd64922e06086792647af60f0719ca7df16864
 AUX squidguard-1.4-vsnprintf.patch 1816 SHA256 6cb56f910d660978e29eefff1c5916f9897eb2922417ff6bde89e23131becc39 SHA512 4c0e1e783e0ab12db82716e0d471a3e18d41d5866ca48865e1d56802ff3441feeb0bbe34c40c6cb4b6513421a3f0d370b3fc9993dad77bd97551b81edf5725c5 WHIRLPOOL 9f88019b44164c8c12fb1d895861a2888c7744dc0e40b683c93d44290da824ded30345b813ffc4010a69d536122a2bed5365a142f6745a66a569c5878c97a57a
+AUX squidguard-1.5_beta-gentoo.patch 1562 SHA256 ff9969dfaa5a3f8949b7d6145cb59807c598b9a729ef9bb467c4058903437333 SHA512 bdeb6b5a526200f290ce39e3e9c7f4142eb168ec3c47cf4ec2c6dc713fd9c5915c92ca4188c9bfc8c6795f6f170ade62bca3ace0ccfa5149addb0ae932064f8a WHIRLPOOL 18117355a8c52694b7243f866622ed728ef271828c54193f704bdde1c5e207269336541042a36fa7927437215893846764f2dbe8a2298718b2f3c9ae322b5072
 DIST squidGuard-1.4.tar.gz 1968492 SHA256 0711ce60b8e2bbba107b980fed446a88df35e1584b39f079c0cae54a172c5141
+DIST squidGuard-1.5-beta.tar.gz 1983030 SHA256 ba4b79cd193bd3095f3fd27a6e2fc1b36effc2e12a33e17159d4a51993fb3c8e SHA512 37ddc2ac82596e9d24aac6a610763f2eeb7c15b3a2d7babb85948e1da912aebb1dc85309766f7d8c3d7c22713e24a51f4cdef4520117a03d839662ef2494b6e7 WHIRLPOOL 6f65c6a9b23396a7c4a10f344a20cb4824e0abae451fb95a1b563084d0c9755b20f67a74d991b76a54d239ad3dbc6ba468d3c687fdbd80c31567608a927154fc
 EBUILD squidguard-1.4-r4.ebuild 1923 SHA256 a0d653d7cbb7b30153d531fb4462b33784f14a0f94ec67cbf6703ed01e44b046 SHA512 070b412e179508b31ade8b7f6826ed33bdf602f5ecc56d058f33524f672aab5e8c55f43a0f8455ef180af15c167cf5786772be7e067b9481f1e58b98188cc9a1 WHIRLPOOL 91f6d0d2fa4b4d00ee293eadeda33a7a3fdf575ba79eb8ac4f1b327f0f96c4619a156d9f2e89ef995c7b940e874ef03f09dcba0a273b37baf48b324b1be1b253
-MISC ChangeLog 9651 SHA256 37ff681b0772fb2eeee7e33657edc75729525a086edc377f2f17f431df6217e3 SHA512 d6a5b48c98bd9c6b5eb739ee8d8c8b896e54b925481a45625aa270be05aa936abba8c5eefe5af09da037b6e797536a8138e84f5d43f455d472b3bcc9c0aea765 WHIRLPOOL 7119e02f6a07de4334d353ff86a0aebe44e6035c50fc2d82f58060c6ae6cf6e367e0d95da79f768bc40335e4d61009c3160c20ab8382a87aaa67e7fd3ab1627d
+EBUILD squidguard-1.5_beta.ebuild 1707 SHA256 976ddae1b5526363f2fc854a22298f4d61baf6d55879df6c5fa39ca21f21c869 SHA512 1d74e81e0a9903d892b6a5e22f6bc3afc82c6d356a9ed5bebdac76a630db203c98a4b55d933606cda4943736075a02adccac4317908d23120687b1bd0f9ce469 WHIRLPOOL f3bb8af79ccb0ee970534c24c6377789a5f887e6ce7b8ce063b2d7ee4eb11e4b739335787ed0a1d73f3e4d892baabb60248c767ffe0b493aa9a2f53dd127e685
+MISC ChangeLog 9945 SHA256 64f74e4866004f2ac212d1da743f4969a0880576e97b4ee295591b58f4529bd1 SHA512 e42b753a1549c7395ce585afa0bd8e99da80bee6ea9cbb7a9f07143337478590d607e75333ea959d4232140a37a43ddd6c8d5ca7d9206fdcb8c84719ff7eecb3 WHIRLPOOL 83e8b49536d046f6bfea4a1cb1c8c8895b674ce701af5a4f44ee8465a5ec3169a3483921fb2624ed3bea2bdfe0039098670555dcf3ac168ae65947c886ba0fab
 MISC metadata.xml 264 SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057 SHA512 5a17db8cca83750fe6535f5a569f8146e2ddabfdd9f9289a772a0b5e8d8254c8927f4b6eee294d323d49d6ce71a473afb93c49cd3d989402fd2201c92212533c WHIRLPOOL 3cf95538ba326eaa44fb43382329c5987c92e2d1ac3d9dba3a3c4b19765888e60971465cf6ffb6eaae41557845d0ce76a8c9e7413950baf3a2bf16d7a6d216bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlBFIIUACgkQl5yvQNBFVTUKfACgkbx4Lp5TXxXgV01ErR+aL7Lb
-mDgAoKV8qSiq0vh/h4+7XzpqVq9fCD7D
-=ZcvS
+iQEcBAEBCAAGBQJSOE85AAoJEJWyH81tNOV96O4IAJofMvC0gsq2sORdVf0GhEBA
+Zc83WotBLQ8O2bKZFGk2+mkuyUrv5a2kLSy2slLfpiECUPcF6O+Chcl/GH4ADg3S
+2QRBfKHZlHbIW7SGW/jJaj0QNf7sEI7Ap6gZI4CCM3y9d8lwjJx9bwfTlb5AZEen
+F+0+oDTQii9o5TpIqBpud5618Iytm6SzRYDQ6K+XVVUxS7mgNocZXuBxj/+ecm4c
+mXa/wjA3Y0U9B7An7/3RyhkfNT1sYxPQ5NIqxkLzs6rT7cETxoIvPotE/VgrRqBY
+y+z837ffXIhR0F7FXbMbOtalwgLN3e8uY+C1G8dq9gl3kqVkLEOXA22qqMf/raI=
+=T7UP
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squidguard/files/squidguard-1.5_beta-gentoo.patch b/net-proxy/squidguard/files/squidguard-1.5_beta-gentoo.patch
new file mode 100644
index 000000000000..814079764a3f
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.5_beta-gentoo.patch
@@ -0,0 +1,50 @@
+diff -Nru squidGuard-1.4.orig/Makefile.in squidGuard-1.4/Makefile.in
+--- squidGuard-1.4.orig/Makefile.in	2008-05-17 18:36:44.000000000 +0000
++++ squidGuard-1.4/Makefile.in	2009-01-10 13:02:14.000000000 +0000
+@@ -43,7 +43,7 @@
+ # Dependencies for installing
+ #	
+ 
+-install:	install-build install-conf
++install:	install-build
+ 
+ install-conf:
+ 	@echo Installing configuration file  ;
+@@ -85,10 +85,10 @@
+ 
+ install-build:
+ 	@echo Installing squidGuard 
+-	@if [ ! -d $(bindir) ]; then \
+-		$(MKINSTALLDIRS) $(bindir) ; \
++	@if [ ! -d "$(INSTDIR)"/$(bindir) ]; then \
++		$(MKINSTALLDIRS) "$(INSTDIR)"/$(bindir) ; \
+ 	fi ; \
+-	cp src/squidGuard $(bindir) || exit 1 ;  \
++	cp src/squidGuard "$(INSTDIR)"/$(bindir) || exit 1 ;  \
+ 	echo Done. ;
+ 
+ clean::
+diff -Nru squidGuard-1.4.orig/src/Makefile.in squidGuard-1.4/src/Makefile.in
+--- squidGuard-1.4.orig/src/Makefile.in	2009-01-03 20:05:39.000000000 +0000
++++ squidGuard-1.4/src/Makefile.in	2009-01-10 13:02:14.000000000 +0000
+@@ -110,6 +110,8 @@
+ 	mv -f y.tab.c y.tab.c.bison
+ 	mv -f y.tab.h y.tab.h.bison
+ 
++sg.y sg.l:
++
+ #
+ # Dependencies for installing
+ #
+@@ -122,8 +124,8 @@
+ 
+ install.bin:: squidGuard
+ 	@echo making $@ in `basename \`pwd\``
+-	@$(MKDIR) $(bindir) $(logdir) $(cfgdir)
+-	$(INSTALL_PROGRAM) squidGuard $(bindir)/squidGuard
++	@$(MKDIR) "$(INSTDIR)"/$(bindir) "$(INSTDIR)"/$(logdir) "$(INSTDIR)"/$(cfgdir)
++	$(INSTALL_PROGRAM) squidGuard "$(INSTDIR)"/$(bindir)/squidGuard
+ 
+ uninstall.bin::
+ 	@echo making $@ in `basename \`pwd\``
+diff -Nru squidGuard-1.4.orig/src/sgDb.c squidGuard-1.4/src/sgDb.c
diff --git a/net-proxy/squidguard/squidguard-1.5_beta.ebuild b/net-proxy/squidguard/squidguard-1.5_beta.ebuild
new file mode 100644
index 000000000000..d40e5aa1d0a6
--- /dev/null
+++ b/net-proxy/squidguard/squidguard-1.5_beta.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.5_beta.ebuild,v 1.1 2013/09/17 12:51:48 tomwij Exp $
+
+EAPI="5"
+
+WANT_AUTOMAKE=none
+
+inherit eutils autotools
+
+MY_P="squidGuard-${PV/_/-}"
+
+DESCRIPTION="Combined filter, redirector and access controller plugin for Squid."
+HOMEPAGE="http://www.squidguard.org"
+SRC_URI="http://www.squidguard.org/Downloads/Devel/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="ldap"
+
+RDEPEND=">=sys-libs/db-2
+	ldap? ( net-nds/openldap:0 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison:0
+	sys-devel/flex:0"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ldap) \
+		--with-sg-config=/etc/squidGuard/squidGuard.conf \
+		--with-sg-logdir=/var/log/squidGuard
+}
+
+src_install() {
+	emake prefix="/usr" INSTDIR="${D}" install
+
+	keepdir /var/log/squidGuard
+	fowners squid:squid /var/log/squidGuard
+
+	insinto /etc/squidGuard/sample
+	doins "${FILESDIR}"/squidGuard.conf.*
+	insinto /etc/squidGuard/sample/db
+	doins "${FILESDIR}"/blockedsites
+
+	dodoc ANNOUNCE CHANGELOG README
+	dohtml doc/*.html
+	docinto text
+	dodoc doc/*.txt
+}
+
+pkg_postinst() {
+	einfo "To enable squidGuard, add the following lines to /etc/squid/squid.conf:"
+	einfo "    url_rewrite_program /usr/bin/squidGuard"
+	einfo "    url_rewrite_children 10"
+	einfo ""
+	einfo "Remember to edit /etc/squidGuard/squidGuard.conf first!"
+	einfo "Examples can be found in /etc/squidGuard/sample/"
+}