remove obsolete version

(Portage version: 2.0.54)

5 files changed, 7 insertions, 208 deletions

diff --git a/net-proxy/bfilter/ChangeLog b/net-proxy/bfilter/ChangeLog
index c568ac124be7..d2328317d3cb 100644
--- a/net-proxy/bfilter/ChangeLog
+++ b/net-proxy/bfilter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/bfilter
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/ChangeLog,v 1.4 2006/03/05 08:31:31 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/ChangeLog,v 1.5 2006/04/14 07:52:11 mrness Exp $
+
+  14 Apr 2006; Alin Nastac <mrness@gentoo.org>
+  -files/bfilter-0.10.1-droppriv.patch, -bfilter-0.10.1.ebuild:
+  Remove obsolete version.
 
 *bfilter-0.10.3 (05 Mar 2006)
 
diff --git a/net-proxy/bfilter/Manifest b/net-proxy/bfilter/Manifest
index c77ce429c9b7..b06d0ab18c5a 100644
--- a/net-proxy/bfilter/Manifest
+++ b/net-proxy/bfilter/Manifest
@@ -1,20 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ffe32d93ac10f29f36362b3a72c05aa5 ChangeLog 1131
-MD5 70889ee77a02542ea04a05e106645823 bfilter-0.10.1.ebuild 1732
-MD5 10809a79ce5a5c073a97bd55bfd93e02 bfilter-0.10.3.ebuild 1541
-MD5 13b255051243f8ef4f66a4118d4a1cbd files/bfilter-0.10.1-droppriv.patch 3650
+MD5 dd968bdc714d1a93c448df73886b705c ChangeLog 1310
+MD5 2ce7fb1fa6652cca2009dd4a69f100a5 bfilter-0.10.3.ebuild 1540
 MD5 f90e9af9022576e75ff93a69b76fdb04 files/bfilter.8 11933
 MD5 ae7cda107d31d465fa7cc8ef61fb5849 files/bfilter.conf 156
 MD5 caa4efdfba69567046fe1205231ed8b8 files/bfilter.init 918
-MD5 8c7f7fd24bd2fc2681e185c511db4d57 files/digest-bfilter-0.10.1 67
 MD5 d6dea972b0d02c7f77440d983ce2e375 files/digest-bfilter-0.10.3 67
 MD5 2b32df81d3a9693c235baddd9386cce9 metadata.xml 1179
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFECqH1jG8pv1lIUX4RAu4bAJsGoZrk+n1KqS0Up8K1Ks7AET+j+wCdErnC
-j3opIpmjaOmNS3HXiVMHhg0=
-=icDV
------END PGP SIGNATURE-----
diff --git a/net-proxy/bfilter/bfilter-0.10.1.ebuild b/net-proxy/bfilter/bfilter-0.10.1.ebuild
deleted file mode 100644
index d49a9737f2a5..000000000000
--- a/net-proxy/bfilter/bfilter-0.10.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/bfilter-0.10.1.ebuild,v 1.2 2005/12/31 16:28:10 mrness Exp $
-
-inherit eutils
-
-DESCRIPTION="An ad-filtering web proxy featuring an effective heuristic ad-detection algorithm"
-HOMEPAGE="http://bfilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bfilter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="X debug"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/ace
-	=dev-libs/libsigc++-2.0*
-	X? ( =dev-cpp/gtkmm-2.4* )"
-DEPEND="${RDEPEND}
-	dev-util/scons
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-
-	# Provide user, group and chroot privilege lowering
-	epatch ${FILESDIR}/${P}-droppriv.patch
-}
-
-src_compile() {
-	econf `use_enable debug` `use_with X gui` || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# This is also created by openssh for privilege separation
-	keepdir /var/empty
-
-	#doman ${FILESDIR}/bfilter.8
-
-	dodoc AUTHORS ChangeLog
-	dohtml doc/*.png doc/*.jpg doc/*.html
-
-	newinitd ${FILESDIR}/bfilter.init bfilter
-	newconfd ${FILESDIR}/bfilter.conf bfilter
-}
-
-pkg_preinst() {
-	enewgroup bfilter
-	enewuser bfilter -1 -1 -1 bfilter
-}
-
-pkg_postinst() {
-	if has_version =${CATEGORY}/${PN}-0.9.4 ; then
-		ewarn "Please note that the filtering configuration files have been changed."
-		ewarn "Any custom settings defined in the rules and rules.local files"
-		ewarn "need to be converted to the new url and url.local files"
-		ewarn "(the old rules and rules.local can then be deleted). "
-		ewarn "See http://bfilter.sourceforge.net/doc/url-patterns.php for further details."
-	fi
-}
diff --git a/net-proxy/bfilter/files/bfilter-0.10.1-droppriv.patch b/net-proxy/bfilter/files/bfilter-0.10.1-droppriv.patch
deleted file mode 100644
index 01e852ffc0c6..000000000000
--- a/net-proxy/bfilter/files/bfilter-0.10.1-droppriv.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -ur bfilter-0.10.1/main/daemon/Daemon.cpp bfilter-0.10.1-droppriv/main/daemon/Daemon.cpp
---- bfilter-0.10.1/main/daemon/Daemon.cpp	2005-10-10 23:52:20.000000000 +0100
-+++ bfilter-0.10.1-droppriv/main/daemon/Daemon.cpp	2005-11-14 20:05:40.000000000 +0000
-@@ -52,6 +52,10 @@
- #include <deque>
- #include <list>
- #include <cstdlib>
-+#include <sys/stat.h>
-+#include <pwd.h>
-+#include <grp.h>
-+#include <netdb.h>
- 
- namespace po = boost::program_options;
- using namespace std;
-@@ -340,6 +344,69 @@
- }
- 
- bool
-+Daemon::droppriv(std::string const& chrootdir, std::string const& user, std::string const& group)
-+{
-+	uid_t uid = 0;
-+	uid_t gid = 0;
-+
-+	if (!chrootdir.empty() || !user.empty() || !group.empty()) {
-+		struct stat stat_r;
-+		struct passwd *user_r;
-+		struct group *group_r;
-+
-+		if (getuid()) {
-+			std::cerr << "Cannot lower privileges, not running as root" << std::endl;
-+			return false;
-+		}
-+		if (!chrootdir.empty() && stat(chrootdir.c_str(), &stat_r)) {
-+			if (!S_ISDIR(stat_r.st_mode)) {
-+				std::cerr << "Cannot lower privileges, chroot directory does not exist" << std::endl;
-+				return false;
-+			}
-+		}
-+		if (!user.empty()) {
-+			user_r = getpwnam(user.c_str());
-+			if (user_r) {
-+				uid = user_r->pw_uid;
-+			} else {
-+				std::cerr << "Cannot lower privileges, unknown user" << std::endl;
-+				return false;
-+			}
-+		}
-+		if (!group.empty()) {
-+			group_r = getgrnam(group.c_str());
-+			if (group_r) {
-+				gid = group_r->gr_gid;
-+			} else {
-+				std::cerr << "Cannot lower privileges, unknown group" << std::endl;
-+				return false;
-+			}
-+		}
-+	}
-+
-+	if (!chrootdir.empty()) {
-+		// Using gethostbyname before chrooting means that the chroot
-+		// directory can be empty (no etc/resolv.conf or dynamically
-+		// loaded lib/libnss* libraries). Using localhost here to
-+		// prevent remote name resolution does not work.
-+		gethostbyname("slashdot.org");
-+		if (chroot(chrootdir.c_str())) {
-+			std::cerr << "Cannot lower privileges, chroot directory no longer exists" << std::endl;
-+			return false;
-+		}
-+		chdir("/");
-+	}
-+	if (gid) {
-+		setgroups(0, NULL);
-+		setgid(gid);
-+	}
-+	if (uid) {
-+		setuid(uid);
-+	}
-+	return true;
-+}
-+
-+bool
- Daemon::run(bool nodaemon)
- {
- 	if (!nodaemon) {
-@@ -447,13 +514,19 @@
- {
- 	bool nodaemon = false;
- 	std::string confdir = string(SYSCONFDIR) + "/bfilter";
--	
-+	std::string chrootdir;
-+	std::string user;
-+	std::string group;
-+
- 	try {
- 		po::options_description desc("Allowed options");
- 		desc.add_options()
- 			("help,h", "Print help message")
- 			("version,v", "Print version")
- 			("confdir,c", po::value<string>(&confdir), "Set custom config directory")
-+			("chroot,r", po::value<string>(&chrootdir), "Set chroot directory")
-+			("user,u", po::value<string>(&user), "Set unprivileged user")
-+			("group,g", po::value<string>(&group), "Set unprivileged group")
- 			("nodaemon,n", po::bool_switch(&nodaemon), "Disable background daemon mode")
- 		;
- 		po::variables_map vm;
-@@ -476,6 +549,9 @@
- 	if (!daemon.init(confdir)) {
- 		exit(EXIT_FAILURE);
- 	}
-+	if (!daemon.droppriv(chrootdir, user, group)) {
-+		exit(EXIT_FAILURE);
-+	}
- 	if (!daemon.run(nodaemon)) {
- 		exit(EXIT_FAILURE);
- 	}
-diff -ur bfilter-0.10.1/main/daemon/Daemon.h bfilter-0.10.1-droppriv/main/daemon/Daemon.h
---- bfilter-0.10.1/main/daemon/Daemon.h	2005-01-14 16:54:32.000000000 +0000
-+++ bfilter-0.10.1-droppriv/main/daemon/Daemon.h	2005-11-14 18:22:58.000000000 +0000
-@@ -33,7 +33,7 @@
- {
- public:
- 	bool init(std::string const& confdir);
--	
-+	bool droppriv(std::string const& chrootdir, std::string const& user, std::string const& group);
- 	bool run(bool nodaemon);
- private:
- 	class ConfigErrorHandler;
diff --git a/net-proxy/bfilter/files/digest-bfilter-0.10.1 b/net-proxy/bfilter/files/digest-bfilter-0.10.1
deleted file mode 100644
index 8f7fca3ca0df..000000000000
--- a/net-proxy/bfilter/files/digest-bfilter-0.10.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c2439a22e9674feeba8cfbf337191e3 bfilter-0.10.1.tar.gz 2346339