summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gentoo.org>2021-02-14 17:16:25 +0300
committerAndrew Savchenko <bircoph@gentoo.org>2021-02-14 17:45:22 +0300
commit8bd0a1cca8d26af615e8554e6da1582cc082c038 (patch)
tree233e3114652417fd610ad7be5f94eca884866b84
parentapp-text/xpdf: remove old (diff)
downloadgentoo-8bd0a1cca8d26af615e8554e6da1582cc082c038.tar.gz
gentoo-8bd0a1cca8d26af615e8554e6da1582cc082c038.tar.bz2
gentoo-8bd0a1cca8d26af615e8554e6da1582cc082c038.zip
net-proxy/privoxy: remove old and vulnerable versions
Bug: https://bugs.gentoo.org/768096 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
-rw-r--r--net-proxy/privoxy/Manifest2
-rw-r--r--net-proxy/privoxy/files/privoxy-3.0.19-gentoo.patch114
-rw-r--r--net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch15
-rw-r--r--net-proxy/privoxy/files/privoxy-3.0.28-null-termination.patch13
-rw-r--r--net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch21
-rw-r--r--net-proxy/privoxy/privoxy-3.0.28-r1.ebuild133
-rw-r--r--net-proxy/privoxy/privoxy-3.0.29.ebuild150
7 files changed, 0 insertions, 448 deletions
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index e37cde2c908..0aaec43c89b 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,3 +1 @@
-DIST privoxy-3.0.28-stable-src.tar.gz 1753809 BLAKE2B 1ea0d6339c96bd294eadc124ebac252c43dcdc062709868668959bdb4f959267afb2ec7f27fc0d58db3655102f2412f1c8acb273267d447271465ac21f7a9be4 SHA512 5d58024ae73d623a2b8fb2ac49e18f047dfe252c9441388f025cf888c0e4b11546b8796cfa559759ee137002b1b31b30ad28b356ae226836454f32591eb835fc
-DIST privoxy-3.0.29-stable-src.tar.gz 1830550 BLAKE2B ecd0a78f2c4a3a6006fb229a7115a3c1b5041508233ef36d7995607984e5f9fbf7f117aa4611f384eed4434a6a3204a7f31a33857112d5f1f0a71fddb2134df3 SHA512 2f483a37d697738815f4c58a775fbf116a34ac5e0e74d19814252c5ff1572350181066d468327189faf20c92d808d551b0017a9525ec98276330ee539554c1ba
DIST privoxy-3.0.31-stable-src.tar.gz 1839901 BLAKE2B 08564fb8de37d334844de10dfecc39b3f10cee996b3931be4e2d7e33eccd7ec115d7487353496de0fd645fc76ea237aa907eda2fb7fa8aad14050280fc083cc7 SHA512 0bea9973ac22e594a959452390c8612605dbf1fd55151632d35ecc7fe0ef9ca87cc1694a8bcb0511467445ec414b721b9d33651d917b2a8083768d8905ec68ed
diff --git a/net-proxy/privoxy/files/privoxy-3.0.19-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.19-gentoo.patch
deleted file mode 100644
index 4571e24e1f0..00000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.19-gentoo.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -62,8 +62,8 @@
- MAN_DEST = $(MAN_DIR)/man1
- MAN_PAGE = privoxy.1
- SHARE_DEST = @datadir@
--DOC_DEST = $(SHARE_DEST)/doc/privoxy
--VAR_DEST = @localstatedir@
-+DOC_DEST = @docdir@
-+VAR_DEST = /var
- LOGS_DEST = $(VAR_DEST)/log/privoxy
- PIDS_DEST = $(VAR_DEST)/run
-
-@@ -852,7 +852,6 @@
- $(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html $(DESTDIR)$$DOC/man-page;\
- $(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html $(DESTDIR)$$DOC/index.html;\
- $(INSTALL) $(INSTALL_T) AUTHORS $(DESTDIR)$$DOC;\
-- $(INSTALL) $(INSTALL_T) LICENSE $(DESTDIR)$$DOC;\
- $(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\
- $(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\
- $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\
-@@ -923,34 +922,8 @@
- fi ;\
- $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
- for i in $(CONFIGS); do \
-- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
-- $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
-- $(ECHO) Installing fresh $$i;\
- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
-- elif [ -s "$(CONF_DEST)/$$i" ]; then \
-- $(ECHO) Installing $$i as $$i.new ;\
-- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
-- NEW=1;\
-- else \
-- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
-- fi ;\
- done ;\
-- if [ -n "$$NEW" ]; then \
-- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
-- $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
-- fi ;\
-- [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
-- $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
-- $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
-- if [ x$$USER != x ]; then \
-- $(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile || \
-- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
-- fi ;\
-- if [ x$$GROUP_T != x ]; then \
-- $(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile || \
-- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
-- fi ;\
-- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
- if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
- if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
- $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
---- a/config
-+++ b/config
-@@ -265,7 +265,7 @@
- #
- # No trailing "/", please.
- #
--confdir .
-+confdir /etc/privoxy
- #
- #
- # 2.2. templdir
-@@ -322,7 +322,7 @@
- #
- # No trailing "/", please.
- #
--logdir .
-+logdir /var/log/privoxy
- #
- #
- # 2.4. actionsfile
-@@ -462,7 +462,7 @@
- # Any log files must be writable by whatever user Privoxy is
- # being run as (on Unix, default user id is "privoxy").
- #
--logfile logfile
-+logfile privoxy.log
- #
- #
- # 2.7. trustfile
---- a/default.action.master
-+++ b/default.action.master
-@@ -566,7 +566,7 @@
- +client-header-tagger{css-requests} \
- +client-header-tagger{image-requests} \
- +hide-from-header{block} \
--+set-image-blocker{pattern} \
-++set-image-blocker{blank} \
- }
- standard.Cautious
-
-@@ -588,7 +588,7 @@
- +hide-from-header{block} \
- +hide-referrer{conditional-block} \
- +session-cookies-only \
--+set-image-blocker{pattern} \
-++set-image-blocker{blank} \
- }
- standard.Medium
-
-@@ -627,7 +627,7 @@
- +hide-referrer{conditional-block} \
- +limit-connect{,} \
- +overwrite-last-modified{randomize} \
--+set-image-blocker{pattern} \
-++set-image-blocker{blank} \
- }
- standard.Advanced
-
diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch b/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch
deleted file mode 100644
index 66d14a9fc3c..00000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff '--color=auto' -Naurd privoxy-3.0.28-stable.orig/jcc.c privoxy-3.0.28-stable/jcc.c
---- privoxy-3.0.28-stable.orig/jcc.c 2018-12-30 21:40:13.000000000 +0300
-+++ privoxy-3.0.28-stable/jcc.c 2020-07-11 14:43:39.851143843 +0300
-@@ -4013,7 +4013,10 @@
- }
- #endif
-
-- chdir("/");
-+ if (chdir("/"))
-+ {
-+ log_error(LOG_LEVEL_FATAL, "Cannot chdir /");
-+ }
-
- } /* -END- if (daemon_mode) */
-
diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-null-termination.patch b/net-proxy/privoxy/files/privoxy-3.0.28-null-termination.patch
deleted file mode 100644
index 295b739a05f..00000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.28-null-termination.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff '--color=auto' -Naurd privoxy-3.0.28-stable.orig/gateway.c privoxy-3.0.28-stable/gateway.c
---- privoxy-3.0.28-stable.orig/gateway.c 2018-12-30 21:40:13.000000000 +0300
-+++ privoxy-3.0.28-stable/gateway.c 2020-07-11 14:55:15.442676106 +0300
-@@ -1103,7 +1103,8 @@
- cbuf[client_pos++] = (char)(hostlen & 0xffu);
- assert(sizeof(cbuf) - client_pos > (size_t)255);
- /* Using strncpy because we really want the nul byte padding. */
-- strncpy(cbuf + client_pos, target_host, sizeof(cbuf) - client_pos);
-+ strncpy(cbuf + client_pos, target_host, sizeof(cbuf) - client_pos - 1);
-+ cbuf[sizeof(cbuf)-1] = 0;
- client_pos += (hostlen & 0xffu);
- cbuf[client_pos++] = (char)((target_port >> 8) & 0xff);
- cbuf[client_pos++] = (char)((target_port ) & 0xff);
diff --git a/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch b/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch
deleted file mode 100644
index 2890b824d7e..00000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/project.h b/project.h
-index ec3c1559..6c744415 100644
---- a/project.h
-+++ b/project.h
-@@ -54,16 +54,6 @@
- #define HASH_OF_HOST_BUF_SIZE 16
- #endif /* FEATURE_HTTPS_INSPECTION */
-
--#ifdef FEATURE_PTHREAD
--# include <pthread.h>
-- typedef pthread_mutex_t privoxy_mutex_t;
--#else
--# ifdef _WIN32
--# include <windows.h>
--# endif
-- typedef CRITICAL_SECTION privoxy_mutex_t;
--#endif
--
- #ifdef FEATURE_HTTPS_INSPECTION_MBEDTLS
- #include "mbedtls/net_sockets.h"
- #include "mbedtls/entropy.h"
diff --git a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
deleted file mode 100644
index cab9db7be63..00000000000
--- a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd toolchain-funcs
-
-[ "${PV##*_}" = "beta" ] &&
- PRIVOXY_STATUS="beta" ||
- PRIVOXY_STATUS="stable"
-
-HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/"
-DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing privacy"
-SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
-
-IUSE="+acl client-tags compression editor extended-host-patterns
-external-filters +fast-redirects +force fuzz graceful-termination
-+image-blocking ipv6 lfs png-images selinux +stats +threads toggle
-tools whitelists +zlib"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86"
-LICENSE="GPL-2"
-
-DEPEND="
- acct-group/privoxy
- acct-user/privoxy
- dev-libs/libpcre
- zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}
- extended-host-patterns? ( dev-lang/perl )
- selinux? ( sec-policy/selinux-privoxy )
- tools? (
- net-misc/curl
- dev-lang/perl
- )
-"
-REQUIRED_USE="
- client-tags? ( threads )
- compression? ( zlib )
- fuzz? ( zlib )
- toggle? ( editor )
-"
-
-S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.19-gentoo.patch
- "${FILESDIR}"/${P}-chdir.patch
- "${FILESDIR}"/${P}-null-termination.patch
- "${FILESDIR}"/${P}-strip.patch
-)
-
-pkg_pretend() {
- if ! use threads; then
- ewarn
- ewarn "Privoxy may be very slow without threads support, consider to enable them."
- ewarn "See also http://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
- ewarn
- fi
-}
-
-src_prepare() {
- default
- mv configure.in configure.ac || die
- sed -i "s|/p\.p/|/config.privoxy.org/|g" tools/privoxy-regression-test.pl || die
-
- # autoreconf needs to be called even if we don't modify any autotools source files
- # See main makefile
- eautoreconf
-}
-
-src_configure() {
- # --with-debug only enables debug CFLAGS
- # --with-docbook and --with-db2html and their deps are useless,
- # since docs are already pregenerated in the source tarball
- econf \
- --sysconfdir=/etc/privoxy \
- --enable-dynamic-pcre \
- --with-user=privoxy \
- --with-group=privoxy \
- $(use_enable acl acl-support) \
- $(use_enable compression) \
- $(use_enable client-tags) \
- $(use_enable editor) \
- $(use_enable extended-host-patterns) \
- $(use_enable fast-redirects) \
- $(use_enable force) \
- $(use_enable fuzz) \
- $(use_enable graceful-termination) \
- $(use_enable image-blocking) \
- $(use_enable ipv6 ipv6-support) \
- $(use_enable kernel_FreeBSD accept-filter) \
- $(use_enable lfs large-file-support) \
- $(use_enable png-images no-gifs) \
- $(use_enable stats) \
- $(use_enable threads pthread) \
- $(use_enable toggle) \
- $(use_enable whitelists trust-files) \
- $(use_enable zlib)
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}/privoxy.initd-3" privoxy
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/privoxy.logrotate" privoxy
-
- diropts -m 0750 -g privoxy -o privoxy
- keepdir /var/log/privoxy
-
- use extended-host-patterns && newbin tools/url-pattern-translator.pl privoxy-url-pattern-translator.pl
- if use tools; then
- dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl}
- newbin tools/uagen.pl privoxy-uagen.pl
- fi
-
- rmdir "${ED}/var/run" || die
- chown privoxy:root "${ED}/etc/privoxy" || die
-}
-
-pkg_postinst() {
- if use extended-host-patterns; then
- ewarn
- ewarn "You enabled extended-host-patterns, now you *must* convert all action files in"
- ewarn "PCRE-compatible format, or privoxy will fail to start. Helper tool"
- ewarn "privoxy-url-pattern-translator.pl is available."
- ewarn
- fi
-}
diff --git a/net-proxy/privoxy/privoxy-3.0.29.ebuild b/net-proxy/privoxy/privoxy-3.0.29.ebuild
deleted file mode 100644
index ded50272b29..00000000000
--- a/net-proxy/privoxy/privoxy-3.0.29.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd toolchain-funcs
-
-[ "${PV##*_}" = "beta" ] &&
- PRIVOXY_STATUS="beta" ||
- PRIVOXY_STATUS="stable"
-
-HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/"
-DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing privacy"
-SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
-
-IUSE="+acl brotli client-tags compression editor extended-host-patterns
-extended-statistics external-filters +fast-redirects +force fuzz
-graceful-termination +image-blocking ipv6 lfs +mbedtls openssl
-png-images selinux ssl +stats +threads toggle tools whitelists
-+zlib"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc ~x86"
-LICENSE="GPL-2+"
-
-DEPEND="
- acct-group/privoxy
- acct-user/privoxy
- dev-libs/libpcre
- brotli? ( app-arch/brotli )
- ssl? (
- mbedtls? ( net-libs/mbedtls )
- openssl? ( dev-libs/openssl )
- )
- zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}
- extended-host-patterns? ( dev-lang/perl )
- selinux? ( sec-policy/selinux-privoxy )
- tools? (
- net-misc/curl
- dev-lang/perl
- )
-"
-REQUIRED_USE="
- client-tags? ( threads )
- toggle? ( editor )
- compression? ( zlib )
- brotli? ( zlib )
- fuzz? ( zlib )
- ssl? ( ^^ ( mbedtls openssl ) threads )
-"
-
-S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${PN}-3.0.28-chdir.patch
- "${FILESDIR}"/${PN}-3.0.28-null-termination.patch
- "${FILESDIR}"/${PN}-3.0.28-strip.patch
- "${FILESDIR}"/${P}-pthread.patch
-)
-
-pkg_pretend() {
- if ! use threads; then
- ewarn
- ewarn "Privoxy may be very slow without threads support, consider to enable them."
- ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
- ewarn
- fi
-}
-
-src_prepare() {
- default
- mv configure.in configure.ac || die
- sed -i "s|/p\.p/|/config.privoxy.org/|g" tools/privoxy-regression-test.pl || die
-
- # autoreconf needs to be called even if we don't modify any autotools source files
- # See main makefile
- eautoreconf
-}
-
-src_configure() {
- local myconf="--without-mbedtls --without-openssl"
- if use ssl; then
- myconf="$(use_with mbedtls) $(use_with openssl)"
- fi
-
- # --with-debug only enables debug CFLAGS
- # --with-docbook and --with-db2html and their deps are useless,
- # since docs are already pregenerated in the source tarball
- econf \
- --sysconfdir=/etc/privoxy \
- --enable-dynamic-pcre \
- --with-user=privoxy \
- --with-group=privoxy \
- $(use_enable acl acl-support) \
- $(use_enable compression) \
- $(use_enable client-tags) \
- $(use_enable editor) \
- $(use_enable extended-host-patterns pcre-host-patterns) \
- $(use_enable extended-statistics) \
- $(use_enable fast-redirects) \
- $(use_enable force) \
- $(use_enable fuzz) \
- $(use_enable graceful-termination) \
- $(use_enable image-blocking) \
- $(use_enable ipv6 ipv6-support) \
- $(use_enable kernel_FreeBSD accept-filter) \
- $(use_enable lfs large-file-support) \
- $(use_enable png-images no-gifs) \
- $(use_enable stats) \
- $(use_enable threads pthread) \
- $(use_enable toggle) \
- $(use_enable whitelists trust-files) \
- $(use_enable zlib) \
- $(use_with brotli) \
- ${myconf}
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}/privoxy.initd-3" privoxy
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/privoxy.logrotate" privoxy
-
- diropts -m 0750 -g privoxy -o privoxy
- keepdir /var/log/privoxy
-
- use extended-host-patterns && newbin tools/url-pattern-translator.pl privoxy-url-pattern-translator.pl
- if use tools; then
- dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl}
- newbin tools/uagen.pl privoxy-uagen.pl
- fi
-
- rmdir "${ED}/var/run" || die
- chown privoxy:root "${ED}/etc/privoxy" || die
-}
-
-pkg_postinst() {
- if use extended-host-patterns; then
- ewarn
- ewarn "You enabled extended-host-patterns, now you *must* convert all action files in"
- ewarn "PCRE-compatible format, or privoxy will fail to start. Helper tool"
- ewarn "privoxy-url-pattern-translator.pl is available."
- ewarn
- fi
-}