<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a9a20fdaea1505fefb692627a4bd79be2ba53ada">https://github.com/macports/macports-ports/commit/a9a20fdaea1505fefb692627a4bd79be2ba53ada</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new a9a20fdaea1 privoxy: Add Privoxy tools, fix https
</span>a9a20fdaea1 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a9a20fdaea1505fefb692627a4bd79be2ba53ada
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Thu Nov 11 07:42:32 2021 -0500

<span style='display:block; white-space:pre;color:#404040;'>    privoxy: Add Privoxy tools, fix https
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * Addresses: https://lists.privoxy.org/pipermail/privoxy-users/2021-November/000597.html
</span>---
 www/privoxy/Portfile                          | 44 +++++++++++++++++++++------
 www/privoxy/files/openssl.cnf                 |  6 ++--
 www/privoxy/files/patch-match-all.action.diff | 23 +++++++++-----
 3 files changed, 54 insertions(+), 19 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/privoxy/Portfile b/www/privoxy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ecad8a2638..ce18bd2023e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/privoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/privoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup           perl5 1.0
</span> 
 name                privoxy
 version             3.0.32
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            6
</span> categories          www security net
 platforms           darwin
 license             GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ long_description    Privoxy is a web proxy with advanced filtering \
</span>                     Privoxy has application for both stand-alone systems and \
                     multi-user networks.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            http://www.privoxy.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            https://www.privoxy.org/
</span> master_sites        ${homepage}/sf-download-mirror/Sources/${version}%20%28stable%29
 distname            ${name}-${version}-stable-src
 distfiles           ${distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,16 +58,31 @@ worksrcdir          ${name}-${version}-stable
</span> depends_build-append \
                     port:p${perl5.major}-sgmlspm
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:brotli \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append  port:brotli \
</span>                     port:pcre \
                     port:zlib
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append  port:perl${perl5.major} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:p${perl5.major}-getopt-long \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:p${perl5.major}-time-local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set privoxyGroup    privoxy
 set privoxyUser     privoxy
 add_users           ${privoxyUser} group=${privoxyGroup}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# diff -Naur privoxy-orig/config privoxy-new/config | sed -E -e 's/privoxy-(orig|new)/./g'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# bash commands to generate patch files from new upstream configuration files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## export prefix=${prefix:-/opt/local}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## mkdir privoxy-orig privoxy-new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## sudo cp ${prefix}/etc/privoxy/config.new privoxy-orig/config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## sudo cp ${prefix}/etc/privoxy/match-all.action.new privoxy-orig/match-all.action
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## sudo cp ./privoxy-orig/config ./privoxy-new/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## sudo cp ./privoxy-orig/match-all.action ./privoxy-new/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## sudo chown `whoami` privoxy-orig/config privoxy-new/config privoxy-orig/match-all.action privoxy-new/match-all.action
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## patch -p0 -f -l -N privoxy-new/config < ${prefix}/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/www/privoxy/files/patch-config.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## patch -p0 -f -l -N privoxy-new/match-all.action < ${prefix}/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/www/privoxy/files/patch-match-all.action.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## diff -NaurdwB ./privoxy-orig/config ./privoxy-new/config | sed -E -e 's/\.\/privoxy-(orig|new)\/(config)(\.[[:alnum:]]+)*/\.\/\2/' | sed -E -e 's|/opt/local|@@PREFIX@@|g' > ~/Downloads/patch-config.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## diff -NaurdwB ./privoxy-orig/match-all.action ./privoxy-new/match-all.action | sed -E -e 's/\.\/privoxy-(orig|new)\/(match-all\.action)(\.[[:alnum:]]+)*/\.\/\2/' | sed -E -e 's|/opt/local|@@PREFIX@@|g' > ~/Downloads/patch-match-all.action.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles-append   patch-config.diff
 
 post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,6 +120,16 @@ destroot.keepdirs   ${destroot}${prefix}/var/log/privoxy \
</span>                     ${destroot}${prefix}/var/run
 
 post-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # install Privoxy tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -d ${destroot}${prefix}/etc/${name}/tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach f [glob ${worksrcpath}/tools/*.pl] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set pl [file tail ${f}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -m 0755 ${f} ${destroot}${prefix}/etc/${name}/tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace -W ${destroot}${prefix}/etc/${name}/tools -E \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            "1 s|^(#!)/usr/bin/perl|\\1${perl5.bin}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${pl}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    
</span>     xinstall -d ${destroot}${prefix}/var/run
     # Install and fixup startup script (if non-Darwin)
     if {${os.platform} ne "darwin"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,7 +216,6 @@ variant https_inspection \
</span>                     path:bin/openssl:openssl \
                     path:lib/libssl.dylib:openssl
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # diff -Naur privoxy-orig/match-all.action privoxy-new/match-all.action | sed -E -e 's/privoxy-(orig|new)/./g' > patch-match-all.action.diff
</span>     patchfiles-append \
                     patch-match-all.action.diff
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -310,7 +334,8 @@ variant https_inspection \
</span>                 -pass file:private/passphrase.txt
 
             # RSA
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            # openssl genrsa -aes256 -out private/ca.key.pem \\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # openssl genpkey -out private/ca.key.pem -algorithm RSA \\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            #     -pkeyopt rsa_keygen_bits:2048 -aes256 \\
</span>             #     -passout file:private/passphrase.txt
 
             chmod go-rw private/ca.key.pem
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -402,8 +427,9 @@ certificate authority (CA). As sudo:
</span>             -pass file:private/passphrase.txt
 
         # private key (RSA)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # openssl genrsa -aes256 -out private/ca.key.pem \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        #     -passout file:private/passphrase.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # openssl genpkey -out private/ca.key.pem -algorithm RSA \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        #     -pkeyopt rsa_keygen_bits:2048 -aes256 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        #     -pass file:private/passphrase.txt
</span> 
         # Certificate PEM, DER, and P12
         openssl req -config openssl.cnf -new -x509 -days 3650 -sha256 \\
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/privoxy/files/openssl.cnf b/www/privoxy/files/openssl.cnf
</span><span style='display:block; white-space:pre;color:#808080;'>index 013d6c6d3e5..393f36b304e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/privoxy/files/openssl.cnf
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/privoxy/files/openssl.cnf
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,9 +37,11 @@
</span> # openssl genpkey -out private/ca.key.pem -algorithm EC \
 #     -pkeyopt ec_paramgen_curve:P-384 -aes256 \
 #     -pass file:private/passphrase.txt
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span> # RSA
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# # openssl genrsa -aes256 -out private/ca.key.pem \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# #     -passout file:private/passphrase.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # openssl genpkey -out private/ca.key.pem -algorithm RSA \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# #     -pkeyopt rsa_keygen_bits:2048 -aes256 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# #     -pass file:private/passphrase.txt
</span> 
 # CA certificate
 # openssl req -config openssl.cnf \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/privoxy/files/patch-match-all.action.diff b/www/privoxy/files/patch-match-all.action.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 24358a766d6..0b4244bfc17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/privoxy/files/patch-match-all.action.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/privoxy/files/patch-match-all.action.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./match-all.action     2021-10-02 21:18:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./match-all.action     2021-10-16 07:54:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,12 +5,67 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./match-all.action     2021-11-11 06:37:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./match-all.action     2021-11-11 06:58:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,12 +5,74 @@
</span>  # users should only edit this file through the actions file editor.
  #
  #############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,19 +31,26 @@
</span>  +set-image-blocker{pattern} \
  }
  / # Match all URLs
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +# User-Agent
<span style='display:block; white-space:pre;background:#e0ffe0;'>++# Uncomment to forge the User-Agent
</span> +# See http://www.christianschenk.org/blog/enhancing-your-privacy-using-squid-and-privoxy/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+{ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-++hide-referrer{conditional-forge} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-++hide-user-agent{Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1 Safari/605.1.15} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/ # Match all URLs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#{ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#+hide-referrer{conditional-forge} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#+hide-user-agent{Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1 Safari/605.1.15} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#/ # Match all URLs
</span> +
 +# https-inspection
 +{+https-inspection}
 +/ # Match all URLs
 +
 +# No HTTPS Inspection on these websites
<span style='display:block; white-space:pre;background:#e0ffe0;'>++# Please edit this list to exclude domains for which HTTPS inspection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# will not be used, whether because you wish to maintain end-to-end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# encryption (e.g. financial institutions), avoid possible fragility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# of important connections (e.g. Apple domains on macOS and iOS devices),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# fix websites broken by HTTPS inspection or Privoxy rules, or any other reason
</span> +{-https-inspection}
 +.apple.com
 +.icloud.com
</pre><pre style='margin:0'>

</pre>