Version bump to 2.12.0.3, thanks to Patrick McMunn. Fixes bug #447902.

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

6 files changed, 159 insertions, 31 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 326bd40840e2..0fdf9c52bb91 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/dansguardian
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.53 2012/09/16 10:31:07 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.54 2013/03/04 12:13:11 tomwij Exp $
+
+*dansguardian-2.12.0.3 (04 Mar 2013)
+
+  04 Mar 2013; Tom Wijsman <TomWij@gentoo.org> +dansguardian-2.12.0.3.ebuild,
+  dansguardian-2.10.1.1-r2.ebuild, files/dansguardian.init, metadata.xml:
+  Version bump to 2.12.0.3, thanks to Patrick McMunn. Fixes bug #447902.
 
 *dansguardian-2.10.1.1-r2 (16 Sep 2012)
 
@@ -426,4 +432,3 @@
   28 May 2003; Joshua Brindle <method@gentoo.org> dansguardian-2.6.0.ebuild,
   dansguardian-2.7.1.ebuild, files/dansguardian.init:
   initial import thanks to Pat Double <double@inebraska.com>
-
diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest
index f94f1ed4bc02..b67886143965 100644
--- a/net-proxy/dansguardian/Manifest
+++ b/net-proxy/dansguardian/Manifest
@@ -4,20 +4,26 @@ Hash: SHA256
 AUX dansguardian-2.10.0.3-gcc44.patch 1027 SHA256 0faa881ab43930c377a134029024c4880094b197a71abcd83351378e27a3e612 SHA512 0d384dd0fc1e8930deaeadf4aa1067d259f4925c384be0833a8a84bf9685572ac5e9674f225c164a1adbf8fa8365bdb9f24ff0d8ddc490cb1f670ad4be5b4b2c WHIRLPOOL 4229c518a2cc7901bd03a95adf55f58199514445eaa4504031f7abf1844439333c6584de0f891971880b1f655a5e81593882e0f401df5daa66ab1bcdb1568a2b
 AUX dansguardian-2.10.1.1-gcc44.patch 1472 SHA256 7e2069ea67428bc3b81b4e5d0d6ea942810927b600fbd09fb15843e257aff0c0 SHA512 083f534df290d51c956d35496678e076abbf42f30ed02a46019e64d0de09d08025b42f72587450b2662af94ab3d630d4264964bd9d2995c9629f22b26b910175 WHIRLPOOL 5c9d5f2728fa15376ccbb590f24667e982bbdc2cba3f99b0db652c9c0d2ebc204986e54c0975684491525fd13175a4e76cf9fb83169f3106a7049419fcacaf87
 AUX dansguardian-2.10.1.1-pcre830.patch 2468 SHA256 8686b5d845642ff74f4706559c770f027de38dd12982dd0a6573d946bb85aa87 SHA512 d3d9af038ff5a91d1f9dc6cf4175b0da2a791386ca624f4a639338ed189a274eba720e9771986e7ded517e2623185e8b61ef3689414197c47a6ae3220be99d57 WHIRLPOOL 8a34209bc5663b693787972197d1842f80a81d02e8309224c4c913f7bfdd4371a2f10e3311d4ac3f8692954c058d00880c487b08991720cb831b5155547db943
-AUX dansguardian.init 826 SHA256 af4252ed5126e7ff1e289107eae1feb5165030077a93e855c575249eb121edb0 SHA512 8f074fa25f94b13c126da68273ba163c700afcc6a2ff9042e609c2c3f8dd6cb0741922e92a4722e89a7a6d54822e3e021de64db0c5db53fd4c7c061035e7e438 WHIRLPOOL 657ec02f3831dbf323aad566f983da1b7ddc429510a409469e7dc155ba6430d7d98fb38d976eb130fa6538fdeb8ea29f4720a13bd3ab25e1f8389526dad37b03
+AUX dansguardian.init 1072 SHA256 0571d916c6464645a1ae46e7c191a0225c779f07542173d76d5d2955f6f93895 SHA512 c86f19c0ba16f4bed2ff9b10b0c26e20cd4558ef9d1b00b28fa03463a0e868db0b2b46671f7cbf124c0c5431b8557fdd9d3ea4ffc01ad1162c5aeca492ab3464 WHIRLPOOL 3f184c54fff1facb2efd9f1173982f2c482ab1843606926fa1356a82f0ba353be7b5403a6a0d8148299f1879a51c280a8570e159e223277f5786ba0a0b087b50
 AUX dansguardian.logrotate 188 SHA256 124775c1a6dd20652e7b7511bb484c654ac63cc0c0a2baf2357d8ce7086867a2 SHA512 ec272a14f88cd1939272e4a689602b784236bf2fb25d1d7fd720f4d998028d7e1d6ba520d7044e1fef14838caa18ec19224d1cfbe04318b14316fe507e9d13dc WHIRLPOOL 547f10ea51af68a29355adc6acd1122817f1ca1335566588dd2acb71fc444a40cbb3cacf9ee6ead4ed29a0e35d91eb8ff91d20423644b2d72fe8f30db8ec5d18
 DIST dansguardian-2.10.0.3.tar.gz 512695 SHA256 419be86f472ad0a69a8a15857a646271ac9739d29bd836be9159f2d955e5b963
 DIST dansguardian-2.10.1.1.tar.gz 516800 SHA256 c245d58cf37f79f8a8e50b684d62b797a9f6ce1bb775e140969002dff7e11f92
+DIST dansguardian-2.12.0.3.tar.bz2 577701 SHA256 c74e9a32b97f9a9a056fced3da23fe48fca2bc6aa9af670afe9a53dc819414f5 SHA512 37155ef4f1a6dd6bdd87f79c7199b77de49746e4bff0631c239a569c21bf26240cbc9eae5a2436653bfc3d170a664710af9d80c4cfac3082a0620caeaac6740b WHIRLPOOL 64f64161a3dbf48c122fbf341ac8a7b4892be2049d1ac05948e9aa8c4cb927efa6ce929404b60c43f67457268f3c432b0ff109fb333ffe8ab84bba0b528b52eb
 EBUILD dansguardian-2.10.0.3.ebuild 3212 SHA256 bdf127e30786651c447087d0bdf31f18731cf2d3c993df169c600b8cbb535cea SHA512 848af2ac1c818ef936a06f7206324820b5664420daae4844d692e95878fbda7da22ffc2ea6148934f726d3eec584846c9a452b7aab8399c0ae5593ee5c00b6f5 WHIRLPOOL 476689a7471816f319f96e7ed5d5cf2ffc8be780ed30a057242d819518caaf731c9092d3d1ff35ab367ec1c4fdd7a11908dad4b8e41ebeb7884a798ff294a5d4
 EBUILD dansguardian-2.10.1.1-r1.ebuild 3690 SHA256 5524a741a4374333c6fb8714b0f2a0712402ba699e17a7246c27924f97f8bffc SHA512 4151a9c892dba63d22b00ba59e90e1e2387d1bab246004fbe7f953c335b15f2dc66e34c68e93dda9dcc7dd9b3497be6522db652dd84a4adcc54d5b32a52f0b41 WHIRLPOOL b1a67402f19f65ce4dee926311e7ef2a5e80588a345e8e04930caeaf6b3a1fb09db08f53595cc708976d6d91292c32e31595976a0e043fa0999bee560daf8432
-EBUILD dansguardian-2.10.1.1-r2.ebuild 3735 SHA256 c1d7c0b60609ad5e88b132c0731961e1876aa95b54fd5efb94c64dc54779d47f SHA512 5289a73344d1dd2a23e39413511e6e9c68b1f6dafd58eba3180d9e8a473ca155ce516df390a56c6062874ef710b6a0e0767ee9a57419b39d22f38f97e64b26cc WHIRLPOOL aa01b2bcb4a1f300fcdc13bef621002a0c5b489fa33a2a34dfdbef713ab925b655ca831ea016a2ae69819099ca49259318dc04b468dc25f32a26e3478baafda1
+EBUILD dansguardian-2.10.1.1-r2.ebuild 3731 SHA256 42144b6697aaa59e6ef87e3af5631a4db315eb4061e5cc51f0180a01702aa30e SHA512 9d06176e402d73826da5a348b03129a424047b0a2496d7dfca9b7c9ed95ec19bd787f743df3fa52457148abc0f27728d40f86fe94226006c8f6e7f0f3d026dfc WHIRLPOOL d4988ad239a2a0662161211f6166097cc36f915b462bd210f2bbf4ed239848a0da278720dc7d8d70275569f369290ce796cbd830f1eb2e5c8c22e46bc060f8e0
 EBUILD dansguardian-2.10.1.1.ebuild 3254 SHA256 706e17fade848ea78b89fdb282bdbff11d490c2f7c83d06383893d8e2e2d8679 SHA512 ccc9c066916994119bc20a432a81854e4baaae8d2aab12a8079629e74c850f1e9ab296f722e89f4bb6eedbda4c69c3e83b9fd403c2e50e4647bf617c18f61ce5 WHIRLPOOL b6be026ac2426a7ceb9e66beb80d3fa272b690ea3be877d8fc39030186eb12912100400d33d9862b131a02c544d31d02a184665ab340bb5d4e7caeb85a42677c
-MISC ChangeLog 16114 SHA256 d2b9d9bd09d6b917456c56db5d32452a9be67f08fb2f238b390ca1fd0c087d70 SHA512 1b9e693865a85919829da73a35703f519496da3780a770d4b5f26e73312bd6106ac0ac8455d83cedadbe11b3237d791d9a6bfd82a4ae0a21de03ba874ddf274a WHIRLPOOL 945ae2035329e3f03b682406c0984d8641ad6fc12a9decee895504b394d3d4a54206591004d79c00d753fb5e2e5b35f0615c2d5359b10cf5b9e096bb99664c11
-MISC metadata.xml 724 SHA256 81f37aeb683cda10ee3786c455ca121138ed63dea31af9ceea8d967ed02f3b03 SHA512 e628f90bc4529e0b6509d041cadb13423f1ff035e7e15a8ca98d87c16a020710f0fd05a7f71fc9641c782c4f418883ad859f029e782e82a303bb8422383cb07c WHIRLPOOL 0ca691bed176cd9891e8cdbcc0a0f09e06bcbd6c8adfa16aa33b2b624c5e884750873a03d8501e6740d996ce1206b0b6665b6c007db04f4f601c331eda4019ed
+EBUILD dansguardian-2.12.0.3.ebuild 2844 SHA256 de4be80f800132299e32905bf5f6fbc6a4caafbe3a94a2e28c82ce1fca64339f SHA512 72934f4ddc1a55c2a5c42db3a7be0df7f0675b99ffb7f0ababdd8b5f21a5ab6ab42d1c91c1ba516dc19bca5df7087584517b24695f34ed35378ac962c7d708b0 WHIRLPOOL 61d32c949b716c6f13aa7932f9e05c1a462ece386b2bf598f7403195c3f3b070e1694bd87e092989267912af4b776b1cae8848a47b7e26804728a1e15c3c105e
+MISC ChangeLog 16373 SHA256 d657ea903cb77c9fc53fb9d278bb8d160e7fa6ac25a9ce148118da75152ce82f SHA512 edb16539e10a46f3948614c23be078806441da8e13ebda2355ff24dde947339691cec84069e3ea7776bf21c677702b67f6b3c5dac0beafe14b42c139c4f80d93 WHIRLPOOL 160447727e50f8c68b665bf079c981c94e86a7a26f64d12c756994edf4afcdfa877c35c8dd88b30801f7a9c098f10fbd4b941af924078f8228bda91530f41f5f
+MISC metadata.xml 1705 SHA256 3d45662a022d15d088bf28b82bb30f864b5ca5ef87fa2cf189432af8f2b6f82d SHA512 182ec9e70ccb9537c36f468eb0a203f54e9dc531a3b38d4d9deed8ac6dad69d7227c3b2c1d87fa4fa59f7cb42ab1725267f2ae539cc676808cc5e8662c81d8a6 WHIRLPOOL 6c3b528098426e69037117585c7c0111d9e3668c744a67789fbf8000b16f88261f8dbed5456cf30df810272de6e298f1ed53c42a4e9fb5dbed02f249d397961f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBVqnsACgkQuUQtlDBCeQJydQCfY0563jcfwqT/DayoGaTXJEfq
-ZDoAmwcoVMHGzrElUaQ+8QVJSMGbOZLL
-=x7EP
+iQEcBAEBCAAGBQJRNI/dAAoJEJWyH81tNOV9fNgIAKZsdtQWTajKNtq0YmNMKYai
+n0Xd8ii2Lx3ngXhOhyRXZwLciv0d9/bmR7EZRoxt/cIlHeBaoYMeI+dyu6SUmGT5
+o+Xk+3jccQpoiVmEnLnu2lqkoWM6zrtuh3VZtcTGYYmFCXGx4zPqfvWKER1YsFnE
+ZujRtCUrBu0b+SzjEdZS9JFp57BxrormgMLB7JVUZLECo0FyffiETJygmQEwf1VW
+liCE/ptJxKZY73JPK1DZBJw60W1RVYaeB3RH/DTlsOAHV71aNTOI5XRcow0prGGO
+0ve5hITNsAo+7jlIbdt2NVbwS9xaQRvdkmkdhDlyw72QmeeSy7qbKjErutfw9Gc=
+=We+V
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild b/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild
index bdd1b25cdb48..4a06acd79809 100644
--- a/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild,v 1.1 2012/09/16 10:31:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.1.1-r2.ebuild,v 1.2 2013/03/04 12:13:11 tomwij Exp $
 
 EAPI="2"
 
diff --git a/net-proxy/dansguardian/dansguardian-2.12.0.3.ebuild b/net-proxy/dansguardian/dansguardian-2.12.0.3.ebuild
new file mode 100644
index 000000000000..5a064160694a
--- /dev/null
+++ b/net-proxy/dansguardian/dansguardian-2.12.0.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.12.0.3.ebuild,v 1.1 2013/03/04 12:13:11 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Web content filtering via proxy"
+HOMEPAGE="http://www.${PN}.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="avast backtrace clamav commandline debug email +fancydm icap kaspersky +lfs logrotate ntlm orig-ip +pcre static-libs trickledm"
+
+RDEPEND="sys-libs/zlib
+	clamav? ( app-antivirus/clamav )
+	logrotate? ( app-admin/logrotate )
+	ntlm? ( virtual/libiconv )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+WIKI="http://contentfilter.futuragts.com/wiki/doku.php"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_configure() {
+	econf \
+		$(use_enable avast avastd) \
+		$(use_enable backtrace segv-backtrace) \
+		$(use_enable clamav clamd) \
+		$(use_enable commandline) \
+		$(use_with debug dgdebug) \
+		$(use_enable email) \
+		$(use_enable fancydm) \
+		$(use_enable icap) \
+		$(use_enable kaspersky kavd) \
+		$(use_enable lfs) \
+		--with-logdir=/var/log/${PN} \
+		$(use_enable ntlm) \
+		$(use_enable orig-ip) \
+		$(use_enable pcre) \
+		--with-piddir=/var/run \
+		--with-proxygroup=${PN} \
+		--with-proxyuser=${PN} \
+		$(use_enable static-libs static-zlib) \
+		$(use_enable trickledm)
+}
+
+src_install() {
+	default
+
+	# Edit config files for virus scanners chosen based on USE flags.
+	if use avast; then
+		sed -r -i -e 's/^#( *contentscanner *=.*avastdscan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
+	fi
+
+	if use clamav; then
+		sed -r -i -e 's/[ \t]+use dns/& clamd/' "${D}/etc/init.d/${PN}"
+		sed -r -i -e 's/^#( *contentscanner *=.*clamdscan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
+	fi
+
+	if use commandline; then
+		sed -r -i -e 's/^#( *contentscanner *=.*commandlinescan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
+	fi
+
+	if use icap; then
+		sed -r -i -e 's/^#( *contentscanner *=.*icapscan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
+	fi
+
+	if use kaspersky; then
+		sed -r -i -e 's/^#( *contentscanner *=.*kavdscan[.]conf.*)/\1/' "${D}/etc/${PN}/${PN}.conf"
+	fi
+
+	# Install Gentoo init script
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	# Install log rotation file.
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/${PN}.logrotate" ${PN}
+	else
+		exeinto /etc/cron.weekly
+		newexe data/scripts/logrotation ${PN}.cron
+	fi
+
+	keepdir /var/log/${PN}
+	fperms o-rwx /var/log/${PN}
+}
+
+pkg_postinst() {
+	local runas="${PN}:${PN}"
+
+	if [ -d "${ROOT}/var/log/${PN}" ] ; then
+		chown -R ${runas} "${ROOT}/var/log/${PN}"
+		chmod o-rwx "${ROOT}/var/log/${PN}"
+	fi
+
+	einfo "For assistance configuring ${PN}, visit the wiki at ${WIKI}"
+}
diff --git a/net-proxy/dansguardian/files/dansguardian.init b/net-proxy/dansguardian/files/dansguardian.init
index c7b2438b5c17..b243c2410df8 100644
--- a/net-proxy/dansguardian/files/dansguardian.init
+++ b/net-proxy/dansguardian/files/dansguardian.init
@@ -1,32 +1,32 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/files/dansguardian.init,v 1.2 2005/12/08 22:15:11 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/files/dansguardian.init,v 1.3 2013/03/04 12:13:11 tomwij Exp $
 
-opts="${opts} reload"
+extra_started_commands="reload"
 
 depend() {
-	need net
-	use dns \
-		squid apache2 bfilter mman junkbuster oops polipo privoxy tinyproxy wwwoffled
-	#dansguardian could be used in conjuction with any of the above web proxies
+        need net
+        use dns \
+                squid apache2 bfilter mman junkbuster oops polipo privoxy tinyproxy wwwoffled
+        #dansguardian could be used in conjuction with any of the above web proxies
+        provide dansguardian
 }
 
 start() {
-	ebegin "Starting DansGuardian"
-	start-stop-daemon --start --quiet --pidfile /var/run/dansguardian.pid \
-		--exec /usr/sbin/dansguardian
-	eend $?
+        ebegin "Starting DansGuardian"
+        start-stop-daemon --start --background --pidfile /var/run/dansguardian.pid --exec /usr/sbin/dansguardian --progress --quiet
+        eend $?
 }
 
 stop() {
-	ebegin "Stopping DansGuardian"
-	start-stop-daemon --stop --quiet --pidfile /var/run/dansguardian.pid
-	eend $?
+        ebegin "Stopping DansGuardian"
+        start-stop-daemon --stop --pidfile /var/run/dansguardian.pid --exec /usr/sbin/dansguardian --progress --quiet
+        eend $?
 }
 
 reload() {
-	ebegin "Reloading DansGuardian"
-	/usr/sbin/dansguardian -g
-	eend $?
+        ebegin "Leaving current connections open. Reloading filter group config files."
+        /usr/sbin/dansguardian -g
+        eend $?
 }
diff --git a/net-proxy/dansguardian/metadata.xml b/net-proxy/dansguardian/metadata.xml
index c13cb572baab..48a54d04bdc3 100644
--- a/net-proxy/dansguardian/metadata.xml
+++ b/net-proxy/dansguardian/metadata.xml
@@ -4,7 +4,18 @@
 <herd>net-proxy</herd>
 <longdescription>DansGuardian is an award winning Open Source web content filter which currently runs on Linux, FreeBSD, OpenBSD, NetBSD, Mac OS X, HP-UX, and Solaris. It filters the actual content of pages based on many methods including phrase matching, PICS filtering and URL filtering. It does not purely filter based on a banned list of sites like lesser totally commercial filters.</longdescription>
 <use>
-	<flag name='kaspersky'>Adds support for Kaspersky AntiVirus software</flag>
-	<flag name='ntlm'>Enable support for the NTLM auth plugin</flag>
+	<flag name='avast'>Enable support for the AvastD content scanner.</flag>
+	<flag name='backtrace'>Enable logging a backtrace when a segmentation fault occurs.</flag>
+	<flag name='clamav'>Enable support for the ClamD content scanner.</flag>
+	<flag name='commandline'>Enable support for command-line content scanners.</flag>
+	<flag name='email'>Enable support for email reporting functionality.</flag>
+	<flag name='fancydm'>Enable support for the fancy download manager.</flag>
+	<flag name='icap'>Enable support for ICAP AV server content scanner.</flag>
+	<flag name='kaspersky'>Enable support for the Kaspersky AV daemon content scanner.</flag>
+	<flag name='lfs'>Enable large file support on 32 bit systems.</flag>
+	<flag name='logrotate'>Use app-admin/logrotate for rotating logs.</flag>
+	<flag name='ntlm'>Enable support for the NTLM auth plugin.</flag>
+	<flag name='orig-ip'>Enable support for checking the client's original destination IP address against HTTP request details when deployed as a transparent proxy (US-CERT VU#435052).</flag>
+	<flag name='trickledm'>Enable support for the trickle download manager.</flag>
 </use>
 </pkgmetadata>