Fix gcc-4.4 errors (#275908). Version bump (#275838).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

7 files changed, 96 insertions, 125 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 818cc0109da9..23e98b5355f1 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-proxy/dansguardian
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.47 2009/04/26 19:25:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.48 2009/07/05 00:04:17 mrness Exp $
+
+*dansguardian-2.10.1.1 (05 Jul 2009)
+
+  05 Jul 2009; Alin Năstac <mrness@gentoo.org>
+  +files/dansguardian-2.10.0.3-gcc44.patch,
+  +files/dansguardian-2.10.1.1-gcc44.patch,
+  -files/dansguardian-2.10-uclibc++.patch, -dansguardian-2.10-r1.ebuild,
+  -dansguardian-2.10-r2.ebuild, dansguardian-2.10.0.3.ebuild,
+  +dansguardian-2.10.1.1.ebuild:
+  Fix gcc-4.4 errors (#275908). Version bump (#275838).
 
   26 Apr 2009; Brent Baude <ranger@gentoo.org> dansguardian-2.10.0.3.ebuild:
   stable ppc, bug 265496
diff --git a/net-proxy/dansguardian/dansguardian-2.10-r1.ebuild b/net-proxy/dansguardian/dansguardian-2.10-r1.ebuild
deleted file mode 100644
index edcfaa969f3b..000000000000
--- a/net-proxy/dansguardian/dansguardian-2.10-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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-r1.ebuild,v 1.5 2008/11/13 00:42:15 ranger Exp $
-
-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_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/dansguardian-2.10.0.3.ebuild b/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild
index e1090a62700e..aa2b49c65b7b 100644
--- a/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild,v 1.5 2009/04/26 19:25:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild,v 1.6 2009/07/05 00:04:17 mrness Exp $
+
+inherit eutils
 
 DESCRIPTION="Web content filtering via proxy"
 HOMEPAGE="http://dansguardian.org"
@@ -36,6 +38,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
 src_compile() {
 	local myconf="--with-logdir=/var/log/dansguardian
 		--with-piddir=/var/run
diff --git a/net-proxy/dansguardian/dansguardian-2.10-r2.ebuild b/net-proxy/dansguardian/dansguardian-2.10.1.1.ebuild
index f913317207cd..4ebf6a438e96 100644
--- a/net-proxy/dansguardian/dansguardian-2.10-r2.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.10.1.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2 2008/12/01 21:08:54 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.1.1.ebuild,v 1.1 2009/07/05 00:04:17 mrness Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -38,23 +40,23 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}"/${P}-uclibc++.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 }
 
-src_compile() {
+src_configure() {
 	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-orig-ip
 		--enable-fancydm
 		--enable-email"
 	if use clamav; then
-		myconf="${myconf} --enable-clamd --enable-clamav
+		# readd --enable-clamav in the next version if it works with >=clamav-0.95 (#264820)
+		myconf="${myconf} --enable-clamd
 			--with-proxyuser=clamav
 			--with-proxygroup=clamav"
 	fi
@@ -66,12 +68,14 @@ src_compile() {
 	fi
 
 	econf ${myconf} || die "configure failed"
+}
 
+src_compile() {
 	emake OPTIMISE="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	make "DESTDIR=${D}" install || die "make install failed"
+	emake "DESTDIR=${D}" install || die "emake install failed"
 
 	# Move html documents to html dir
 	mkdir "${D}"/usr/share/doc/${PF}/html \
diff --git a/net-proxy/dansguardian/files/dansguardian-2.10-uclibc++.patch b/net-proxy/dansguardian/files/dansguardian-2.10-uclibc++.patch
deleted file mode 100644
index 27b4177172aa..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.10-uclibc++.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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))
- 			{
diff --git a/net-proxy/dansguardian/files/dansguardian-2.10.0.3-gcc44.patch b/net-proxy/dansguardian/files/dansguardian-2.10.0.3-gcc44.patch
new file mode 100644
index 000000000000..a1ea9a5c1da8
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.10.0.3-gcc44.patch
@@ -0,0 +1,26 @@
+diff -Nru dansguardian-2.10.0.3.orig/src/downloadmanagers/fancy.cpp dansguardian-2.10.0.3/src/downloadmanagers/fancy.cpp
+--- dansguardian-2.10.0.3.orig/src/downloadmanagers/fancy.cpp	2008-11-18 12:27:04.000000000 +0100
++++ dansguardian-2.10.0.3/src/downloadmanagers/fancy.cpp	2009-07-05 01:08:17.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include "../HTMLTemplate.hpp"
+ #include "../ConnectionHandler.hpp"
+ 
++#include <stdio.h>
+ #include <syslog.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+diff -Nru dansguardian-2.10.0.3.orig/src/String.cpp dansguardian-2.10.0.3/src/String.cpp
+--- dansguardian-2.10.0.3.orig/src/String.cpp	2009-01-16 11:44:28.000000000 +0100
++++ dansguardian-2.10.0.3/src/String.cpp	2009-07-05 01:10:40.000000000 +0200
+@@ -164,9 +164,9 @@
+ 		return 0;
+ 	off_t t = 0;
+ 	if (sizeof(off_t) == 4)
+-		sscanf(this->c_str(), "%d", &t);
++		sscanf(this->c_str(), "%d", (long *)&t);
+ 	else if (sizeof(off_t) == 8)
+-		sscanf(this->c_str(), "%lld", &t);
++		sscanf(this->c_str(), "%lld", (long long*)&t);
+ 	return t;
+ }
+ 
diff --git a/net-proxy/dansguardian/files/dansguardian-2.10.1.1-gcc44.patch b/net-proxy/dansguardian/files/dansguardian-2.10.1.1-gcc44.patch
new file mode 100644
index 000000000000..4ea4ff9ef621
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.10.1.1-gcc44.patch
@@ -0,0 +1,37 @@
+diff -Nru dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp dansguardian-2.10.1.1/src/ConnectionHandler.cpp
+--- dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp	2009-02-25 12:36:22.000000000 +0100
++++ dansguardian-2.10.1.1/src/ConnectionHandler.cpp	2009-07-05 01:15:52.000000000 +0200
+@@ -44,6 +44,7 @@
+ #include <istream>
+ 
+ #ifdef ENABLE_ORIG_IP
++#include <limits.h>
+ #include <linux/types.h>
+ #include <linux/netfilter_ipv4.h>
+ #endif
+diff -Nru dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp
+--- dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp	2008-11-18 12:27:04.000000000 +0100
++++ dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp	2009-07-05 01:15:12.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include "../HTMLTemplate.hpp"
+ #include "../ConnectionHandler.hpp"
+ 
++#include <stdio.h>
+ #include <syslog.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+diff -Nru dansguardian-2.10.1.1.orig/src/String.cpp dansguardian-2.10.1.1/src/String.cpp
+--- dansguardian-2.10.1.1.orig/src/String.cpp	2009-01-16 11:44:28.000000000 +0100
++++ dansguardian-2.10.1.1/src/String.cpp	2009-07-05 01:15:12.000000000 +0200
+@@ -164,9 +164,9 @@
+ 		return 0;
+ 	off_t t = 0;
+ 	if (sizeof(off_t) == 4)
+-		sscanf(this->c_str(), "%d", &t);
++		sscanf(this->c_str(), "%d", (long *)&t);
+ 	else if (sizeof(off_t) == 8)
+-		sscanf(this->c_str(), "%lld", &t);
++		sscanf(this->c_str(), "%lld", (long long*)&t);
+ 	return t;
+ }
+