From 9f47275dc1ebd40633e8f26c8fa8d91f937d25e7 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 3 Jan 2019 02:03:37 +0100
Subject: [PATCH] privoxy: Update from 3.0.27 to 3.0.28

---
 packages/privoxy/build.sh           |  9 ++++++---
 packages/privoxy/configure.in.patch | 12 ++++++++++++
 packages/privoxy/project.h.patch    | 16 ++++++++++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 packages/privoxy/configure.in.patch
 create mode 100644 packages/privoxy/project.h.patch

diff --git a/packages/privoxy/build.sh b/packages/privoxy/build.sh
index 8302f2894..e48285cec 100644
--- a/packages/privoxy/build.sh
+++ b/packages/privoxy/build.sh
@@ -1,10 +1,13 @@
 TERMUX_PKG_HOMEPAGE=https://www.privoxy.org
 TERMUX_PKG_DESCRIPTION="Non-caching web proxy with advanced filtering capabilities"
-TERMUX_PKG_VERSION=3.0.27
-TERMUX_PKG_SHA256=67540360e28c881c892481d1a224632f5b58569e003285467fea6e4b59316378
+TERMUX_PKG_VERSION=3.0.28
+TERMUX_PKG_SHA256=b5d78cc036aaadb3b7cf860e9d598d7332af468926a26e2d56167f1cb6f2824a
 TERMUX_PKG_SRCURL=https://www.privoxy.org/sf-download-mirror/Sources/$TERMUX_PKG_VERSION%20%28stable%29/privoxy-$TERMUX_PKG_VERSION-stable-src.tar.gz
 TERMUX_PKG_CONFFILES='etc/privoxy/config etc/privoxy/match-all.action etc/privoxy/trust etc/privoxy/user.action etc/privoxy/user.filter etc/privoxy/default.action etc/privoxy/default.filter'
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--sysconfdir=$TERMUX_PREFIX/etc/privoxy"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+ac_cv_lib_pcreposix_regcomp=no
+--sysconfdir=$TERMUX_PREFIX/etc/privoxy
+"
 TERMUX_PKG_DEPENDS="pcre"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_KEEP_SHARE_DOC=yes
diff --git a/packages/privoxy/configure.in.patch b/packages/privoxy/configure.in.patch
new file mode 100644
index 000000000..8cb9f0e77
--- /dev/null
+++ b/packages/privoxy/configure.in.patch
@@ -0,0 +1,12 @@
+diff -u -r ../privoxy-3.0.28-stable/configure.in ./configure.in
+--- ../privoxy-3.0.28-stable/configure.in	2018-12-30 18:40:13.000000000 +0000
++++ ./configure.in	2019-01-02 23:35:39.728797247 +0000
+@@ -1092,7 +1092,7 @@
+   pcre_dyn=yes
+   AC_DEFINE(FEATURE_DYNAMIC_PCRE,1,[Define to dynamically link to pcre.])
+   STATIC_PCRE_ONLY=#
+-  LIBS="$LIBS -lpcre -lpcreposix"
++  LIBS="$LIBS -lpcre"
+ else
+   AC_MSG_WARN([You are using the static PCRE code which is out of date and scheduled for removal, for details see:
+     http://sourceforge.net/mailarchive/forum.php?thread_name=20080511195555.2dc6cfdc%40fabiankeil.de&forum_name=ijbswa-developers])
diff --git a/packages/privoxy/project.h.patch b/packages/privoxy/project.h.patch
new file mode 100644
index 000000000..403a49b29
--- /dev/null
+++ b/packages/privoxy/project.h.patch
@@ -0,0 +1,16 @@
+diff -u -r ../privoxy-3.0.28-stable/project.h ./project.h
+--- ../privoxy-3.0.28-stable/project.h	2018-12-30 18:40:13.000000000 +0000
++++ ./project.h	2019-01-03 00:34:59.829586492 +0000
+@@ -82,11 +82,7 @@
+ #ifdef STATIC_PCRE
+ #  include "pcreposix.h"
+ #else
+-#  ifdef PCRE_H_IN_SUBDIR
+-#    include <pcre/pcreposix.h>
+-#  else
+-#    include <pcreposix.h>
+-#  endif
++#  include <regex.h>
+ #endif
+ 
+ #ifdef _WIN32