Download raw body.
Update: www/privoxy 3.0.33 -> 4.0.0
On 11/23/25 07:33, Bjorn Ketelaars wrote:
> On Sat 22/11/2025 21:27, Christoph Liebender wrote:
>> On 11/6/25 18:41, Christoph Liebender wrote:
>>> Hi ports@,
>>>
>>> this patch bumps privoxy to 4.0.0.
>>> tools/privoxy-regression-test.pl output:
>>>
>>> 2025-11-06 18:40:39: Asking Privoxy for the number of action files
>>> available ...
>>> 2025-11-06 18:40:39: Gathering regression tests from 3 action file(s)
>>> delivered by Privoxy 4.0.0.
>>> 2025-11-06 18:40:39: Executing regression tests ...
>>> 2025-11-06 18:41:06: Executed 472 regression tests. Skipped 17. 472
>>> successes, 0 failures.
>>>
>>> ok?
>>
>> Ping!
>
> Build tested only:
>
> - Please sync patch-openssl_c by running 'make update-patches'
> - support for pcre has been dropped in favor of pcre2. Please update
> LIB_DEPENDS and WANTLIB accordingly
> - Please run 'make update-plist'. At least
> share/doc/privoxy/user-manual/howto.html has been added
Thanks. Applied.
> - Not sure if the bit below is relevant:
> Can't put into any plist (no applicable prefix):
> /var/log/privoxy
> /var/log/privoxy/logfile
Probably not relevant - the log directory is /var/privoxy/log anyway.
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 64278aec39e..7f74619ca7e 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,17 +1,16 @@
COMMENT= web proxy with advanced filtering capabilities
-V= 3.0.33
+V= 4.0.0
DISTNAME= privoxy-${V}-stable
PKGNAME= privoxy-${V}
CATEGORIES= www
-REVISION= 1
HOMEPAGE= https://www.privoxy.org/
# GPLv2+
PERMIT_PACKAGE= Yes
-WANTLIB += c crypto pcre pcreposix pthread ssl z
+WANTLIB += c crypto pcre2-8 pcre2-posix pthread ssl z
SITES= ${SITE_SOURCEFORGE:=ijbswa/}
EXTRACT_SUFX= -src.tar.gz
@@ -24,10 +23,10 @@ NO_TEST= Yes
USE_GMAKE= Yes
MAKE_FILE= GNUmakefile
-LIB_DEPENDS= devel/pcre
+LIB_DEPENDS= devel/pcre2
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.69
+AUTOCONF_VERSION= 2.72
CONFIGURE_ARGS= --with-docbook=no \
--with-openssl
CONFIGURE_ENV= CPPFLAGS="-Dunix -I${LOCALBASE}/include" \
diff --git a/www/privoxy/distinfo b/www/privoxy/distinfo
index 38916e8efbb..2e6f0f3c7f8 100644
--- a/www/privoxy/distinfo
+++ b/www/privoxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (privoxy-3.0.33-stable-src.tar.gz) = BLEE5w2sYVYbndEQaEslD6/IwT2+Q3pg+uGN3ZqIH64=
-SIZE (privoxy-3.0.33-stable-src.tar.gz) = 1579540
+SHA256 (privoxy-4.0.0-stable-src.tar.gz) = wI4roASTBwF7+dimPdKg37lqoM3rNK4Ad3bmPrpiom8=
+SIZE (privoxy-4.0.0-stable-src.tar.gz) = 1746840
diff --git a/www/privoxy/patches/patch-openssl_c b/www/privoxy/patches/patch-openssl_c
index d3926675188..9e9cbb966c8 100644
--- a/www/privoxy/patches/patch-openssl_c
+++ b/www/privoxy/patches/patch-openssl_c
@@ -1,7 +1,7 @@
Index: openssl.c
--- openssl.c.orig
+++ openssl.c
-@@ -278,6 +278,7 @@ static int ssl_store_cert(struct client_state *csp, X5
+@@ -285,6 +285,7 @@ static int ssl_store_cert(struct client_state *csp, X5
long l;
const ASN1_INTEGER *bs;
#if OPENSSL_VERSION_NUMBER > 0x10100000L
@@ -9,7 +9,7 @@ Index: openssl.c
const X509_ALGOR *tsig_alg;
#endif
int loc;
-@@ -481,7 +482,8 @@ static int ssl_store_cert(struct client_state *csp, X5
+@@ -488,7 +489,8 @@ static int ssl_store_cert(struct client_state *csp, X5
goto exit;
}
tsig_alg = X509_get0_tbs_sigalg(crt);
diff --git a/www/privoxy/pkg/PLIST b/www/privoxy/pkg/PLIST
index fcd05d3c396..6133e5e4291 100644
--- a/www/privoxy/pkg/PLIST
+++ b/www/privoxy/pkg/PLIST
@@ -44,6 +44,7 @@ share/doc/privoxy/user-manual/contact.html
share/doc/privoxy/user-manual/copyright.html
share/doc/privoxy/user-manual/files-in-use.jpg
share/doc/privoxy/user-manual/filter-file.html
+share/doc/privoxy/user-manual/howto.html
share/doc/privoxy/user-manual/index.html
share/doc/privoxy/user-manual/installation.html
share/doc/privoxy/user-manual/introduction.html
@@ -60,101 +61,101 @@ share/examples/privoxy/
@owner _privoxy
@group _privoxy
share/examples/privoxy/config
-@sample ${PRIVOXYCONF}/config
+@sample ${PRIVOXYCONF}config
share/examples/privoxy/default.action
-@sample ${PRIVOXYCONF}/default.action
+@sample ${PRIVOXYCONF}default.action
share/examples/privoxy/default.filter
-@sample ${PRIVOXYCONF}/default.filter
+@sample ${PRIVOXYCONF}default.filter
share/examples/privoxy/match-all.action
-@sample ${PRIVOXYCONF}/match-all.action
+@sample ${PRIVOXYCONF}match-all.action
share/examples/privoxy/regression-tests.action
-@sample ${PRIVOXYCONF}/regression-tests.action
+@sample ${PRIVOXYCONF}regression-tests.action
share/examples/privoxy/templates/
-@sample ${PRIVOXYCONF}/templates/
+@sample ${PRIVOXYCONF}templates/
share/examples/privoxy/templates/blocked
-@sample ${PRIVOXYCONF}/templates/blocked
+@sample ${PRIVOXYCONF}templates/blocked
share/examples/privoxy/templates/cgi-error-404
-@sample ${PRIVOXYCONF}/templates/cgi-error-404
+@sample ${PRIVOXYCONF}templates/cgi-error-404
share/examples/privoxy/templates/cgi-error-bad-param
-@sample ${PRIVOXYCONF}/templates/cgi-error-bad-param
+@sample ${PRIVOXYCONF}templates/cgi-error-bad-param
share/examples/privoxy/templates/cgi-error-disabled
-@sample ${PRIVOXYCONF}/templates/cgi-error-disabled
+@sample ${PRIVOXYCONF}templates/cgi-error-disabled
share/examples/privoxy/templates/cgi-error-file
-@sample ${PRIVOXYCONF}/templates/cgi-error-file
+@sample ${PRIVOXYCONF}templates/cgi-error-file
share/examples/privoxy/templates/cgi-error-file-read-only
-@sample ${PRIVOXYCONF}/templates/cgi-error-file-read-only
+@sample ${PRIVOXYCONF}templates/cgi-error-file-read-only
share/examples/privoxy/templates/cgi-error-modified
-@sample ${PRIVOXYCONF}/templates/cgi-error-modified
+@sample ${PRIVOXYCONF}templates/cgi-error-modified
share/examples/privoxy/templates/cgi-error-parse
-@sample ${PRIVOXYCONF}/templates/cgi-error-parse
+@sample ${PRIVOXYCONF}templates/cgi-error-parse
share/examples/privoxy/templates/cgi-style.css
-@sample ${PRIVOXYCONF}/templates/cgi-style.css
+@sample ${PRIVOXYCONF}templates/cgi-style.css
share/examples/privoxy/templates/client-tags
-@sample ${PRIVOXYCONF}/templates/client-tags
+@sample ${PRIVOXYCONF}templates/client-tags
share/examples/privoxy/templates/connect-failed
-@sample ${PRIVOXYCONF}/templates/connect-failed
+@sample ${PRIVOXYCONF}templates/connect-failed
share/examples/privoxy/templates/connection-timeout
-@sample ${PRIVOXYCONF}/templates/connection-timeout
+@sample ${PRIVOXYCONF}templates/connection-timeout
share/examples/privoxy/templates/default
-@sample ${PRIVOXYCONF}/templates/default
+@sample ${PRIVOXYCONF}templates/default
share/examples/privoxy/templates/edit-actions-add-url-form
-@sample ${PRIVOXYCONF}/templates/edit-actions-add-url-form
+@sample ${PRIVOXYCONF}templates/edit-actions-add-url-form
share/examples/privoxy/templates/edit-actions-for-url
-@sample ${PRIVOXYCONF}/templates/edit-actions-for-url
+@sample ${PRIVOXYCONF}templates/edit-actions-for-url
share/examples/privoxy/templates/edit-actions-for-url-filter
-@sample ${PRIVOXYCONF}/templates/edit-actions-for-url-filter
+@sample ${PRIVOXYCONF}templates/edit-actions-for-url-filter
share/examples/privoxy/templates/edit-actions-for-url-string-action
-@sample ${PRIVOXYCONF}/templates/edit-actions-for-url-string-action
+@sample ${PRIVOXYCONF}templates/edit-actions-for-url-string-action
share/examples/privoxy/templates/edit-actions-list
-@sample ${PRIVOXYCONF}/templates/edit-actions-list
+@sample ${PRIVOXYCONF}templates/edit-actions-list
share/examples/privoxy/templates/edit-actions-list-button
-@sample ${PRIVOXYCONF}/templates/edit-actions-list-button
+@sample ${PRIVOXYCONF}templates/edit-actions-list-button
share/examples/privoxy/templates/edit-actions-list-section
-@sample ${PRIVOXYCONF}/templates/edit-actions-list-section
+@sample ${PRIVOXYCONF}templates/edit-actions-list-section
share/examples/privoxy/templates/edit-actions-list-url
-@sample ${PRIVOXYCONF}/templates/edit-actions-list-url
+@sample ${PRIVOXYCONF}templates/edit-actions-list-url
share/examples/privoxy/templates/edit-actions-remove-url-form
-@sample ${PRIVOXYCONF}/templates/edit-actions-remove-url-form
+@sample ${PRIVOXYCONF}templates/edit-actions-remove-url-form
share/examples/privoxy/templates/edit-actions-url-form
-@sample ${PRIVOXYCONF}/templates/edit-actions-url-form
+@sample ${PRIVOXYCONF}templates/edit-actions-url-form
share/examples/privoxy/templates/forwarding-failed
-@sample ${PRIVOXYCONF}/templates/forwarding-failed
+@sample ${PRIVOXYCONF}templates/forwarding-failed
share/examples/privoxy/templates/mod-local-help
-@sample ${PRIVOXYCONF}/templates/mod-local-help
+@sample ${PRIVOXYCONF}templates/mod-local-help
share/examples/privoxy/templates/mod-support-and-service
-@sample ${PRIVOXYCONF}/templates/mod-support-and-service
+@sample ${PRIVOXYCONF}templates/mod-support-and-service
share/examples/privoxy/templates/mod-title
-@sample ${PRIVOXYCONF}/templates/mod-title
+@sample ${PRIVOXYCONF}templates/mod-title
share/examples/privoxy/templates/mod-unstable-warning
-@sample ${PRIVOXYCONF}/templates/mod-unstable-warning
+@sample ${PRIVOXYCONF}templates/mod-unstable-warning
share/examples/privoxy/templates/no-server-data
-@sample ${PRIVOXYCONF}/templates/no-server-data
+@sample ${PRIVOXYCONF}templates/no-server-data
share/examples/privoxy/templates/no-such-domain
-@sample ${PRIVOXYCONF}/templates/no-such-domain
+@sample ${PRIVOXYCONF}templates/no-such-domain
share/examples/privoxy/templates/show-request
-@sample ${PRIVOXYCONF}/templates/show-request
+@sample ${PRIVOXYCONF}templates/show-request
share/examples/privoxy/templates/show-status
-@sample ${PRIVOXYCONF}/templates/show-status
+@sample ${PRIVOXYCONF}templates/show-status
share/examples/privoxy/templates/show-status-file
-@sample ${PRIVOXYCONF}/templates/show-status-file
+@sample ${PRIVOXYCONF}templates/show-status-file
share/examples/privoxy/templates/show-url-info
-@sample ${PRIVOXYCONF}/templates/show-url-info
+@sample ${PRIVOXYCONF}templates/show-url-info
share/examples/privoxy/templates/toggle
-@sample ${PRIVOXYCONF}/templates/toggle
+@sample ${PRIVOXYCONF}templates/toggle
share/examples/privoxy/templates/toggle-mini
-@sample ${PRIVOXYCONF}/templates/toggle-mini
+@sample ${PRIVOXYCONF}templates/toggle-mini
share/examples/privoxy/templates/untrusted
-@sample ${PRIVOXYCONF}/templates/untrusted
+@sample ${PRIVOXYCONF}templates/untrusted
share/examples/privoxy/templates/url-info-osd.xml
-@sample ${PRIVOXYCONF}/templates/url-info-osd.xml
+@sample ${PRIVOXYCONF}templates/url-info-osd.xml
share/examples/privoxy/templates/wpad.dat
-@sample ${PRIVOXYCONF}/templates/wpad.dat
+@sample ${PRIVOXYCONF}templates/wpad.dat
share/examples/privoxy/trust
-@sample ${PRIVOXYCONF}/trust
+@sample ${PRIVOXYCONF}trust
share/examples/privoxy/user.action
-@sample ${PRIVOXYCONF}/user.action
+@sample ${PRIVOXYCONF}user.action
share/examples/privoxy/user.filter
-@sample ${PRIVOXYCONF}/user.filter
+@sample ${PRIVOXYCONF}user.filter
@sample /var/privoxy/
@mode 775
@owner
diff --git a/www/privoxy/pkg/privoxy.rc b/www/privoxy/pkg/privoxy.rc
index 76f89e3ab5c..aff0a4da258 100644
--- a/www/privoxy/pkg/privoxy.rc
+++ b/www/privoxy/pkg/privoxy.rc
@@ -10,7 +10,7 @@ rc_reload=NO
rc_pre()
{
case ${daemon_flags} in
- *--chroot*)
+ *--chroot*)
pax -rw -u -p e ${SYSCONFDIR}/privoxy /var/privoxy/
pax -rw -u -p e ${SYSCONFDIR}/hosts /var/privoxy/
pax -rw -u -p e ${SYSCONFDIR}/resolv.conf /var/privoxy/
Update: www/privoxy 3.0.33 -> 4.0.0