From 321320060479e4a9d76ff5a79ce56ba860972c67 Mon Sep 17 00:00:00 2001 From: Andrew Savchenko Date: Sat, 3 Apr 2021 18:31:00 +0300 Subject: net-proxy/privoxy: remove old version Bug: https://bugs.gentoo.org/771960 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Savchenko --- net-proxy/privoxy/Manifest | 1 - .../privoxy/files/privoxy-3.0.29-gentoo.patch | 118 ----------------- net-proxy/privoxy/privoxy-3.0.31.ebuild | 147 --------------------- 3 files changed, 266 deletions(-) delete mode 100644 net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch delete mode 100644 net-proxy/privoxy/privoxy-3.0.31.ebuild diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest index ca5d8acc7e5b..2bb3d36bce49 100644 --- a/net-proxy/privoxy/Manifest +++ b/net-proxy/privoxy/Manifest @@ -1,2 +1 @@ -DIST privoxy-3.0.31-stable-src.tar.gz 1839901 BLAKE2B 08564fb8de37d334844de10dfecc39b3f10cee996b3931be4e2d7e33eccd7ec115d7487353496de0fd645fc76ea237aa907eda2fb7fa8aad14050280fc083cc7 SHA512 0bea9973ac22e594a959452390c8612605dbf1fd55151632d35ecc7fe0ef9ca87cc1694a8bcb0511467445ec414b721b9d33651d917b2a8083768d8905ec68ed DIST privoxy-3.0.32-stable-src.tar.gz 1834528 BLAKE2B c846dada5fd34b80be9f7a75dc4177f3907241f6cf28b4120929687523d449d73b6a78bfe73f0a1086fbb3a8388103beb1e5a62becdffa24bf57d34cbb6cda56 SHA512 da41c0045bf593219df64718645eff984b5df43737811cc0fa12fce7e8ae1ab59eefbe20f23d6ce8f62216cfd81f1a9c319688d15693c25eed36010f3e1d5ffd diff --git a/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch deleted file mode 100644 index 572d03439b97..000000000000 --- a/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/config privoxy-3.0.29-stable/config ---- privoxy-3.0.29-stable.orig/config 2020-11-28 13:19:00.000000000 +0300 -+++ privoxy-3.0.29-stable/config 2021-01-06 19:44:52.824746891 +0300 -@@ -259,7 +259,7 @@ - # - # No trailing "/", please. - # --confdir . -+confdir /etc/privoxy - # - # 2.2. templdir - # ============== -@@ -344,7 +344,7 @@ - # - # No trailing "/", please. - # --logdir . -+logdir /var/log/privoxy - # - # 2.5. actionsfile - # ================= -@@ -477,7 +477,7 @@ - # require additional software to do it. For details, please - # refer to the documentation for your operating system. - # --logfile logfile -+logfile privoxy.log - # - # 2.8. trustfile - # =============== -diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/default.action.master privoxy-3.0.29-stable/default.action.master ---- privoxy-3.0.29-stable.orig/default.action.master 2020-11-28 13:19:00.000000000 +0300 -+++ privoxy-3.0.29-stable/default.action.master 2021-01-06 19:44:52.825746892 +0300 -@@ -559,7 +559,7 @@ - +client-header-tagger{image-requests} \ - +client-header-tagger{range-requests} \ - +hide-from-header{block} \ --+set-image-blocker{pattern} \ -++set-image-blocker{blank} \ - } - standard.Cautious - -@@ -582,7 +582,7 @@ - +hide-from-header{block} \ - +hide-referrer{conditional-block} \ - +session-cookies-only \ --+set-image-blocker{pattern} \ -++set-image-blocker{blank} \ - } - standard.Medium - -@@ -622,7 +622,7 @@ - +hide-referrer{conditional-block} \ - +limit-connect{,} \ - +overwrite-last-modified{randomize} \ --+set-image-blocker{pattern} \ -++set-image-blocker{blank} \ - } - standard.Advanced - -diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/GNUmakefile.in privoxy-3.0.29-stable/GNUmakefile.in ---- privoxy-3.0.29-stable.orig/GNUmakefile.in 2020-11-28 13:19:00.000000000 +0300 -+++ privoxy-3.0.29-stable/GNUmakefile.in 2021-01-06 19:45:20.535798829 +0300 -@@ -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 - -@@ -890,8 +890,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) LICENSE.GPLv3 $(DESTDIR)$$DOC;\ - $(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\ - $(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\ - $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\ -@@ -962,34 +960,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 | \ diff --git a/net-proxy/privoxy/privoxy-3.0.31.ebuild b/net-proxy/privoxy/privoxy-3.0.31.ebuild deleted file mode 100644 index a6a68fbfe1bb..000000000000 --- a/net-proxy/privoxy/privoxy-3.0.31.ebuild +++ /dev/null @@ -1,147 +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}"/${PN}-3.0.29-gentoo.patch - "${FILESDIR}"/${PN}-3.0.28-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 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 -} -- cgit v1.2.3