package/privoxy: bump version to 4.0.0

Changelog:
https://www.privoxy.org/gitweb/?p=privoxy.git;a=blob;f=ChangeLog;h=a7bffc52b8996c327a23ee562627841550ed90e9;hb=6adadda85067fb7d4cc8663fbfbcacb4b0206615

Removed patches which are included in this release.

Added support for pcre2 which was added upstream in the release.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>

package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch

@@ -1,30 +0,0 @@
-From 4b3b267db159dc23314de3062859481b7c397e32 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 17 Mar 2024 12:36:31 +0100
-Subject: [PATCH] GNUmakefile.in: Don't exit if configuration files are
- installed as root
-
-... as this can be considered acceptable when cross-compiling
-Privoxy inside an autobuilder with only a root user.
-
-Upstream: https://www.privoxy.org/gitweb/?p=privoxy.git;a=commit;h=4b3b267db159dc23314de3062859481b7c397e32
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- GNUmakefile.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/GNUmakefile.in b/GNUmakefile.in
-index 04cceb15..cf79aae1 100644
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -927,7 +927,6 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
- 					$(ECHO)  " and to install the config files as that user and/or group!" ;\
- 					$(ECHO)  " Please read INSTALL, and create a privoxy user and group!" ;\
- 					$(ECHO)  "*******************************************************************" ;\
--					exit 1 ;\
- 				fi ;\
- 			else \
- 				GROUP_T=$(GROUP) ;\
--- 
-2.39.2
-

package/privoxy/0002-GNUMakefile.in-fix-root-install.patch

@@ -1,35 +0,0 @@
-From 25bd5ae1664f5603c05c72b2c38525602f33da0a Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 31 Mar 2024 19:17:45 +0200
-Subject: [PATCH] GNUMakefile.in: fix root install
-
-Set GROUP_T when installing configuration files as root to avoid the
-following build failure since commit
-4b3b267db159dc23314de3062859481b7c397e32:
-
-/usr/bin/install: missing destination file operand after '/home/buildroot/instance-0/output-1/target/etc'
-
-Fixes:
- - http://autobuild.buildroot.org/results/eb4ccf248c9c5048e9b71058bb0311b1e0763883
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Upstream: https://lists.privoxy.org/pipermail/privoxy-devel/2024-March/000760.html
----
- GNUmakefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/GNUmakefile.in b/GNUmakefile.in
-index cf79aae1..db1bab59 100644
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -927,6 +927,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
- 					$(ECHO)  " and to install the config files as that user and/or group!" ;\
- 					$(ECHO)  " Please read INSTALL, and create a privoxy user and group!" ;\
- 					$(ECHO)  "*******************************************************************" ;\
-+					GROUP_T=$(GROUP) ;\
- 				fi ;\
- 			else \
- 				GROUP_T=$(GROUP) ;\
--- 
-2.43.0
-

package/privoxy/Config.in

@@ -2,7 +2,7 @@ config BR2_PACKAGE_PRIVOXY
 	bool "privoxy"
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_PCRE2 if !BR2_PACKAGE_PCRE
 	select BR2_PACKAGE_ZLIB
 	help
 	  A non-caching web proxy with advanced filtering capabilities

package/privoxy/privoxy.hash

@@ -1,5 +1,5 @@
-# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.34%20%28stable%29/
-sha1  e65298c4ee235320ea9ddfb689187bda29a63bbb  privoxy-3.0.34-stable-src.tar.gz
+# From https://sourceforge.net/projects/ijbswa/files/Sources/4.0.0%20%28stable%29/
+sha1  d302cb0bf23536e67a1b5505d01486a335d9c4c0  privoxy-4.0.0-stable-src.tar.gz
 # Locally computed
-sha256  e6ccbca1656f4e616b4657f8514e33a70f6697e9d7294356577839322a3c5d2c  privoxy-3.0.34-stable-src.tar.gz
+sha256  c08e2ba0049307017bf9d8a63dd2a0dfb96aa0cdeb34ae007776e63eba62a26f  privoxy-4.0.0-stable-src.tar.gz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE

package/privoxy/privoxy.mk

@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-PRIVOXY_VERSION = 3.0.34
+PRIVOXY_VERSION = 4.0.0
 PRIVOXY_SITE = https://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29
 PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz
 # configure not shipped
 PRIVOXY_AUTORECONF = YES
-PRIVOXY_DEPENDENCIES = pcre zlib
+PRIVOXY_DEPENDENCIES = $(if $(BR2_PACKAGE_PCRE2),pcre2,pcre) zlib
 PRIVOXY_LICENSE = GPL-2.0+
 PRIVOXY_LICENSE_FILES = LICENSE
 PRIVOXY_CPE_ID_VENDOR = privoxy