Fix broken build when compiled using uclibc++, thanks to Natanael Copa <natanael dot copa at gmail dot com> (#247547).

Package-Manager: portage-2.1.4.4

4 files changed, 143 insertions, 2 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 06107321c46e..e24fe9af75a7 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/dansguardian
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.41 2008/11/13 00:42:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.42 2008/12/01 21:08:01 mrness Exp $
+
+*dansguardian-2.10-r2 (01 Dec 2008)
+
+  01 Dec 2008; Alin Năstac <mrness@gentoo.org>
+  +files/dansguardian-2.10-uclibc++.patch, +dansguardian-2.10-r2.ebuild:
+  Fix broken build when compiled using uclibc++, thanks to Natanael Copa
+  <natanael dot copa at gmail dot com> (#247547).
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org> dansguardian-2.10-r1.ebuild:
   stable ppc64, bug 245680
diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest
index c371c2d438aa..48060045880a 100644
--- a/net-proxy/dansguardian/Manifest
+++ b/net-proxy/dansguardian/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX dansguardian-2.10-uclibc++.patch 495 RMD160 0af3b373b6a0966b05b4441a110ea67f4dfe2528 SHA1 8b8581480785e01ecd329f27e6173d1a7f0b2947 SHA256 682f7f8ddd3606867ce4f1652662f5703707e47db2779e63d7ee906312d800f7
 AUX dansguardian-2.8.0.6-ctime.patch 2367 RMD160 87d111e2b46bd1dedb3d9bcc00a8b32c23c873be SHA1 018ed273345c41684db3df793b8ee9f9230d880d SHA256 9c187be2f01459aeeb6e4a04ce6db1f53776cd545a2774b15dad5eca55d4c0ac
 AUX dansguardian-2.8.0.6-gentoo.patch 886 RMD160 efe8ca9b09dd5e37eef2bcee16c49792da6d2b30 SHA1 b1f1b92fa09a47e9dfcdfc9d87751ec23e784a9c SHA256 bd79ef1899467389778c259281190922c86b186b4a87988d34b02ee845b62851
 AUX dansguardian-2.9.9.5-gentoo.patch 471 RMD160 5721d1e76ed1403bd126aaededcf192b10cb7872 SHA1 90c174c04ca8d0626433853e88a7f0eec998f472 SHA256 768fe4c628b0c3b04d1130378352be7dfc7c898791d4364dbd21ffabb8d492d9
@@ -8,7 +12,15 @@ DIST dansguardian-2.10.tar.gz 512081 RMD160 1ab76ddb6750f3b397a02c498b3ceca25276
 DIST dansguardian-2.8.0.6.source.tar.gz 212737 RMD160 cf3493b26b4fcd5b366a6fe472e3c6c9e3cfe6d3 SHA1 6d82eed13536a64a2f6711fa221756fa0bfe19f0 SHA256 f4d51b805e979369896906b49a388bf102f56cf0755acc9cb1ec2e4176aac34b
 DIST dansguardian-2.9.9.5.tar.gz 513057 RMD160 275326ca0b9f7281c3b34fb8621156d9903faf6f SHA1 371d32a5607579c206a0f47c119d9460213353d2 SHA256 502509705d8b963f8ced871898dda28d01c8c363d704809065d7d047ac03a4c2
 EBUILD dansguardian-2.10-r1.ebuild 3054 RMD160 68b102e6087224e6f6068e679b33797744d508d2 SHA1 d4c77fd44e9551859c70aefba71aee047f62eaa5 SHA256 6c949ea32dfb2baf3d9810f454425886afe4816720795bdffa094ffd7ab20cb1
+EBUILD dansguardian-2.10-r2.ebuild 3149 RMD160 b182624061c7be2ff66451019a8e3760ab054e48 SHA1 2588526c58b6db416141777b307948eb1ef759ea SHA256 79abc81b02c6d0f6d877a28e4d7f571d123d33a3217bf488e0609cae22b988ba
 EBUILD dansguardian-2.8.0.6-r1.ebuild 1270 RMD160 0d45f9159fb4f889a6fd33b78cd19c5b85c60087 SHA1 5f571fcb4848b3b73cd43b2a8c6428cff1e8d4e7 SHA256 bf3daaa0db173f82c1a5f37548a5f18e374668fd3892fedf5d62b53ea26456b4
 EBUILD dansguardian-2.9.9.5_beta.ebuild 3279 RMD160 2879a4cd7e3be83b3eb2cce4231917af1c0c8cc5 SHA1 d96d1fda84c0f1bbfa3d63fa47b20e0e397f9203 SHA256 9932b86ba756064bd65bd669a11b576090d93af02d43ebd94f9b50ea3c2b494f
-MISC ChangeLog 13861 RMD160 a085f927bc9b5e0e24446cf22fe0b6e73b17bf65 SHA1 18038a5930b799a51509b3bff2ab17f1b785bbda SHA256 bec5508ac80304b9e516c5ca37db2daab1692e9e632f6d2d2d139d31cba57897
+MISC ChangeLog 14143 RMD160 8473ef76797ff150c4cc1a7501780177db65f298 SHA1 1f1bde1e98b50d212ba4ab4a8bbee71046504560 SHA256 f07ea379ff65e0cea61624984fd28600bf90483da632e38c14bff6f67b56e284
 MISC metadata.xml 724 RMD160 d04fa5762b6b6fa0e0ed1a112412f3a264289e65 SHA1 e45489153e18f40f7e2a5117799069e71b7bce30 SHA256 81f37aeb683cda10ee3786c455ca121138ed63dea31af9ceea8d967ed02f3b03
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkk0UjwACgkQPrHvTlXvhtvwegCfZsDSCdBRd00yslhiqCcbSEI9
+kmMAnRxQtPcr9rrQ9iUdxvi1bASI+c/b
+=ot5g
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/dansguardian/dansguardian-2.10-r2.ebuild b/net-proxy/dansguardian/dansguardian-2.10-r2.ebuild
new file mode 100644
index 000000000000..0fe1aa70e9c5
--- /dev/null
+++ b/net-proxy/dansguardian/dansguardian-2.10-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10-r2.ebuild,v 1.1 2008/12/01 21:08:01 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="Web content filtering via proxy"
+HOMEPAGE="http://dansguardian.org"
+SRC_URI="http://dansguardian.org/downloads/2/Stable/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav kaspersky debug ntlm pcre"
+
+RDEPEND="sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
+	clamav? ( >=app-antivirus/clamav-0.93 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	if has_version "<${CATEGORY}/${PN}-2.9" ; then
+		ewarn "This version introduces brand new USE flags:"
+		ewarn "   clamav kaspersky ntlm pcre"
+		echo
+
+		local f="${ROOT}/etc/dansguardian"
+		f=${f//\/\///}
+		if [ -d "${f}" ] ; then
+			eerror "The structure of ${f} has changed in this version!"
+			eerror "For avoiding confusion, you must either move or delete the old ${f},"
+			eerror "then continue with the upgrade:"
+			eerror "   mv '${f}' '${f}.old'"
+			eerror "   emerge --resume"
+			die "Obsolete config files detected"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	
+	epatch "${FILESDIR}"/${P}-uclibc++.patch
+}
+
+src_compile() {
+	local myconf="--with-logdir=/var/log/dansguardian
+		--with-piddir=/var/run
+		--docdir=/usr/share/doc/${PF}
+		--htmldir=/usr/share/doc/${PF}/html
+		$(use_enable pcre)
+		$(use_enable ntlm)
+		--enable-fancydm
+		--enable-email"
+	if use clamav; then
+		myconf="${myconf} --enable-clamd --enable-clamav
+			--with-proxyuser=clamav
+			--with-proxygroup=clamav"
+	fi
+	if use kaspersky; then
+		myconf="${myconf} --enable-kavd"
+	fi
+	if use debug; then
+		myconf="${myconf} --with-dgdebug=on"
+	fi
+
+	econf ${myconf} || die "configure failed"
+
+	emake OPTIMISE="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	make "DESTDIR=${D}" install || die "make install failed"
+
+	# Move html documents to html dir
+	mkdir "${D}"/usr/share/doc/${PF}/html \
+		&& mv "${D}"/usr/share/doc/${PF}/*.html "${D}"/usr/share/doc/${PF}/html \
+		|| die "no html docs found in docdir"
+
+	# Copying init script
+	newinitd "${FILESDIR}/dansguardian.init" dansguardian
+
+	if use clamav; then
+		sed -r -i -e 's/[ \t]+use dns/& clamd/' "${D}/etc/init.d/dansguardian"
+		sed -r -i -e 's/^#( *contentscanner *=.*clamdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf"
+		sed -r -i -e 's/^#( *clamdudsfile *=.*)/\1/' "${D}/etc/dansguardian/contentscanners/clamdscan.conf"
+	elif use kaspersky; then
+		sed -r -i -e 's/^#( *contentscanner *=.*kavdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf"
+	fi
+
+	# Copying logrotation file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/dansguardian.logrotate" dansguardian
+
+	keepdir /var/log/dansguardian
+	fperms o-rwx /var/log/dansguardian
+}
+
+pkg_postinst() {
+	local runas="nobody:nobody"
+	if use clamav ; then
+		runas="clamav:clamav"
+	fi
+	einfo "The dansguardian daemon will run by default as ${runas}"
+
+	if [ -d "${ROOT}/var/log/dansguardian" ] ; then
+		chown -R ${runas} "${ROOT}/var/log/dansguardian"
+		chmod o-rwx "${ROOT}/var/log/dansguardian"
+	fi
+}
diff --git a/net-proxy/dansguardian/files/dansguardian-2.10-uclibc++.patch b/net-proxy/dansguardian/files/dansguardian-2.10-uclibc++.patch
new file mode 100644
index 000000000000..27b4177172aa
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.10-uclibc++.patch
@@ -0,0 +1,11 @@
+--- dansguardian-2.10/src/IPList.cpp.orig	2008-11-19 07:45:54 +0000
++++ dansguardian-2.10/src/IPList.cpp	2008-11-19 07:46:44 +0000
+@@ -81,7 +81,7 @@
+ 			hostnames.reset(new std::deque<String>);
+ 			hostnames->push_back(*host);
+ 		}
+-		for (std::deque<String>::const_iterator i = hostnames->begin(); i != hostnames->end(); ++i) 
++		for (std::deque<String>::iterator i = hostnames->begin(); i != hostnames->end(); ++i) 
+ 		{
+ 			if (std::binary_search(hostlist.begin(), hostlist.end(), *i))
+ 			{