gentoo resync : 17.02.2021

4 files changed, 0 insertions, 163 deletions

diff --git a/net-proxy/privoxy/files/privoxy-3.0.19-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.19-gentoo.patch
deleted file mode 100644
index 4571e24e1f06..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.19-gentoo.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -62,8 +62,8 @@
- MAN_DEST     = $(MAN_DIR)/man1
- MAN_PAGE     = privoxy.1
- SHARE_DEST   = @datadir@
--DOC_DEST     = $(SHARE_DEST)/doc/privoxy
--VAR_DEST     = @localstatedir@
-+DOC_DEST     = @docdir@
-+VAR_DEST     = /var
- LOGS_DEST    = $(VAR_DEST)/log/privoxy
- PIDS_DEST    = $(VAR_DEST)/run
- 
-@@ -852,7 +852,6 @@
- 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html $(DESTDIR)$$DOC/man-page;\
- 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html $(DESTDIR)$$DOC/index.html;\
- 		$(INSTALL) $(INSTALL_T) AUTHORS $(DESTDIR)$$DOC;\
--		$(INSTALL) $(INSTALL_T) LICENSE $(DESTDIR)$$DOC;\
- 		$(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\
- 		$(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\
- 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\
-@@ -923,34 +922,8 @@
- 	fi ;\
- 	$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
- 	for i in $(CONFIGS); do \
--		if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
--			$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
--			$(ECHO) Installing fresh $$i;\
- 			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
--		elif [ -s "$(CONF_DEST)/$$i" ]; then \
--			$(ECHO) Installing $$i as $$i.new ;\
--			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
--			NEW=1;\
--		else \
--			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
--		fi ;\
- 	done ;\
--	if [ -n "$$NEW" ]; then \
--		$(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
--		$(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
--	fi ;\
--	[ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
--		$(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
--		$(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
--	if [ x$$USER != x ]; then \
--		$(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile || \
--		$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
--	fi ;\
--	if [ x$$GROUP_T != x ]; then \
--		$(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile || \
--		$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
--	fi ;\
--	$(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
- 	if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
- 		if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
-                $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
---- a/config
-+++ b/config
-@@ -265,7 +265,7 @@
- #
- #      No trailing "/", please.
- #
--confdir .
-+confdir /etc/privoxy
- #
- #
- #  2.2. templdir
-@@ -322,7 +322,7 @@
- #
- #      No trailing "/", please.
- #
--logdir .
-+logdir /var/log/privoxy
- #
- #
- #  2.4. actionsfile
-@@ -462,7 +462,7 @@
- #      Any log files must be writable by whatever user Privoxy is
- #      being run as (on Unix, default user id is "privoxy").
- #
--logfile logfile
-+logfile privoxy.log
- #
- #
- #  2.7. trustfile
---- a/default.action.master
-+++ b/default.action.master
-@@ -566,7 +566,7 @@
- +client-header-tagger{css-requests} \
- +client-header-tagger{image-requests} \
- +hide-from-header{block} \
--+set-image-blocker{pattern} \
-++set-image-blocker{blank} \
- }
- standard.Cautious
- 
-@@ -588,7 +588,7 @@
- +hide-from-header{block} \
- +hide-referrer{conditional-block} \
- +session-cookies-only \
--+set-image-blocker{pattern} \
-++set-image-blocker{blank} \
- }
- standard.Medium
- 
-@@ -627,7 +627,7 @@
- +hide-referrer{conditional-block} \
- +limit-connect{,} \
- +overwrite-last-modified{randomize} \
--+set-image-blocker{pattern} \
-++set-image-blocker{blank} \
- }
- standard.Advanced
- 
diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch b/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch
deleted file mode 100644
index 66d14a9fc3c4..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 295b739a05f6..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.28-null-termination.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.29-pthread.patch b/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch
deleted file mode 100644
index 2890b824d7e2..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/project.h b/project.h
-index ec3c1559..6c744415 100644
---- a/project.h
-+++ b/project.h
-@@ -54,16 +54,6 @@
- #define HASH_OF_HOST_BUF_SIZE      16
- #endif /* FEATURE_HTTPS_INSPECTION */
- 
--#ifdef FEATURE_PTHREAD
--#  include <pthread.h>
--   typedef pthread_mutex_t privoxy_mutex_t;
--#else
--#  ifdef _WIN32
--#     include <windows.h>
--#  endif
--   typedef CRITICAL_SECTION privoxy_mutex_t;
--#endif
--
- #ifdef FEATURE_HTTPS_INSPECTION_MBEDTLS
- #include "mbedtls/net_sockets.h"
- #include "mbedtls/entropy.h"