From febdb16866baa42e30f06f7f4d7c831e9f8131a3 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 10 Feb 2021 13:23:18 +0200
Subject: [PATCH] privoxy: don't put toolchain parts into package

Issue: https://github.com/termux/termux-packages/issues/6369
---
 packages/privoxy/GNUmakefile.in.patch | 20 +++++++++++++++-----
 packages/privoxy/build.sh             |  9 +--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/privoxy/GNUmakefile.in.patch b/packages/privoxy/GNUmakefile.in.patch
index 87b52164a..33851087f 100644
--- a/packages/privoxy/GNUmakefile.in.patch
+++ b/packages/privoxy/GNUmakefile.in.patch
@@ -1,8 +1,9 @@
---- ../../build/privoxy/cache/privoxy-3.0.24-stable/GNUmakefile.in	2015-12-27 13:50:57.000000000 +0100
-+++ ./GNUmakefile.in	2016-09-13 23:30:12.518162391 +0200
-@@ -471,8 +471,8 @@
+diff -uNr privoxy-3.0.31-stable/GNUmakefile.in privoxy-3.0.31-stable.mod/GNUmakefile.in
+--- privoxy-3.0.31-stable/GNUmakefile.in	2021-01-30 19:24:01.000000000 +0200
++++ privoxy-3.0.31-stable.mod/GNUmakefile.in	2021-02-10 13:22:14.643260510 +0200
+@@ -543,8 +543,8 @@
  	mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\
- 	nsgmls ../privoxy-man-page.sgml  | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\
+ 	$(NSGMLS) ../privoxy-man-page.sgml  | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\
  	perl -pi.bak -e 's/ <URL:.*>//; s/\[ /\[/g' $(MAN_PAGE) ;\
 -	perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" $(MAN_PAGE); \
 -	perl -pi.bak -e "s/ö/\\\\[:o]/g" $(MAN_PAGE); \
@@ -11,7 +12,16 @@
  	perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' $(MAN_PAGE); \
  	perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' $(MAN_PAGE); \
  	perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' $(MAN_PAGE); \
-@@ -872,41 +872,41 @@
+@@ -868,7 +868,7 @@
+ 	@test -n "$(STRIP)" &&\
+ 	$(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\
+ 	$(ECHO) Installing $(PROGRAM) executable to $(DESTDIR)$(SBIN_DEST)
+-	$(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
++	$(INSTALL) $(INSTALL_P) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
+ 
+ 	@# Install the DOCS and man page. install-sh only does one file at a time.
+ 	@# FIXME: only handles jpegs.
+@@ -927,41 +927,41 @@
  		$(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$(CONF_DEST)/templates ;\
  	done
  
diff --git a/packages/privoxy/build.sh b/packages/privoxy/build.sh
index a5fec9d79..4de54f559 100644
--- a/packages/privoxy/build.sh
+++ b/packages/privoxy/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Non-caching web proxy with advanced filtering capabiliti
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=3.0.31
+TERMUX_PKG_REVISION=1
 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_SHA256=077729a3aac79222a4e8d88a650d9028d16fd4b0d6038da8f5f5e47120d004eb
 # Termux-services adds the run scripts to TERMUX_PKG_CONFFILES. Those ones can not be copied in termux_step_post_massage so setup special variable for that
@@ -25,14 +26,6 @@ termux_step_pre_configure() {
 
     autoheader
     autoconf
-
-    # avoid 'aarch64-linux-android-strip': No such file or directory
-    ln -s "$TERMUX_STANDALONE_TOOLCHAIN/bin/$STRIP" .
-}
-
-termux_step_post_make_install() {
-    # delete link created to avoid errors
-    rm -f "$TERMUX_PREFIX/sbin/$STRIP"
 }
 
 termux_step_post_massage() {