From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- net-proxy/privoxy/Manifest | 7 +- net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch | 15 +++ .../files/privoxy-3.0.28-null-termination.patch | 13 ++ net-proxy/privoxy/files/privoxy-3.0.28-strip.patch | 47 ++++++++ net-proxy/privoxy/privoxy-3.0.26.ebuild | 2 +- net-proxy/privoxy/privoxy-3.0.28-r1.ebuild | 133 +++++++++++++++++++++ net-proxy/privoxy/privoxy-3.0.28.ebuild | 126 ------------------- 7 files changed, 214 insertions(+), 129 deletions(-) create mode 100644 net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch create mode 100644 net-proxy/privoxy/files/privoxy-3.0.28-null-termination.patch create mode 100644 net-proxy/privoxy/files/privoxy-3.0.28-strip.patch create mode 100644 net-proxy/privoxy/privoxy-3.0.28-r1.ebuild delete mode 100644 net-proxy/privoxy/privoxy-3.0.28.ebuild (limited to 'net-proxy/privoxy') diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest index f7533f62dd83..a4355c8875aa 100644 --- a/net-proxy/privoxy/Manifest +++ b/net-proxy/privoxy/Manifest @@ -1,9 +1,12 @@ AUX privoxy-3.0.19-gentoo.patch 3661 BLAKE2B 4785f7ab39cf8592eb142717a50359a02f8e3e507266b92998f658467024b244558e179f975dee91f6bdd16cb96b222a036ce5d8738873d200c7a47c94232277 SHA512 e0f916f33b8f17375b60686a0e4795883f29e46c55e273e0a69fae63d4b4e5a2585bb86b04aa288fdd75cdf51eedf7d72a9f8092e13a853e934e0029ae919a24 +AUX privoxy-3.0.28-chdir.patch 426 BLAKE2B c5a12e6c6edadf2836bf1d1965b83d0e3bb3bc177caaed0dd80ad918fbbba1716c23b778b97c456ee06cef9a8f20f9bd97078549d06bd8740f8900c19842fdf7 SHA512 495b93f3356af647dc6a75ac871de675be4f0bf63a60157b8d619efc9ecdc704e7ecc2c6afe04f5bfd854eef4084fbf989daaf08c04e8fb7c3d2265d451069d5 +AUX privoxy-3.0.28-null-termination.patch 774 BLAKE2B f3cfb0b941fcc7d3491d8660bf34dc74f986c48ba21c6fd07ceb9e93467bc434fcfd1389af888501aa33ece59c0f718e309baee727830fafd0b3e0ac7e547990 SHA512 0b94e1f204a5bd56ca66c0d25aa17317e4d074d909aa1dd16ceb8c080921b1bd86ce0cc5427e6f583adb0ff7b85143f33196a2ad8e3e6c7af37b6c308c23cfec +AUX privoxy-3.0.28-strip.patch 1784 BLAKE2B 4f92d7a34a9023405cca813629bb9b200d802061c49d72c0aa413d16b3e714d723c4aba48640e050b0960559a0170bc688742deeb8bcd233eee96be0cfc1bb7b SHA512 78713e7bf1379a0e65c775e415e15ed140873cc48b388d46ce79a24acf64f5c777f1e0e489d912fa7bff8b6acc910fd074e0d755116e4e5d52194d483a30ed67 AUX privoxy.initd-3 639 BLAKE2B 69d935e42ef4bf79868e0b457751b1dfb6a0b5805d19c74bdef007b54ad60adab784f98c4a9898306778cc41157f91b029978a6534aa00c0b00fcecdbc1ca11f SHA512 0bfd7ab2e42c4905f2542a4dbd93cf30d15a8808d527e6bcb6b14f75de226c94c0e0dea6ff69bbac37d3da605acfa2035e2d0e9fe0a41d7beb33cfea5ed2340b AUX privoxy.logrotate 191 BLAKE2B 587f6211d4938481a1dac77b79a1c32ea491c88514ed7dd42f1cdd7e2c344bfa1a4cde29010a5700f7a1847df1f91e9e59ffed45a386ba12a3cf29fac12a5488 SHA512 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9 AUX privoxy.service 248 BLAKE2B 4b39a4a55af8557458d3d087ab335431b39eb156bc5a3d32979627608f2a3926b2459822c827d557a86c20da5c8c6291941eb01db9adc7fb458e913672d574a0 SHA512 0f3484f06521a66b984fda7238f175a135b22fa5a00dc0c8caadd380d21bfecdae7a6c8d2c0d9a4a3c2858539913722be2b7d4fddd17ea2c95f4e151c3f74ca0 DIST privoxy-3.0.26-stable-src.tar.gz 1741772 BLAKE2B 19dc72d93535e6eb960a53e3679886655b2aff037ad6002844eb76c970c7da52d016b7a54993e3dcf453c394da354cf8ec8f1f23a02b9216240e5460d6239b34 SHA512 e448305287d0451c761b76b8d8974ea1ec837b621bbb498a7ff16a54cb4d8f1f734efe2eef03235c01163bb40e225785065aad6ee265a31d90970ab98af11044 DIST privoxy-3.0.28-stable-src.tar.gz 1753809 BLAKE2B 1ea0d6339c96bd294eadc124ebac252c43dcdc062709868668959bdb4f959267afb2ec7f27fc0d58db3655102f2412f1c8acb273267d447271465ac21f7a9be4 SHA512 5d58024ae73d623a2b8fb2ac49e18f047dfe252c9441388f025cf888c0e4b11546b8796cfa559759ee137002b1b31b30ad28b356ae226836454f32591eb835fc -EBUILD privoxy-3.0.26.ebuild 3431 BLAKE2B 5ba98464325d2df8b8bbb7a8e8c8d60d37bc12237ba33704f3bfae74ba062438f434bafe64d475f160b5cd726875cf821a550a6f79380626954423be39530e60 SHA512 fa12dbb1273d8ed81c57c79def3c460cb16575a3a33db8ca57c137010d0270f999483a1a31d6224a6367386af265652b8ed82a4cf170c40b06618ff1a6470c96 -EBUILD privoxy-3.0.28.ebuild 3425 BLAKE2B 1ab81a132ef4960a1974c9270c7e00bb3eea617e667b0f676b663b893afa2eb6e31140c71da7dad2619460e8db8a5a2bcec57a0f7f7de2d581d4205d8883fdf1 SHA512 37be5e2d6ef38a3187acffd880e7e9570711ecb9224c5381e472cd53ef14b7df66ad22805ee136a2852ce062af5a13fe9f0a5ebb8715d3a4cdfdcfad2728f332 +EBUILD privoxy-3.0.26.ebuild 3432 BLAKE2B a3716db8d65b192f58a0dc30f93240c5a9fd90fc12c55b51182684c05c46a3be77ea490fbfc6d2b7f7623e68989ba55d72ed7d7ffbac315cd7a83a677d393652 SHA512 bde8f38c2cab1242496290248c455fb5262e1e22b5870ca3793f042a83e068603a1baa6a2dbbd64073e441835faea7b2fa35640268cc0fb2158a7f2104d26478 +EBUILD privoxy-3.0.28-r1.ebuild 3611 BLAKE2B 8b320338637b181c9abb1354f023dbaea33e93278b6792c233e439a0a62398a3fbd9eb4661280ad878e9a85d292aefb477c13a6b7e00bc3461ef7c448d7cf7a8 SHA512 92b99b8e5cf6b747c8c40c93840428e7b8c3d7198b74500646dfd97cf2384f632418aadf50cc952d84f7b834c9340ffab9508c2d55bdbba34e59c29da5dcc650 MISC metadata.xml 2440 BLAKE2B f19609a881546a03d6bc5c76b182c5798feaa567369342c0a25994bbf12eff83db4c7b4e9af40e703500b6aa8dc58e49b2d4240958ddd6030bca0b567f77c196 SHA512 f620d755d33400faa3f58b49af79bebe1a5b59ed382e93844c761e3095009af9b1201b3a9d2c692dc21e871a19eda57d95b856c26f97e6496912fa80a1315f4f diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch b/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch new file mode 100644 index 000000000000..66d14a9fc3c4 --- /dev/null +++ b/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch @@ -0,0 +1,15 @@ +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 new file mode 100644 index 000000000000..295b739a05f6 --- /dev/null +++ b/net-proxy/privoxy/files/privoxy-3.0.28-null-termination.patch @@ -0,0 +1,13 @@ +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.28-strip.patch b/net-proxy/privoxy/files/privoxy-3.0.28-strip.patch new file mode 100644 index 000000000000..2ca24330b46c --- /dev/null +++ b/net-proxy/privoxy/files/privoxy-3.0.28-strip.patch @@ -0,0 +1,47 @@ +Privory uses STRIP Makefile variable for passing strip argument, +this clashes with STRIP set in the environment. So rename STRIP -> +STRIP_ARGS and then use real STRIP instead of STRIP_PROG with +fallback on predefined "strip" if STRIP is not set. + +--- privoxy-3.0.28-stable/GNUmakefile.in.orig 2020-08-19 15:24:46.930551734 +0300 ++++ privoxy-3.0.28-stable/GNUmakefile.in 2020-08-19 16:12:18.214837417 +0300 +@@ -117,7 +117,7 @@ + CP = cp -f + RMDIR = rmdir + MKDIR = ./mkinstalldirs +-STRIP_PROG = strip ++STRIP ?= strip + SED = sed + GREP = grep + CAT = cat +@@ -391,7 +391,7 @@ + @$(ECHO) "You have run autoconf && autoheader && ./configure right?" + @$(ECHO) "" + $(MAKE) $(PROGRAM) +- $(STRIP_PROG) $(PROGRAM) ++ $(STRIP) $(PROGRAM) + $(LN) -s `pwd` ../privoxy-$(VERSION)-$(CODE_STATUS) + # add program + (cd .. && $(TAR) --exclude "PACKAGERS" -cvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM)) +@@ -822,7 +822,7 @@ + fi) + + install-strip: +- $(MAKE) install STRIP=-s ++ $(MAKE) install STRIP_ARG=-s + + # FIXME: Test USER and GROUP on Slack to make sure this works as + # intended. +@@ -848,10 +848,10 @@ + $(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \ + $(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST) + @# Install the executable binary, strip if invoked as install-strip +- @test -n "$(STRIP)" &&\ ++ @test -n "$(STRIP_ARG)" &&\ + $(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\ + $(ECHO) Installing $(PROGRAM) executable to $(DESTDIR)$(SBIN_DEST) +- $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(DESTDIR)$(SBIN_DEST) ++ $(INSTALL) $(INSTALL_P) $(STRIP_ARG) $(PROGRAM) $(DESTDIR)$(SBIN_DEST) + + @# Install the DOCS and man page. install-sh only does one file at a time. + @# FIXME: only handles jpegs. diff --git a/net-proxy/privoxy/privoxy-3.0.26.ebuild b/net-proxy/privoxy/privoxy-3.0.26.ebuild index 1eec1ca7ab74..6f7945dded49 100644 --- a/net-proxy/privoxy/privoxy-3.0.26.ebuild +++ b/net-proxy/privoxy/privoxy-3.0.26.ebuild @@ -9,7 +9,7 @@ inherit autotools systemd toolchain-funcs user PRIVOXY_STATUS="beta" || PRIVOXY_STATUS="stable" -HOMEPAGE="http://www.privoxy.org https://sourceforge.net/projects/ijbswa/" +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" diff --git a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild new file mode 100644 index 000000000000..f462541fef18 --- /dev/null +++ b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild @@ -0,0 +1,133 @@ +# 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.28.ebuild b/net-proxy/privoxy/privoxy-3.0.28.ebuild deleted file mode 100644 index 361254fd1243..000000000000 --- a/net-proxy/privoxy/privoxy-3.0.28.ebuild +++ /dev/null @@ -1,126 +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 user - -[ "${PV##*_}" = "beta" ] && - PRIVOXY_STATUS="beta" || - PRIVOXY_STATUS="stable" - -HOMEPAGE="http://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 ~ppc ~ppc64 ~sparc ~x86" -LICENSE="GPL-2" - -DEPEND=" - 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=" - compression? ( zlib ) - toggle? ( editor ) -" - -S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}" - -PATCHES=( "${FILESDIR}"/${PN}-3.0.19-gentoo.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 -} - -pkg_setup() { - enewgroup privoxy - enewuser privoxy -1 -1 /etc/privoxy privoxy -} - -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 -} - -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