public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/
@ 2021-01-31  3:22 Andrew Savchenko
  0 siblings, 0 replies; 9+ messages in thread
From: Andrew Savchenko @ 2021-01-31  3:22 UTC (permalink / raw
  To: gentoo-commits

commit:     c1791cb8d661fe7c8916f9787f7772da42e0b435
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 02:59:53 2021 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 02:59:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1791cb8

net-proxy/privoxy: fix build without threads

Closes: https://bugs.gentoo.org/767166
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 .../privoxy/files/privoxy-3.0.29-pthread.patch      | 21 +++++++++++++++++++++
 net-proxy/privoxy/privoxy-3.0.29.ebuild             |  5 +++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch b/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch
new file mode 100644
index 00000000000..2890b824d7e
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch
@@ -0,0 +1,21 @@
+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.29.ebuild b/net-proxy/privoxy/privoxy-3.0.29.ebuild
index 966001da72e..ded50272b29 100644
--- a/net-proxy/privoxy/privoxy-3.0.29.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.29.ebuild
@@ -47,7 +47,7 @@ REQUIRED_USE="
 	compression? ( zlib )
 	brotli? ( zlib )
 	fuzz? ( zlib )
-	ssl? ( ^^ ( mbedtls openssl ) )
+	ssl? ( ^^ ( mbedtls openssl ) threads )
 "
 
 S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
@@ -57,13 +57,14 @@ PATCHES=(
 	"${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 http://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
+		ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
 		ewarn
 	fi
 }


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/
@ 2023-12-19 11:04 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2023-12-19 11:04 UTC (permalink / raw
  To: gentoo-commits

commit:     fadd7b173ca4e253623f23b8b327842c3cf5a5fc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 10:21:06 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 11:03:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fadd7b17

net-proxy/privoxy: fix modern C issue in configure

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/privoxy-3.0.33-configure-c99.patch       |  34 +++++
 net-proxy/privoxy/privoxy-3.0.33-r1.ebuild         | 159 +++++++++++++++++++++
 2 files changed, 193 insertions(+)

diff --git a/net-proxy/privoxy/files/privoxy-3.0.33-configure-c99.patch b/net-proxy/privoxy/files/privoxy-3.0.33-configure-c99.patch
new file mode 100644
index 000000000000..9dfba3faca39
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.33-configure-c99.patch
@@ -0,0 +1,34 @@
+Fix argument types in gmtime_r, localtime_r probes.  Otherwise these
+probes always fail with stricter compilers even if there is C library
+support for these functions.
+
+Submitted upstream: <https://sourceforge.net/p/ijbswa/patches/149/>
+
+--- a/configure.in
++++ b/configure.in
+@@ -615,9 +615,9 @@ AC_CHECK_FUNC(gmtime_r, [
+   AC_TRY_COMPILE([
+ #   include <time.h>
+   ], [
+-    struct time *t;
+-    struct tm *tm;
+-    (void) gmtime_r(t, tm)
++    time_t t;
++    struct tm tm;
++    (void) gmtime_r(&t, &tm)
+   ], [
+     AC_MSG_RESULT(ok)
+     AC_DEFINE(HAVE_GMTIME_R)
+@@ -633,9 +633,9 @@ AC_CHECK_FUNC(localtime_r, [
+   AC_TRY_COMPILE([
+ #   include <time.h>
+   ], [
+-    struct time *t;
+-    struct tm *tm;
+-    (void) localtime_r(t, tm)
++    time_t t;
++    struct tm tm;
++    (void) localtime_r(&t, &tm)
+   ], [
+     AC_MSG_RESULT(ok)
+     AC_DEFINE(HAVE_LOCALTIME_R)

diff --git a/net-proxy/privoxy/privoxy-3.0.33-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.33-r1.ebuild
new file mode 100644
index 000000000000..ed51ebcb3544
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.33-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 +jit lfs +mbedtls openssl
+png-images sanitize selinux ssl +stats +threads toggle tools whitelists
++zlib"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~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="
+	brotli? ( zlib )
+	client-tags? ( threads )
+	compression? ( zlib )
+	extended-statistics? ( threads )
+	fuzz? ( zlib )
+	ssl? ( ^^ ( mbedtls openssl ) threads )
+	toggle? ( editor )
+"
+
+S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.32-gentoo.patch
+	"${FILESDIR}"/${PN}-3.0.28-strip.patch
+	"${FILESDIR}"/${PN}-3.0.33-configure-msan.patch
+	"${FILESDIR}"/${PN}-3.0.33-configure-c99.patch
+)
+
+pkg_pretend() {
+	if ! use threads; then
+		ewarn
+		ewarn "Privoxy may be very slow without threads support, consider enabling it."
+		ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
+		ewarn "Additionally some features may not build or work poperly. You are on your own."
+		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
+	if use sanitize; then
+		myconf+=" --with-usan"
+		# msan is available in clang only
+		# asan is broken with current configure tests in gcc
+		tc-is-clang && myconf+=" --with-msan --with-asan"
+	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 \
+		--disable-accept-filter \
+		--enable-dynamic-pcre \
+		--without-assertions \
+		--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 jit pcre-jit-compilation) \
+		$(use_enable ipv6 ipv6-support) \
+		$(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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/
@ 2021-12-13 16:59 Andrew Savchenko
  0 siblings, 0 replies; 9+ messages in thread
From: Andrew Savchenko @ 2021-12-13 16:59 UTC (permalink / raw
  To: gentoo-commits

commit:     6eccdbb6b0a53e812fcac7766898d31b756d96e2
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 16:57:54 2021 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 16:58:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eccdbb6

net-proxy/privoxy: update to 3.0.33

- Version bump to 3.0.33
Fixes: CVE-2021-44540, CVE-2021-44541, CVE-2021-44542, CVE-2021-44543
- Add new USE flags: jit (for PCRE), sanitize
- REQUIRED_USE: extended-statistics depends on threads

Bug: https://bugs.gentoo.org/769557
Bug: https://bugs.gentoo.org/829051
Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 net-proxy/privoxy/Manifest                         |   1 +
 .../files/privoxy-3.0.33-configure-msan.patch      |  13 ++
 net-proxy/privoxy/metadata.xml                     |   3 +
 net-proxy/privoxy/privoxy-3.0.33.ebuild            | 158 +++++++++++++++++++++
 4 files changed, 175 insertions(+)

diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 2bb3d36bce49..225fc03773b4 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1 +1,2 @@
 DIST privoxy-3.0.32-stable-src.tar.gz 1834528 BLAKE2B c846dada5fd34b80be9f7a75dc4177f3907241f6cf28b4120929687523d449d73b6a78bfe73f0a1086fbb3a8388103beb1e5a62becdffa24bf57d34cbb6cda56 SHA512 da41c0045bf593219df64718645eff984b5df43737811cc0fa12fce7e8ae1ab59eefbe20f23d6ce8f62216cfd81f1a9c319688d15693c25eed36010f3e1d5ffd
+DIST privoxy-3.0.33-stable-src.tar.gz 1579540 BLAKE2B 4b76aa2e84160bab346d0548019158edb5562ca1dbf5356f765a6b91967f352f99c45c852254acf3d8e85cf8e8d210c050d1cf69ace3e5dbda8cdd13c1138df3 SHA512 9684455dbce7f6d8f5defd31aa9a7316e0c1dc896525ab4d562d0359462b541b1c366dea9db07b798f3e00b9cbcc44f494d8c431bcb10f2cb05b5bca3cfeaf75

diff --git a/net-proxy/privoxy/files/privoxy-3.0.33-configure-msan.patch b/net-proxy/privoxy/files/privoxy-3.0.33-configure-msan.patch
new file mode 100644
index 000000000000..c89fed3947f3
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.33-configure-msan.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.in b/configure.in
+index 84f6a0db7..e7e68be0c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -168,7 +168,7 @@ if test "x$with_asan" = "xyes"; then
+     LDFLAGS="$LDFLAGS -fsanitize=address"
+ fi
+ 
+-AC_ARG_WITH(asan, [  --with-msan       Enable MemorySanitizer. Requires compiler support.])
++AC_ARG_WITH(msan, [  --with-msan       Enable MemorySanitizer. Requires compiler support.])
+ if test "x$with_msan" = "xyes"; then
+     CFLAGS="$CFLAGS -fsanitize=memory"
+     LDFLAGS="$LDFLAGS -fsanitize=memory"

diff --git a/net-proxy/privoxy/metadata.xml b/net-proxy/privoxy/metadata.xml
index 287c64fc2abc..bab34089e102 100644
--- a/net-proxy/privoxy/metadata.xml
+++ b/net-proxy/privoxy/metadata.xml
@@ -26,12 +26,15 @@
 		<flag name="fuzz">Exposes Privoxy internals to input from files or stdout. Intended for fuzzing testing</flag>
 		<flag name="graceful-termination">Allow to shutdown Privoxy through the webinterface</flag>
 		<flag name="image-blocking">Allows the +handle-as-image action, to send "blocked" images instead of HTML</flag>
+		<flag name="jit">Enable PCRE jit (recommended)</flag>
 		<flag name="lfs">Support large files (&gt;2GB) on 32-bit systems</flag>
 		<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> for HTTPS filtering</flag>
 		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for HTTPS filtering</flag>
 		<flag name="png-images">Use PNG format instead of GIF for built-in images</flag>
+		<flag name="sanitize">Enable asan, msan and usan sanitizers. Your compiler must support them</flag>
 		<flag name="ssl">HTTPS inspection support. Enables privoxy to perform SSL MITM filtering, see docs, use with care</flag>
 		<flag name="stats">Keep statistics</flag>
+		<flag name="threads">Enable POSIX threads. Highly recommended, otherwise both build and run-time features may not work properly.</flag>
 		<flag name="toggle">Support temporary disable toggle via web interface</flag>
 		<flag name="tools">Install log parser, regression tester and user agent generator tools</flag>
 		<flag name="whitelists">Support trust files (white lists)</flag>

diff --git a/net-proxy/privoxy/privoxy-3.0.33.ebuild b/net-proxy/privoxy/privoxy-3.0.33.ebuild
new file mode 100644
index 000000000000..0d13b91d1507
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.33.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 +jit lfs +mbedtls openssl
+png-images sanitize 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="
+	brotli? ( zlib )
+	client-tags? ( threads )
+	compression? ( zlib )
+	extended-statistics? ( threads )
+	fuzz? ( zlib )
+	ssl? ( ^^ ( mbedtls openssl ) threads )
+	toggle? ( editor )
+"
+
+S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.32-gentoo.patch
+	"${FILESDIR}"/${PN}-3.0.28-strip.patch
+	"${FILESDIR}"/${PN}-3.0.33-configure-msan.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 "Additionally some features may not build or work poperly. You are on your own."
+		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
+	if use sanitize; then
+		myconf+=" --with-usan"
+		# msan is available in clang only
+		# asan is broken with current configure tests in gcc
+		tc-is-clang && myconf+=" --with-msan --with-asan"
+	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 \
+		--without-assertions \
+		--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 jit pcre-jit-compilation) \
+		$(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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/
@ 2021-02-27 16:21 Andrew Savchenko
  0 siblings, 0 replies; 9+ messages in thread
From: Andrew Savchenko @ 2021-02-27 16:21 UTC (permalink / raw
  To: gentoo-commits

commit:     3e03f00b6df257facc1c17b38b84a87f23d22aae
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 16:14:53 2021 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 16:21:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e03f00b

net-proxy/privoxy: version bump

Update to version 3.0.32

Fixes: OVE-20210203-0001, OVE-20210205-0001, OVE-20210206-0001,
       OVE-20210207-0001, OVE-20210222-0001.

Bug: https://bugs.gentoo.org/771960
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 net-proxy/privoxy/Manifest                         |   1 +
 .../privoxy/files/privoxy-3.0.32-gentoo.patch      | 121 +++++++++++++++++
 net-proxy/privoxy/privoxy-3.0.32.ebuild            | 148 +++++++++++++++++++++
 3 files changed, 270 insertions(+)

diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 0aaec43c89b..ca5d8acc7e5 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1 +1,2 @@
 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.32-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.32-gentoo.patch
new file mode 100644
index 00000000000..4199b6e2a9c
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.32-gentoo.patch
@@ -0,0 +1,121 @@
+diff --git a/GNUmakefile.in b/GNUmakefile.in
+index fcd44c4f..8cf2364a 100644
+--- a/GNUmakefile.in
++++ b/GNUmakefile.in
+@@ -62,8 +62,8 @@ MAN_DIR      = @mandir@
+ MAN_DEST     = $(MAN_DIR)/man8
+ MAN_PAGE     = privoxy.8
+ 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
+ 
+@@ -892,8 +892,6 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
+ 		$(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;\
+@@ -964,34 +962,8 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
+ 	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 "$(DESTDIR)$(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.in | \
+diff --git a/config b/config
+index da6d6b75..aefb55e1 100644
+--- a/config
++++ b/config
+@@ -259,7 +259,7 @@
+ #
+ #      No trailing "/", please.
+ #
+-confdir .
++confdir /etc/privoxy
+ #
+ #  2.2. templdir
+ #  ==============
+@@ -344,7 +344,7 @@ confdir .
+ #
+ #      No trailing "/", please.
+ #
+-logdir .
++logdir /var/log/privoxy
+ #
+ #  2.5. actionsfile
+ #  =================
+@@ -478,7 +478,7 @@ filterfile user.filter      # User customizations
+ #      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 --git a/default.action.master b/default.action.master
+index 632984eb..8338431c 100644
+--- a/default.action.master
++++ b/default.action.master
+@@ -559,7 +559,7 @@ allow-ads   = -block -filter{banners-by-size} -filter{banners-by-link}
+ +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 @@ standard.Cautious
+ +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 @@ standard.Medium
+ +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/privoxy-3.0.32.ebuild b/net-proxy/privoxy/privoxy-3.0.32.ebuild
new file mode 100644
index 00000000000..18fa1136373
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.32.ebuild
@@ -0,0 +1,148 @@
+# 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.32-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 \
+		--without-assertions \
+		--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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/
@ 2021-02-14 14:45 Andrew Savchenko
  0 siblings, 0 replies; 9+ messages in thread
From: Andrew Savchenko @ 2021-02-14 14:45 UTC (permalink / raw
  To: gentoo-commits

commit:     8bd0a1cca8d26af615e8554e6da1582cc082c038
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 14:16:25 2021 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 14:45:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bd0a1cc

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 <AT> gentoo.org>

 net-proxy/privoxy/Manifest                         |   2 -
 .../privoxy/files/privoxy-3.0.19-gentoo.patch      | 114 ----------------
 net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch |  15 ---
 .../files/privoxy-3.0.28-null-termination.patch    |  13 --
 .../privoxy/files/privoxy-3.0.29-pthread.patch     |  21 ---
 net-proxy/privoxy/privoxy-3.0.28-r1.ebuild         | 133 ------------------
 net-proxy/privoxy/privoxy-3.0.29.ebuild            | 150 ---------------------
 7 files changed, 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
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/
@ 2020-07-12  8:21 Andrew Savchenko
  0 siblings, 0 replies; 9+ messages in thread
From: Andrew Savchenko @ 2020-07-12  8:21 UTC (permalink / raw
  To: gentoo-commits

commit:     5c1e46228c4d82bd7ce24d740b11622d31ec8291
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 07:48:05 2020 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 08:20:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1e4622

net-proxy/privoxy: fix problems found by gcc

1. Check chdir return value for possible failure in jcc.c

2. Fix possible buffer overflow in gateway.c: strncpy does not
always NULL-terminate string.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch        | 15 +++++++++++++++
 .../privoxy/files/privoxy-3.0.28-null-termination.patch   | 13 +++++++++++++
 net-proxy/privoxy/privoxy-3.0.28.ebuild                   |  2 ++
 3 files changed, 30 insertions(+)

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 00000000000..66d14a9fc3c
--- /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 00000000000..295b739a05f
--- /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/privoxy-3.0.28.ebuild b/net-proxy/privoxy/privoxy-3.0.28.ebuild
index efb5ce555c4..8c973414546 100644
--- a/net-proxy/privoxy/privoxy-3.0.28.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28.ebuild
@@ -43,6 +43,8 @@ S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.19-gentoo.patch
+	"${FILESDIR}"/${P}-chdir.patch
+	"${FILESDIR}"/${P}-null-termination.patch
 )
 
 pkg_pretend() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/
@ 2020-07-12  8:21 Andrew Savchenko
  0 siblings, 0 replies; 9+ messages in thread
From: Andrew Savchenko @ 2020-07-12  8:21 UTC (permalink / raw
  To: gentoo-commits

commit:     3a6ae3463132ba3791bae78df6ecf0aa2a05ba88
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 07:31:36 2020 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 08:20:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a6ae346

net-proxy/privoxy: simplify /var/run removal

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch | 11 -----------
 net-proxy/privoxy/privoxy-3.0.28.ebuild                 |  3 ++-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch b/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch
deleted file mode 100644
index f9f2afb4ff3..00000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- privoxy-3.0.28-stable/GNUmakefile.in.orig	2020-07-11 12:03:38.784441229 +0300
-+++ privoxy-3.0.28-stable/GNUmakefile.in	2020-07-11 12:04:16.148597612 +0300
-@@ -846,7 +846,7 @@
- 	$(CHMOD) $(DIR_MODE) $(MKDIR)
- 	@$(MKDIR) $(DESTDIR)$(SBIN_DEST) $(DESTDIR)$(prefix) $(DESTDIR)$(CONF_DEST) \
- 		$(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \
--		$(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST)
-+		$(DESTDIR)$(LOG_DEST)
- 	@# Install the executable binary, strip if invoked as install-strip
- 	@test -n "$(STRIP)" &&\
- 	$(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\

diff --git a/net-proxy/privoxy/privoxy-3.0.28.ebuild b/net-proxy/privoxy/privoxy-3.0.28.ebuild
index 30ee789ff1e..efb5ce555c4 100644
--- a/net-proxy/privoxy/privoxy-3.0.28.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28.ebuild
@@ -43,7 +43,6 @@ S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.19-gentoo.patch
-	"${FILESDIR}"/${P}-no-var-run.patch
 )
 
 pkg_pretend() {
@@ -117,6 +116,8 @@ src_install() {
 		dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl}
 		newbin tools/uagen.pl privoxy-uagen.pl
 	fi
+
+	rmdir "${ED}/var/run" || die
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/
@ 2020-07-11 10:03 Andrew Savchenko
  0 siblings, 0 replies; 9+ messages in thread
From: Andrew Savchenko @ 2020-07-11 10:03 UTC (permalink / raw
  To: gentoo-commits

commit:     4696e449ce82871adc6f9d56238a5448d4e1480e
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 09:54:39 2020 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Jul 11 10:02:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4696e449

net-proxy/privoxy: do not install /var/run

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch | 11 +++++++++++
 net-proxy/privoxy/privoxy-3.0.28.ebuild                 |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch b/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch
new file mode 100644
index 00000000000..f9f2afb4ff3
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch
@@ -0,0 +1,11 @@
+--- privoxy-3.0.28-stable/GNUmakefile.in.orig	2020-07-11 12:03:38.784441229 +0300
++++ privoxy-3.0.28-stable/GNUmakefile.in	2020-07-11 12:04:16.148597612 +0300
+@@ -846,7 +846,7 @@
+ 	$(CHMOD) $(DIR_MODE) $(MKDIR)
+ 	@$(MKDIR) $(DESTDIR)$(SBIN_DEST) $(DESTDIR)$(prefix) $(DESTDIR)$(CONF_DEST) \
+ 		$(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \
+-		$(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST)
++		$(DESTDIR)$(LOG_DEST)
+ 	@# Install the executable binary, strip if invoked as install-strip
+ 	@test -n "$(STRIP)" &&\
+ 	$(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\

diff --git a/net-proxy/privoxy/privoxy-3.0.28.ebuild b/net-proxy/privoxy/privoxy-3.0.28.ebuild
index 5b36343401e..30ee789ff1e 100644
--- a/net-proxy/privoxy/privoxy-3.0.28.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28.ebuild
@@ -41,7 +41,10 @@ REQUIRED_USE="
 
 S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
 
-PATCHES=( "${FILESDIR}"/${PN}-3.0.19-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.19-gentoo.patch
+	"${FILESDIR}"/${P}-no-var-run.patch
+)
 
 pkg_pretend() {
 	if ! use threads; then


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/
@ 2017-01-09 17:13 Andrew Savchenko
  0 siblings, 0 replies; 9+ messages in thread
From: Andrew Savchenko @ 2017-01-09 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     9fda18bd74c4aa4fb863d4e8bf1ed18d181d9f1e
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 17:08:57 2017 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 17:08:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fda18bd

net-proxy/privoxy: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 net-proxy/privoxy/files/privoxy.initd-2    | 29 ----------
 net-proxy/privoxy/privoxy-3.0.24-r1.ebuild | 89 ------------------------------
 2 files changed, 118 deletions(-)

diff --git a/net-proxy/privoxy/files/privoxy.initd-2 b/net-proxy/privoxy/files/privoxy.initd-2
deleted file mode 100644
index e6b48e5..00000000
--- a/net-proxy/privoxy/files/privoxy.initd-2
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-CONFFILE=/etc/${SVCNAME}/config
-PIDFILE=/var/run/${SVCNAME}.pid
-
-depend() {
-	need net
-}
-
-start() {
-	if [ ! -f "${CONFFILE}" ]; then
-		eerror "Configuration file ${CONFFILE} not found!"
-		return 1
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --exec /usr/sbin/privoxy --pidfile "${PIDFILE}" \
-		-- --pidfile "${PIDFILE}" --user privoxy.privoxy "${CONFFILE}" #2>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
-	eend $?
-}

diff --git a/net-proxy/privoxy/privoxy-3.0.24-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.24-r1.ebuild
deleted file mode 100644
index 69805b8..00000000
--- a/net-proxy/privoxy/privoxy-3.0.24-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs autotools systemd 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 editor external-filters +fast-redirects +force graceful-termination
-+image-blocking ipv6 lfs png-images selinux +stats +threads toggle
-whitelists +zlib"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-LICENSE="GPL-2"
-
-DEPEND="dev-libs/libpcre
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-privoxy )"
-
-REQUIRED_USE="toggle? ( editor )"
-
-S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
-
-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() {
-	epatch "${FILESDIR}"/${PN}-3.0.19-gentoo.patch
-	# autoreconf needs to be called even if we don't modify any autotools source files
-	# See main makefile
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable acl acl-support) \
-		$(use_enable editor) \
-		$(use_enable fast-redirects) \
-		$(use_enable force) \
-		$(use_enable graceful-termination) \
-		$(use_enable image-blocking) \
-		$(use_enable ipv6 ipv6-support) \
-		$(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) \
-		$(usex zlib --enable-compression "") \
-		--enable-dynamic-pcre \
-		--with-user=privoxy \
-		--with-group=privoxy \
-		--sysconfdir=/etc/privoxy \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install () {
-	default
-
-	newinitd "${FILESDIR}/privoxy.initd-2" 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
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-12-19 11:04 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-31  3:22 [gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/ Andrew Savchenko
  -- strict thread matches above, loose matches on Subject: below --
2023-12-19 11:04 Sam James
2021-12-13 16:59 Andrew Savchenko
2021-02-27 16:21 Andrew Savchenko
2021-02-14 14:45 Andrew Savchenko
2020-07-12  8:21 Andrew Savchenko
2020-07-12  8:21 Andrew Savchenko
2020-07-11 10:03 Andrew Savchenko
2017-01-09 17:13 Andrew Savchenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox