[gentoo-commits] repo/gentoo:master commit in: net-proxy/bfilter/files/, net-proxy/bfilter/, profiles/

["Michał Górny" <mgorny@gentoo.org>]

commit:     373733c91e372cba08106b7cbe7f00c068477255
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 20:42:21 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 15 20:42:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=373733c9

net-proxy/bfilter: Remove last-rited pkg

Bug: https://bugs.gentoo.org/522578
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-proxy/bfilter/Manifest                         |  1 -
 net-proxy/bfilter/bfilter-1.1.4-r4.ebuild          | 84 ----------------------
 .../files/bfilter-1.1.4-external-boost.patch       | 63 ----------------
 .../bfilter/files/bfilter-1.1.4-glib-2.32.patch    | 39 ----------
 .../bfilter-1.1.4-gtkmm-X11-underlinking.patch     | 12 ----
 net-proxy/bfilter/files/bfilter.conf               |  4 --
 net-proxy/bfilter/files/bfilter.init               | 35 ---------
 net-proxy/bfilter/files/forwarding-proxy.xml       | 19 -----
 net-proxy/bfilter/files/forwarding.xml             |  5 --
 net-proxy/bfilter/metadata.xml                     | 21 ------
 profiles/package.mask                              |  1 -
 11 files changed, 284 deletions(-)

diff --git a/net-proxy/bfilter/Manifest b/net-proxy/bfilter/Manifest
deleted file mode 100644
index e49d7c75764..00000000000
--- a/net-proxy/bfilter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bfilter-1.1.4.tar.gz 3055651 BLAKE2B 07d9ef205bc6a5db307695e3f5380027de351b6130d2a05e51ba05f72bfc0c0634d00921bb90c340f0d5818b7fdce82927bcfe6afbfa0acd3d5af8fb866ea1db SHA512 d501e09e449a29f175ec5484ba5aa77ce6bd1a51cb146222fca3af4215c162aff885565086cb64be9dc7cdac63611be1a0970b3d2d81e3f2038009ea3f527e5e

diff --git a/net-proxy/bfilter/bfilter-1.1.4-r4.ebuild b/net-proxy/bfilter/bfilter-1.1.4-r4.ebuild
deleted file mode 100644
index 1d85ad3d580..00000000000
--- a/net-proxy/bfilter/bfilter-1.1.4-r4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic user
-
-DESCRIPTION="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="amd64 x86"
-IUSE="X debug"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/ace:=
-	dev-libs/libsigc++:2
-	X? ( dev-cpp/gtkmm:2.4 x11-libs/libX11 )
-	dev-libs/boost:="
-
-DEPEND="${RDEPEND}
-	dev-util/scons
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-glib-2.32.patch"
-	"${FILESDIR}/${P}-external-boost.patch"
-	"${FILESDIR}/${P}-gtkmm-X11-underlinking.patch"
-)
-
-RESTRICT="test" # boost's test API has changed
-
-src_prepare() {
-	default
-
-	# Some includes are missing and this breaks updates of ACE
-	sed -i \
-		-e "/#include <ace\/Synch.h>/a#include <ace\/Condition_T.h>\n#include <ace\/Guard_T.cpp>" \
-		libjs/nspr_impl/private.h \
-		main/*.h \
-		main/cache/*.h || die
-
-	mv configure.{in,ac} || die
-	rm -r boost || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	# Required to prevent narrowing conversion in lexcode.cpp, #572072
-	append-cxxflags -funsigned-char
-	econf \
-		$(use_enable debug) \
-		$(use_with X gui) \
-		--without-builtin-boost
-}
-
-src_install() {
-	default
-
-	insinto /etc/bfilter
-	doins "${FILESDIR}/forwarding.xml"
-
-	dodoc "${FILESDIR}/forwarding-proxy.xml"
-	dodoc -r doc/*
-
-	newinitd "${FILESDIR}/bfilter.init" bfilter
-	newconfd "${FILESDIR}/bfilter.conf" bfilter
-}
-
-pkg_preinst() {
-	enewgroup bfilter
-	enewuser bfilter -1 -1 -1 bfilter
-}
-
-pkg_postinst() {
-	elog "The documentation is available at"
-	elog "   http://bfilter.sourceforge.net/documentation.php"
-	elog "For forwarding bfilter service traffic through a proxy,"
-	elog "see forwarding-proxy.xml example installed in the doc directory."
-}

diff --git a/net-proxy/bfilter/files/bfilter-1.1.4-external-boost.patch b/net-proxy/bfilter/files/bfilter-1.1.4-external-boost.patch
deleted file mode 100644
index 6f185ca9f41..00000000000
--- a/net-proxy/bfilter/files/bfilter-1.1.4-external-boost.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nru bfilter-1.1.4.orig/configure.in bfilter-1.1.4/configure.in
---- bfilter-1.1.4.orig/configure.in	2007-11-11 23:14:49.000000000 +0100
-+++ bfilter-1.1.4/configure.in	2009-10-18 18:26:32.000000000 +0200
-@@ -260,11 +260,6 @@
- Makefile
- binreloc/Makefile
- foundation/Makefile
--boost/Makefile
--boost/libs/Makefile
--boost/libs/regex/Makefile
--boost/libs/program_options/Makefile
--boost/libs/test/Makefile
- reactor/Makefile
- mkskel/Makefile
- lexgen/Makefile
-diff -Nru bfilter-1.1.4.orig/main/daemon/Makefile.am bfilter-1.1.4/main/daemon/Makefile.am
---- bfilter-1.1.4.orig/main/daemon/Makefile.am	2007-01-19 20:21:02.000000000 +0100
-+++ bfilter-1.1.4/main/daemon/Makefile.am	2009-10-18 18:25:52.000000000 +0200
-@@ -6,7 +6,7 @@
- $(top_builddir)/boost/libs/program_options/libprogram_options.la
- else
- BOOST_CPPFLAGS =
--BOOST_LIBS     =
-+BOOST_LIBS     = -lboost_regex-mt -lboost_program_options-mt
- endif
- 
- AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" \
-diff -Nru bfilter-1.1.4.orig/main/gui/gtk/Makefile.am bfilter-1.1.4/main/gui/gtk/Makefile.am
---- bfilter-1.1.4.orig/main/gui/gtk/Makefile.am	2008-06-02 17:25:27.000000000 +0200
-+++ bfilter-1.1.4/main/gui/gtk/Makefile.am	2009-10-18 18:25:52.000000000 +0200
-@@ -50,7 +50,7 @@
- BOOST_LIBS     = $(top_builddir)/boost/libs/regex/libregex.la
- else
- BOOST_CPPFLAGS =
--BOOST_LIBS     =
-+BOOST_LIBS     = -lboost_regex-mt
- endif
- 
- if WITH_GUI
-diff -Nru bfilter-1.1.4.orig/Makefile.am bfilter-1.1.4/Makefile.am
---- bfilter-1.1.4.orig/Makefile.am	2007-11-11 23:16:04.000000000 +0100
-+++ bfilter-1.1.4/Makefile.am	2009-10-18 18:26:46.000000000 +0200
-@@ -1,7 +1,7 @@
- EXTRA_DIST = doc cmake bootstrap m4 VERSION CMakeLists.txt types.h pstdint.h \
- config.h.cm bfilter.desktop bfilter.png Doxyfile
- DISTCLEANFILES = itypes.h
--SUBDIRS = binreloc foundation boost reactor mkskel lexgen libjs main conf \
-+SUBDIRS = binreloc foundation reactor mkskel lexgen libjs main conf \
- packaging tests
- 
- dist_man_MANS = bfilter.8
-diff -Nru bfilter-1.1.4.orig/tests/Makefile.am bfilter-1.1.4/tests/Makefile.am
---- bfilter-1.1.4.orig/tests/Makefile.am	2007-05-07 16:19:40.000000000 +0200
-+++ bfilter-1.1.4/tests/Makefile.am	2009-10-18 18:25:52.000000000 +0200
-@@ -6,7 +6,7 @@
-                  $(top_builddir)/boost/libs/regex/libregex.la
- else
- BOOST_CPPFLAGS =
--BOOST_LIBS     =
-+BOOST_LIBS     = -lboost_regex-mt -lboost_unit_test_framework-mt
- endif
- 
- AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \

diff --git a/net-proxy/bfilter/files/bfilter-1.1.4-glib-2.32.patch b/net-proxy/bfilter/files/bfilter-1.1.4-glib-2.32.patch
deleted file mode 100644
index 7b4068b758e..00000000000
--- a/net-proxy/bfilter/files/bfilter-1.1.4-glib-2.32.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: bfilter-1.1.4/main/gui/gtk/CompiledImage.h
-===================================================================
---- bfilter-1.1.4.orig/main/gui/gtk/CompiledImage.h
-+++ bfilter-1.1.4/main/gui/gtk/CompiledImage.h
-@@ -24,7 +24,7 @@
- #include <config.h>
- #endif
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include <glibmm/refptr.h>
- #include <gdkmm/pixbuf.h>
- #include <stddef.h>
-Index: bfilter-1.1.4/main/gui/gtk/TrayMenu.h
-===================================================================
---- bfilter-1.1.4.orig/main/gui/gtk/TrayMenu.h
-+++ bfilter-1.1.4/main/gui/gtk/TrayMenu.h
-@@ -25,7 +25,7 @@
- #endif
- 
- #include "NonCopyable.h"
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include <memory>
- 
- namespace GtkGUI
-Index: bfilter-1.1.4/main/gui/gtk/img2src.sh
-===================================================================
---- bfilter-1.1.4.orig/main/gui/gtk/img2src.sh
-+++ bfilter-1.1.4/main/gui/gtk/img2src.sh
-@@ -4,7 +4,7 @@ cat <<END
- /* This file was generated by img2src.sh */
- 
- #include "CompiledImage.h"
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- END
- 

diff --git a/net-proxy/bfilter/files/bfilter-1.1.4-gtkmm-X11-underlinking.patch b/net-proxy/bfilter/files/bfilter-1.1.4-gtkmm-X11-underlinking.patch
deleted file mode 100644
index 2a474e5d386..00000000000
--- a/net-proxy/bfilter/files/bfilter-1.1.4-gtkmm-X11-underlinking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur -u a/configure.in b/configure.in
---- a/configure.in	2013-11-30 17:03:04.733971428 +0100
-+++ b/configure.in	2013-11-30 17:03:21.231971410 +0100
-@@ -205,7 +205,7 @@
-   [ with_gui="no" ])
- AM_CONDITIONAL(WITH_GUI, [test "$with_gui" = "yes"])
- if test "$with_gui" = "yes"; then
--  PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4)
-+  PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4 x11)
- dnl  PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.0)
- dnl  GTKMM_LIBS="$GTKMM_LIBS $GTHREAD_LIBS"
-   AC_SUBST(GTKMM_CFLAGS)

diff --git a/net-proxy/bfilter/files/bfilter.conf b/net-proxy/bfilter/files/bfilter.conf
deleted file mode 100644
index 3c533b418ea..00000000000
--- a/net-proxy/bfilter/files/bfilter.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Config file for /etc/init.d/bfilter
-
-# See the bfilter(8) man page for possible options to put here.
-BFILTER_OPTS="-u bfilter -g bfilter -r /etc/bfilter"

diff --git a/net-proxy/bfilter/files/bfilter.init b/net-proxy/bfilter/files/bfilter.init
deleted file mode 100644
index cd0156a9126..00000000000
--- a/net-proxy/bfilter/files/bfilter.init
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkresolvconf() {
-	#make /etc/bfilter/etc/resolv.conf if chroot is set
-	if [ "${BFILTER_OPTS#* -r *}" != "${BFILTER_OPTS}" ] ; then
-		local CHROOTDIR="${BFILTER_OPTS#* -r }"
-		CHROOTDIR="${CHROOTDIR%% *}"
-		mkdir -p "${CHROOTDIR}/etc" || return 1
-		if ! cmp -s /etc/resolv.conf "${CHROOTDIR}/etc/resolv.conf" ; then
-			cp -p /etc/resolv.conf "${CHROOTDIR}/etc/resolv.conf" || return 1
-		fi 
-	fi
-
-	return 0
-}
-
-start() {
-	checkresolvconf || return 1
-
-	ebegin "Starting bfilter"
-	start-stop-daemon --start --quiet --exec /usr/bin/bfilter -- ${BFILTER_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bfilter"
-	start-stop-daemon --stop --quiet --exec /usr/bin/bfilter
-	eend $?
-}

diff --git a/net-proxy/bfilter/files/forwarding-proxy.xml b/net-proxy/bfilter/files/forwarding-proxy.xml
deleted file mode 100644
index dafcbb1ed66..00000000000
--- a/net-proxy/bfilter/files/forwarding-proxy.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<forwarding>
-    <option name="Direct">
-    </option>
-    <option name="ISP Proxy" selected="selected">
-        <bypass>
-            <simple-hostnames/>
-            <host-mask>*.isp.com</host-mask>
-            <host-mask>192.168.*</host-mask>
-        </bypass>
-        <proxy-chain>
-            <proxy>
-                <type>socks4</type><!-- available types: http, socks4, socks4a and socks5 -->
-                <host>localhost</host>
-                <port>9050</port>
-            </proxy>
-        </proxy-chain>
-    </option>
-</forwarding>

diff --git a/net-proxy/bfilter/files/forwarding.xml b/net-proxy/bfilter/files/forwarding.xml
deleted file mode 100644
index 9b62c6bfc4a..00000000000
--- a/net-proxy/bfilter/files/forwarding.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<forwarding>
-    <option name="Direct" selected="selected">
-    </option>
-</forwarding>

diff --git a/net-proxy/bfilter/metadata.xml b/net-proxy/bfilter/metadata.xml
deleted file mode 100644
index ad49eeed7a0..00000000000
--- a/net-proxy/bfilter/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>BFilter is a filtering web proxy. It was originally intended for removing banner ads only, but at some point 
-it has been extended to remove popups and webbugs. It can't be used as a general purpose filtering proxy 
-because it was never intended this way. 
-
-For example you can't just block an arbitrary object, you can only hint the ad detector in its decision making.
-The main advantage BFilter has over the similar tools is its heuristic ad detection algorithm. The traditional 
-blocklist-based approach is also implemented, but it's mostly used for dealing with false positives. Unlike 
-other tools that require constant updates of their blocklists, BFilter manages to remove over 90% of ads 
-even with an empty blocklist!
-
-The javascript generated ads are not a problem for BFilter, as it has a javascript engine to combat them.
-BFilter is expected work with any browser that supports proxies (nearly any browser does), and can forward 
-requests to another HTTP proxy.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">bfilter</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 444db6912b6..2f5bc32cc59 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -482,7 +482,6 @@ dev-util/cucumber-expressions:5.0
 # Unmaintained in Gentoo and outstanding vulnerability
 # Masked for removal in 30 days. Bug #522578
 dev-libs/ace
-net-proxy/bfilter
 
 # Ulrich Müller <ulm@gentoo.org> (13 Apr 2019)
 # Last release in 2001, HOMEPAGE and SRC_URI are gone.