gentoo resync : 25.08.2020

3 files changed, 75 insertions, 0 deletions

diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch b/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch
new file mode 100644
index 000000000000..66d14a9fc3c4
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch
@@ -0,0 +1,15 @@
+diff '--color=auto' -Naurd privoxy-3.0.28-stable.orig/jcc.c privoxy-3.0.28-stable/jcc.c
+--- privoxy-3.0.28-stable.orig/jcc.c	2018-12-30 21:40:13.000000000 +0300
++++ privoxy-3.0.28-stable/jcc.c	2020-07-11 14:43:39.851143843 +0300
+@@ -4013,7 +4013,10 @@
+       }
+ #endif
+ 
+-      chdir("/");
++      if (chdir("/"))
++      {
++         log_error(LOG_LEVEL_FATAL, "Cannot chdir /");
++      }
+ 
+    } /* -END- if (daemon_mode) */
+ 
diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-null-termination.patch b/net-proxy/privoxy/files/privoxy-3.0.28-null-termination.patch
new file mode 100644
index 000000000000..295b739a05f6
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.28-null-termination.patch
@@ -0,0 +1,13 @@
+diff '--color=auto' -Naurd privoxy-3.0.28-stable.orig/gateway.c privoxy-3.0.28-stable/gateway.c
+--- privoxy-3.0.28-stable.orig/gateway.c	2018-12-30 21:40:13.000000000 +0300
++++ privoxy-3.0.28-stable/gateway.c	2020-07-11 14:55:15.442676106 +0300
+@@ -1103,7 +1103,8 @@
+    cbuf[client_pos++] = (char)(hostlen & 0xffu);
+    assert(sizeof(cbuf) - client_pos > (size_t)255);
+    /* Using strncpy because we really want the nul byte padding. */
+-   strncpy(cbuf + client_pos, target_host, sizeof(cbuf) - client_pos);
++   strncpy(cbuf + client_pos, target_host, sizeof(cbuf) - client_pos - 1);
++   cbuf[sizeof(cbuf)-1] = 0;
+    client_pos += (hostlen & 0xffu);
+    cbuf[client_pos++] = (char)((target_port >> 8) & 0xff);
+    cbuf[client_pos++] = (char)((target_port     ) & 0xff);
diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-strip.patch b/net-proxy/privoxy/files/privoxy-3.0.28-strip.patch
new file mode 100644
index 000000000000..2ca24330b46c
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.28-strip.patch
@@ -0,0 +1,47 @@
+Privory uses STRIP Makefile variable for passing strip argument,
+this clashes with STRIP set in the environment. So rename STRIP ->
+STRIP_ARGS and then use real STRIP instead of STRIP_PROG with
+fallback on predefined "strip" if STRIP is not set.
+
+--- privoxy-3.0.28-stable/GNUmakefile.in.orig	2020-08-19 15:24:46.930551734 +0300
++++ privoxy-3.0.28-stable/GNUmakefile.in	2020-08-19 16:12:18.214837417 +0300
+@@ -117,7 +117,7 @@
+ CP         = cp -f
+ RMDIR      = rmdir
+ MKDIR      = ./mkinstalldirs
+-STRIP_PROG = strip
++STRIP     ?= strip
+ SED        = sed
+ GREP       = grep
+ CAT        = cat
+@@ -391,7 +391,7 @@
+ 	@$(ECHO) "You have run autoconf && autoheader && ./configure right?"
+ 	@$(ECHO) ""
+ 	$(MAKE) $(PROGRAM)
+-	$(STRIP_PROG) $(PROGRAM)
++	$(STRIP) $(PROGRAM)
+ 	$(LN) -s `pwd` ../privoxy-$(VERSION)-$(CODE_STATUS)
+ # add program
+ 	(cd .. && $(TAR) --exclude "PACKAGERS" -cvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM))
+@@ -822,7 +822,7 @@
+ 	 fi)
+ 
+ install-strip:
+-	$(MAKE) install STRIP=-s
++	$(MAKE) install STRIP_ARG=-s
+ 
+ # FIXME: Test USER and GROUP on Slack to make sure this works as
+ # intended.
+@@ -848,10 +848,10 @@
+ 		$(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \
+ 		$(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST)
+ 	@# Install the executable binary, strip if invoked as install-strip
+-	@test -n "$(STRIP)" &&\
++	@test -n "$(STRIP_ARG)" &&\
+ 	$(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) $(STRIP_ARG) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
+ 
+ 	@# Install the DOCS and man page. install-sh only does one file at a time.
+ 	@# FIXME: only handles jpegs.