Remove old.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

5 files changed, 7 insertions, 237 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index feb24da80c24..7216a07a771b 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/dansguardian
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.62 2015/04/18 20:40:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.63 2015/04/19 15:17:31 kensington Exp $
+
+  19 Apr 2015; Michael Palimaka <kensington@gentoo.org>
+  -dansguardian-2.10.0.3.ebuild, -files/dansguardian-2.10.0.3-gcc44.patch,
+  -files/dansguardian-2.10.1.1-gcc44.patch,
+  -files/dansguardian-2.10.1.1-pcre830.patch:
+  Remove old.
 
   18 Apr 2015; Pacho Ramos <pacho@gentoo.org> dansguardian-2.12.0.3-r2.ebuild:
   ppc64 stable wrt bug #495902
diff --git a/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild b/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild
deleted file mode 100644
index ed4053d7b8fa..000000000000
--- a/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2012 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.7 2012/05/03 04:35:53 jdhore 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}
-	virtual/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}-gcc44.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
-		# 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
-	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.0.3-gcc44.patch b/net-proxy/dansguardian/files/dansguardian-2.10.0.3-gcc44.patch
deleted file mode 100644
index a1ea9a5c1da8..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.10.0.3-gcc44.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index 4ea4ff9ef621..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.10.1.1-gcc44.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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;
- }
- 
diff --git a/net-proxy/dansguardian/files/dansguardian-2.10.1.1-pcre830.patch b/net-proxy/dansguardian/files/dansguardian-2.10.1.1-pcre830.patch
deleted file mode 100644
index 0f96c3a9e2d9..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.10.1.1-pcre830.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80_fix_libcre3_max_sub_expression_allocation.dpatch by Russell Coker
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: libpcre3 sets reg.re_nsub to an exreme large value and dansguardian
-## DP: tries to allocate memory for all records which lets malloc fail.
-## DP: this patch limits the allocation to 1024 records. (#667664)
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-dansguardian~/src/RegExp.cpp pkg-dansguardian/src/RegExp.cpp
---- pkg-dansguardian~/src/RegExp.cpp	2011-10-29 14:16:31.000000000 +0200
-+++ pkg-dansguardian/src/RegExp.cpp	2012-06-23 11:02:48.821473711 +0200
-@@ -161,14 +161,17 @@
- 	offsets.clear();
- 	lengths.clear();
- 	imatched = false;
--	regmatch_t *pmatch = new regmatch_t[reg.re_nsub + 1];  // to hold result
-+	int num_sub_expressions = MAX_SUB_EXPRESSIONS;
-+	if(reg.re_nsub < num_sub_expressions)
-+		num_sub_expressions = reg.re_nsub;
-+	regmatch_t *pmatch = new regmatch_t[num_sub_expressions + 1];  // to hold result
- 	if (!pmatch) {  // if it failed
- 		delete[]pmatch;
- 		imatched = false;
- 		return false;
- 		// exception?
- 	}
--	if (regexec(&reg, pos, reg.re_nsub + 1, pmatch, 0)) {  // run regex
-+	if (regexec(&reg, pos, num_sub_expressions + 1, pmatch, 0)) {  // run regex
- 		delete[]pmatch;
- 		imatched = false;
- //        #ifdef DGDEBUG
-@@ -182,7 +185,7 @@
- 	int error = 0;
- 	while (error == 0) {
- 		largestoffset = 0;
--		for (i = 0; i <= (signed) reg.re_nsub; i++) {
-+		for (i = 0; i <= (signed) num_sub_expressions; i++) {
- 			if (pmatch[i].rm_so != -1) {
- 				matchlen = pmatch[i].rm_eo - pmatch[i].rm_so;
- 				submatch = new char[matchlen + 1];
-@@ -199,7 +202,7 @@
- 		}
- 		if (largestoffset > 0) {
- 			pos += largestoffset;
--			error = regexec(&reg, pos, reg.re_nsub + 1, pmatch, REG_NOTBOL);
-+			error = regexec(&reg, pos, num_sub_expressions + 1, pmatch, REG_NOTBOL);
- 		} else {
- 			error = -1;
- 		}
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-dansguardian~/src/RegExp.hpp pkg-dansguardian/src/RegExp.hpp
---- pkg-dansguardian~/src/RegExp.hpp	2011-10-29 14:16:31.000000000 +0200
-+++ pkg-dansguardian/src/RegExp.hpp	2012-06-23 11:02:48.821473711 +0200
-@@ -22,6 +22,7 @@
- #ifndef __HPP_REGEXP
- #define __HPP_REGEXP
- 
-+#define MAX_SUB_EXPRESSIONS 1024
- 
- // INCLUDES
-