From 6c27c79a13e33af6569f3bfb2620c00be92b0fd7 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 24 Apr 2019 20:33:38 +0200 Subject: [PATCH] pcre: add subpkg libpcreposix privoxy needs it: https://github.com/termux/termux-packages/issues/3706 --- packages/pcre/build.sh | 3 ++- packages/pcre/libpcreposix.subpackage.sh | 2 ++ packages/privoxy/build.sh | 4 ++-- packages/privoxy/configure.in.patch | 12 ------------ 4 files changed, 6 insertions(+), 15 deletions(-) create mode 100644 packages/pcre/libpcreposix.subpackage.sh delete mode 100644 packages/privoxy/configure.in.patch diff --git a/packages/pcre/build.sh b/packages/pcre/build.sh index ce2fa5658..3f81585b6 100644 --- a/packages/pcre/build.sh +++ b/packages/pcre/build.sh @@ -3,7 +3,8 @@ TERMUX_PKG_DESCRIPTION="Library implementing regular expression pattern matching TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=8.43 TERMUX_PKG_SHA256=91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://ftp.pcre.org/pub/pcre/pcre-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/pcre-config" -TERMUX_PKG_RM_AFTER_INSTALL="bin/pcregrep bin/pcretest share/man/man1/pcre*.1 lib/libpcreposix.so lib/libpcreposix.so.0 lib/libpcreposix.so.0.0.2" +TERMUX_PKG_RM_AFTER_INSTALL="bin/pcregrep bin/pcretest share/man/man1/pcre*.1" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-cpp --enable-jit --enable-utf8 --enable-unicode-properties" diff --git a/packages/pcre/libpcreposix.subpackage.sh b/packages/pcre/libpcreposix.subpackage.sh new file mode 100644 index 000000000..3b71a168f --- /dev/null +++ b/packages/pcre/libpcreposix.subpackage.sh @@ -0,0 +1,2 @@ +TERMUX_SUBPKG_INCLUDE="lib/libpcreposix.so*" +TERMUX_SUBPKG_DESCRIPTION="Posix-compatible runtime libraries for libpcre" diff --git a/packages/privoxy/build.sh b/packages/privoxy/build.sh index 54068eb11..b0adc16bc 100644 --- a/packages/privoxy/build.sh +++ b/packages/privoxy/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.privoxy.org TERMUX_PKG_DESCRIPTION="Non-caching web proxy with advanced filtering capabilities" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=3.0.28 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 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' @@ -10,7 +10,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_lib_pcreposix_regcomp=no --sysconfdir=$TERMUX_PREFIX/etc/privoxy " -TERMUX_PKG_DEPENDS="pcre, zlib" +TERMUX_PKG_DEPENDS="pcre, libpcreposix, zlib" 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 deleted file mode 100644 index 8cb9f0e77..000000000 --- a/packages/privoxy/configure.in.patch +++ /dev/null @@ -1,12 +0,0 @@ -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])