Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

6 files changed, 23 insertions, 247 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/Manifest b/net-proxy/dansguardian/Manifest
index f722446c8787..45188cfa0a7d 100644
--- a/net-proxy/dansguardian/Manifest
+++ b/net-proxy/dansguardian/Manifest
@@ -1,21 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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 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.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.12.0.3-r2.ebuild 2912 SHA256 ae0b75373225ea3f0b1b1dbf90681cf4346ac89134f4bad6cdd2876d3b974135 SHA512 9e470d9aa750b5b16e3dd886af8bd01182e0d0fe79a7e96971e0f20bc0ffe12ecb9a948560e1ebc4b3f5581013b2aa48fc41c3ba8db93131ddd9b449a26f7abc WHIRLPOOL 80e46e76eea68c9b0a366b227a732a4724d3f6121dc9ac1b2c2583daddd7c7fabd38f3aee8606c0b0ec6fa640e8d751d850d39bb1092a36ced91990148d30d0a
-MISC ChangeLog 18091 SHA256 e987552a8c425d256dc2996c6e36106c4461f97c941533b421fbd966fbb4d96f SHA512 1c9e7a88010d693f1a879909a35b648c749dd239f78d6f801cc7637f8132cd4f67144555e4d63bfb8da74eb30102bbab205d34a1f1e4ee5b2b8cb2b8e83b2b0d WHIRLPOOL 34df42c288200f2fe7b03df6c996c750b1edbdee306575e6b53a01828443ec3220bdf93be044cb6f3ae065e77b1ea362b983f62cf412d85664b974e0fb96d5a2
+MISC ChangeLog 18332 SHA256 3720fbdaaaae1f94bad9b543701875b3bc2a02d81718f9f6f4b442e201c982b1 SHA512 149a727ffd345be84ca02b9d781896c5a5bacaad237165a8c98d3f183c2ff20fefdad0ad79202308b262e437a8b4cea63b94e828b7661a62f228ae13963344f6 WHIRLPOOL b543e7a3498d578215c040ccc01ca9d049f902ffb3eafd8b3d6878e252b54e62919c5543fdb9f0138f0d8ec19a58424eb909ed8bb434671cdfde244d435c6405
 MISC metadata.xml 1751 SHA256 263d88cf2f32528a8c92b1aca71ef8447391788519d886ebf05fb895c917c03e SHA512 bd8d919fd730d208c96678d5497651b737ed53568b134257c412e8fd9d5c3d478d49e7814c4c2276e4138dbcc4c9f3c9182c7277710c6b74c5a1ae879f289218 WHIRLPOOL 41ad68015bd3e710600913529aa1d03a761df5c7f5155079d57f6a12619175256baeda897fe42f31386954ef85f9346e3c2b67b06b7e9973a48fe0791f5b21f0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUywTEACgkQCaWpQKGI+9T5lACfb/tBIJznDXyqf5aDXvfXZE6m
-AB4AninXjLZisTHK13hCUu/GL02qDz12
-=fu4p
+iQJiBAEBCABMBQJVM8cNRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7DFYD/9OPjOuuods5Uhq6FOk0YMDUpwYcAvlIJs3GizL91tvfmTXmsiAvqZ93xB4
+x0zOHwVlp5CfJueGV40IRtKpF5wjgS+Y1kM7fZ5U+EBLkQYHg/yXcDBTqm8I949A
+tKjDjbo31hypwuz6x1NW1zbUqS4SVduhRBL2KWIFX3mQWV0WX8WYNtUFoJ+UIkCW
+/Ofb4LcU4/LWyGQk9JQATksAuzDX/JyGUQNu1CjVBrBBtnxOeJzLxPLdgAI115hN
+lXPkKy0z2ALgX5CrqOUBTjYY+AyetU/biVvfJdjDNdfCAy3NESVixYicOcI4oJT2
+8DCbj/maf0JTqWVSs3S7k3YFLh7XJJoKEiEL5dVuh/iPce4pCX8kdjRU/SEzO996
+FjhJBs8V5xLIvug5M2K1Q02SYJaFMgQ8xmcVh6T0XiVg/Vn2q8MnFWh9I40QoNi4
+zBE9lCKJ4pcVTpRSvlLCja+cdsx5rUYo2u6VUkiHMR552LRLp5wPWTa8oxbN95kX
+vreBRm5YHdbIVG44SbBX6+E43/pX4qUI97bovr4htJtcHjDik/kICQz2pwmBq+3d
+2GpOBL3vilNf78NH5kRCTZ/mUmg3WSxQuOAg2CvNFlPGSGamEGjhOUxJ7cIdyxXa
+h0UNpBKBb+MsOUQegB6GQmQK/rnyXfoVAekph/Xj40ntm2qaHQ==
+=kLCO
 -----END PGP SIGNATURE-----
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
-