From cf74641899f598a0b9cf3eea24bc7d79af6044b2 Mon Sep 17 00:00:00 2001 From: Roland Rosenfeld Date: Sun, 17 Jan 2021 13:40:14 +0100 Subject: [PATCH] Git snapshot "release". Update all patches to new version. 39_show-status and 40_redirect-ssl are now incorporated upstream. --- debian/changelog | 8 +++ debian/patches/14_config.patch | 6 +- debian/patches/27_remove_nsl.patch | 2 +- debian/patches/33_manpage_hyphen.patch | 2 +- debian/patches/34_system-docbook2man.patch | 2 +- debian/patches/35_man-spelling.patch | 2 +- debian/patches/39_show-status.patch | 82 ---------------------- debian/patches/40_redirect-ssl.patch | 66 ----------------- debian/patches/series | 2 - 9 files changed, 15 insertions(+), 157 deletions(-) delete mode 100644 debian/patches/39_show-status.patch delete mode 100644 debian/patches/40_redirect-ssl.patch diff --git a/debian/changelog b/debian/changelog index b5a59f6a..057a2ef5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +privoxy (3.0.30~git-snapshot-1) UNRELEASED; urgency=medium + + * Git Snapshot. + * Update all patches to new version. + * 39_show-status and 40_redirect-ssl are now incorporated upstream. + + -- Roland Rosenfeld Sun, 17 Jan 2021 15:15:58 +0100 + privoxy (3.0.29-2) unstable; urgency=medium * Use --enable-extended-statistics and --enable-pcre-host-patterns. diff --git a/debian/patches/14_config.patch b/debian/patches/14_config.patch index ce6f6dc2..81a24151 100644 --- a/debian/patches/14_config.patch +++ b/debian/patches/14_config.patch @@ -32,7 +32,7 @@ Forwarded: not-needed # # 2.5. actionsfile # ================= -@@ -2479,7 +2479,7 @@ socket-timeout 300 +@@ -2467,7 +2467,7 @@ socket-timeout 300 # # ca-directory /usr/local/etc/privoxy/CA # @@ -41,7 +41,7 @@ Forwarded: not-needed # # 7.2. ca-cert-file # ================== -@@ -2633,7 +2633,7 @@ socket-timeout 300 +@@ -2624,7 +2624,7 @@ socket-timeout 300 # # certificate-directory /usr/local/var/privoxy/certs # @@ -50,7 +50,7 @@ Forwarded: not-needed # # 7.6. cipher-list # ================= -@@ -2764,7 +2764,7 @@ socket-timeout 300 +@@ -2756,7 +2756,7 @@ socket-timeout 300 # # trusted-cas-file trusted_cas_file.pem # diff --git a/debian/patches/27_remove_nsl.patch b/debian/patches/27_remove_nsl.patch index 673614b6..48e5fdc1 100644 --- a/debian/patches/27_remove_nsl.patch +++ b/debian/patches/27_remove_nsl.patch @@ -5,7 +5,7 @@ Forwarded: not-needed --- a/configure.in +++ b/configure.in -@@ -508,7 +508,7 @@ dnl gmtime and localtime +@@ -507,7 +507,7 @@ dnl gmtime and localtime dnl ================================================================= dnl Next line needed to find the gethost*_r functions on Solaris diff --git a/debian/patches/33_manpage_hyphen.patch b/debian/patches/33_manpage_hyphen.patch index 492d32ee..d51ae684 100644 --- a/debian/patches/33_manpage_hyphen.patch +++ b/debian/patches/33_manpage_hyphen.patch @@ -5,7 +5,7 @@ Forwarded: not-needed --- a/GNUmakefile.in +++ b/GNUmakefile.in -@@ -544,8 +544,7 @@ man: dok-release +@@ -546,8 +546,7 @@ man: dok-release perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" $(MAN_PAGE); \ perl -pi.bak -e "s/ö/\\\\[:o]/g" $(MAN_PAGE); \ perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' $(MAN_PAGE); \ diff --git a/debian/patches/34_system-docbook2man.patch b/debian/patches/34_system-docbook2man.patch index 06fb54f4..4d1eedf1 100644 --- a/debian/patches/34_system-docbook2man.patch +++ b/debian/patches/34_system-docbook2man.patch @@ -6,7 +6,7 @@ Forwarded: not-needed --- a/GNUmakefile.in +++ b/GNUmakefile.in -@@ -539,7 +539,7 @@ dok-man: +@@ -541,7 +541,7 @@ dok-man: # target for man page generation! man: dok-release mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\ diff --git a/debian/patches/35_man-spelling.patch b/debian/patches/35_man-spelling.patch index 2fca69c1..873e4f9b 100644 --- a/debian/patches/35_man-spelling.patch +++ b/debian/patches/35_man-spelling.patch @@ -5,7 +5,7 @@ Forwarded: not-needed --- a/tools/privoxy-log-parser.pl +++ b/tools/privoxy-log-parser.pl -@@ -2753,7 +2753,7 @@ It does not escape any input! +@@ -2793,7 +2793,7 @@ It does not escape any input! [B<--keep-date>] Don't remove the date when printing highlighted log messages. Useful when parsing multiple log files at once. diff --git a/debian/patches/39_show-status.patch b/debian/patches/39_show-status.patch deleted file mode 100644 index 13c74e72..00000000 --- a/debian/patches/39_show-status.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Roland Rosenfeld -Subject: Add new features to show-status page. -Date: Sun, 06 Dec 2020 14:14:43 +0100 -Forwarded: https://www.privoxy.org/gitweb/?p=privoxy.git;a=patch;h=d83b7ce5 - ---- a/templates/show-status -+++ b/templates/show-status -@@ -299,6 +299,19 @@ - - - -+ FEATURE_DYNAMIC_PCRE -+ @if-FEATURE_DYNAMIC_PCRE-then@ Yes @else-not-FEATURE_DYNAMIC_PCRE@ No @endif-FEATURE_DYNAMIC_PCRE@ -+ Dynamically link to the PCRE library. This is set automatically -+ by ./configure if you do not have libpcre installed. -+ Dynamically linking to an external libpcre is recommended as the one that is distributed -+ with Privoxy itself is outdated and lacks various features and bug-fixes you may be interested in. -+ -+ -+ FEATURE_EXTENDED_STATISTICS -+ @if-FEATURE_EXTENDED_STATISTICS-then@ Yes @else-not-FEATURE_EXTENDED_STATISTICS@ No @endif-FEATURE_EXTENDED_STATISTICS@ -+ Gather statistics for block reasons and filter executions. -+ -+ - FEATURE_EXTERNAL_FILTERS - @if-FEATURE_EXTERNAL_FILTERS-then@ Yes @else-not-FEATURE_EXTERNAL_FILTERS@ No @endif-FEATURE_EXTERNAL_FILTERS@ - -@@ -308,14 +321,6 @@ - - - -- FEATURE_DYNAMIC_PCRE -- @if-FEATURE_DYNAMIC_PCRE-then@ Yes @else-not-FEATURE_DYNAMIC_PCRE@ No @endif-FEATURE_DYNAMIC_PCRE@ -- Dynamically link to the PCRE library. This is set automatically -- by ./configure if you do not have libpcre installed. -- Dynamically linking to an external libpcre is recommended as the one that is distributed -- with Privoxy itself is outdated and lacks various features and bug-fixes you may be interested in. -- -- - FEATURE_FAST_REDIRECTS - @if-FEATURE_FAST_REDIRECTS-then@ Yes @else-not-FEATURE_FAST_REDIRECTS@ No @endif-FEATURE_FAST_REDIRECTS@ - Allows the +fast-redirects action, to bypass redirect and logging scripts. -@@ -353,6 +358,14 @@ - - - -+ FEATURE_PCRE_HOST_PATTERNS -+ @if-FEATURE_PCRE_HOST_PATTERNS-then@ Yes @else-not-FEATURE_PCRE_HOST_PATTERNS@ No @endif-FEATURE_PCRE_HOST_PATTERNS@ -+ Allow to use extended host patterns and vanilla host patterns -+ at the same time by prefixing extended host patterns with -+ "PCRE-HOST-PATTERN:". -+ -+ -+ - FEATURE_NO_GIFS - @if-FEATURE_NO_GIFS-then@ Yes @else-not-FEATURE_NO_GIFS@ No @endif-FEATURE_NO_GIFS@ - Use PNG instead of GIF for the built-in images. ---- a/cgisimple.c -+++ b/cgisimple.c -@@ -2097,6 +2097,22 @@ static jb_err show_defines(struct map *e - #else - 0, - #endif -+ }, -+ { -+ "FEATURE_EXTENDED_STATISTICS", -+#ifdef FEATURE_EXTENDED_STATISTICS -+ 1, -+#else -+ 0, -+#endif -+ }, -+ { -+ "FEATURE_PCRE_HOST_PATTERNS", -+#ifdef FEATURE_PCRE_HOST_PATTERNS -+ 1, -+#else -+ 0, -+#endif - } - }; - diff --git a/debian/patches/40_redirect-ssl.patch b/debian/patches/40_redirect-ssl.patch deleted file mode 100644 index 1b1768b0..00000000 --- a/debian/patches/40_redirect-ssl.patch +++ /dev/null @@ -1,66 +0,0 @@ -Origin: https://www.privoxy.org/gitweb/?p=privoxy.git;h=89da1910 -Author: Fabian Keil -Date: Tue Dec 15 19:00:00 2020 +0100 -Bug: https://sourceforge.net/p/ijbswa/support-requests/1736/ -Forwarded: not needed, comes from upstream -Subject: Check the actual URL when https inspecting requests - redirect_url(): Check the actual URL when https inspecting requests - - Previously we would only check the path which resulted - in rewrite results being rejected as invalid URLs. - - Before: - 19:37:29.494 014 Error: pcrs command "s@/test@/@" changed "/test" to "/" (1 hit), but the result doesn't look like a valid URL and will be ignored. - - After: - 19:40:57.857 002 Redirect: pcrs command s@/test@/@ changed https://www.electrobsd.org/test to https://www.electrobsd.org/ (1 hit). - - Reported by withoutname in #1736. - ---- a/filters.c -+++ b/filters.c -@@ -66,6 +66,9 @@ - #ifdef FEATURE_CLIENT_TAGS - #include "client-tags.h" - #endif -+#ifdef FEATURE_HTTPS_INSPECTION -+#include "ssl.h" -+#endif - - #ifdef _WIN32 - #include "win32.h" -@@ -1220,8 +1223,33 @@ struct http_response *redirect_url(struc - - if (*redirection_string == 's') - { -- old_url = csp->http->url; -+#ifdef FEATURE_HTTPS_INSPECTION -+ if (client_use_ssl(csp)) -+ { -+ jb_err err; -+ -+ old_url = strdup_or_die("https://"); -+ err = string_append(&old_url, csp->http->hostport); -+ if (!err) err = string_append(&old_url, csp->http->path); -+ if (err) -+ { -+ log_error(LOG_LEVEL_FATAL, -+ "Failed to rebuild URL 'https://%s%s'", -+ csp->http->hostport, csp->http->path); -+ } -+ } -+ else -+#endif -+ { -+ old_url = csp->http->url; -+ } - new_url = rewrite_url(old_url, redirection_string); -+#ifdef FEATURE_HTTPS_INSPECTION -+ if (client_use_ssl(csp)) -+ { -+ freez(old_url); -+ } -+#endif - } - else - { diff --git a/debian/patches/series b/debian/patches/series index cc721f9c..e639ed8d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,5 +7,3 @@ 33_manpage_hyphen.patch 34_system-docbook2man.patch 35_man-spelling.patch -39_show-status.patch -40_redirect-ssl.patch -- 2.39.2