Debian: Update debian/ dir to Debian 4.0.0-2 package.

And change gitsnapshot version to 4.1.0~gitsnapshot-1

diff --git a/debian/changelog b/debian/changelog
index 1a81f52..4d4c3a7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
-privoxy (4.0.1~gitsnapshot-1) UNRELEASED; urgency=medium
+privoxy (4.1.0~gitsnapshot-1) UNRELEASED; urgency=medium
 
   * Unreleased GIT snapshot.
 
- -- Roland Rosenfeld <roland@debian.org>  Fri, 31 Jan 2025 16:05:14 +0100
+ -- Roland Rosenfeld <roland@debian.org>  Sun, 22 Jun 2025 15:12:38 +0200
+
+privoxy (4.0.0-2) unstable; urgency=medium
+
+  * Add ca debconf translation.  Thanks to Carles Pina i Estany.
+  * Update debian/upstream/signing-key.asc.
+  * d/test/check-ssl : handle http proxy configuration (LP: #2097351).
+    Thanks to Hector Cao <hector.cao@canonical.com> for providing a patch.
+
+ -- Roland Rosenfeld <roland@debian.org>  Wed, 05 Feb 2025 17:38:23 +0100
 
 privoxy (4.0.0-1) unstable; urgency=medium
 

diff --git a/debian/po/ca.po b/debian/po/ca.po
new file mode 100644 (file)
index 0000000..f4b8164
--- /dev/null
+++ b/debian/po/ca.po
@@ -0,0 +1,34 @@
+# Catalan translation of privoxy's debconf messages
+# Copyright © 2025 Free Software Foundation, Inc.
+# This file is distributed under the same license as the privoxy package.
+# poc senderi <pocsenderi@protonmail.com>, 2025.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: privoxy\n"
+"Report-Msgid-Bugs-To: privoxy@packages.debian.org\n"
+"POT-Creation-Date: 2016-04-08 17:17+0200\n"
+"PO-Revision-Date: 2025-01-26 23:35+0100\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: poc senderi <pocsenderi@protonmail.com>\n"
+"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
+"X-Generator: Poedit 2.4.2\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Adresses on with Privoxy listens:"
+msgstr "Adreces on el Privoxy escolta:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"Please enter a space separated list of address:port combinations on which "
+"Privoxy will listen for client requests."
+msgstr ""
+"Introduïu una llista separada per espais amb les combinacions adreça:port "
+"en què el Privoxy escoltarà les sol·licituds del clients."

diff --git a/debian/tests/check-ssl b/debian/tests/check-ssl
index 5832214..4140d2e 100755 (executable)
--- a/debian/tests/check-ssl
+++ b/debian/tests/check-ssl
@@ -3,7 +3,7 @@
 # Run privoxy-regression-test.pl --check-bad-ssl
 # and check https://www.howsmyssl.com/
 #
-# (c) 2024 Roland Rosenfeld <roland@debian.org>
+# (c) 2024-2025 Roland Rosenfeld <roland@debian.org>
 
 PORT=8119
 
@@ -59,6 +59,24 @@ sed -e "s/^listen-address.*/listen-address 127.0.0.1:$PORT/" \
     < /usr/share/privoxy/config > "$CONFIG"
 echo "actionsfile $ACTION" >> "$CONFIG"
 
+# some autopkgtest execution environment uses proxy for internet access
+# in that case, this makes this test fail because privoxy cannot access
+# different internet resources
+# we have to configure privoxy to use the proxy configuration if present
+# in order to do that, we use the forward primitive in the privoxy configuration
+# file
+if [ -n "$http_proxy" ]; then
+    # remove http:// and https:// prefix to be compliant with forward
+    # directive input format
+    proxy_url=$(echo "${http_proxy}" | sed -E 's/^\s*.*:\/\///g')
+    if [ -n "${proxy_url}" ]; then
+        forward_conf_snippet="forward  /  ${proxy_url}"
+    fi
+fi
+if [ -n "${forward_conf_snippet}" ]; then
+    echo "${forward_conf_snippet}" >> "$CONFIG"
+fi
+
 echo "Starting privoxy on port $PORT"
 $PRIVOXY --pidfile "$PIDFILE" --no-daemon "$CONFIG" > "$DAEMONOUT" 2>&1 &
 sleep 1

diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index e49a9e4..1149e7f 100644 (file)
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -12,19 +12,19 @@ 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
-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
+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
@@ -35,18 +35,18 @@ PfnvFmDa2ycyomZxWmz+/Hr/HsGOrmJNDvmqyR8mOSluptw6I09jN3qEuI++xZvD
 9uDNeuAvTkp27zqnSFHGje3zRg50urijf04DHQ6q63HxJA1K4QSICG0Wlhg5Ysoo
 2UJ0uUGuCmo+yJXPBC6EazGZ2f08ili8DppPgVoYPv+7mFclTSU1AXcUUu+DTntJ
 Ea1PkHRmnBlJAzw736aAzJ8wrMq9oU/VR8r0d1RpmZFGDpkbBtZtLSunng/KUl5Q
-jv8AEQEAAYkCPAQYAQgAJgIbDBYhBE82wX84FpE2VKHoUGkYIpGLojccBQJa7Z30
-BQkOO+CeAAoJEGkYIpGLojcc5qMP/RlY/uklsNPJu3LeulkCHfi5R4ANTFhspg5b
-Dpzujp67YMo7tbuT9IAgvG/rwzYfZyADnE+MzSkv9OBuOWkjeQPF/drHMHFjurJx
-yQvZeABlosn+EPUds/FJQleiJRLdfdfKHpRYLa4qMBV0eq542vTCh24v+vYMZEP0
-sb0o7ERHcVOgl18WtP8Gumj/9GiQt9BcGYVlFyRI/5sbaFHYt/IOyb7IK63uGlTq
-zSuVpYTQNZs6ByJ44U7W9QPMLHtoEhGESquhbTM+aRPS6wqmXkEP0/TYXRP8iEkR
-oaK26qhHMVd3Qx8WA1SdekOXlconhptJd0mzy21lXnmiTAt+vOIk3Dz7Jj9e+zLT
-tUknU+ZIt00GJMy7OCqmk7GjRk86U14ZzMEY0s7eHqAzMaNDkl0Avt79z11qODbl
-hnwhwqwpoZP5tolssAE8ejux7dkbLp/Lqso8yQpT9EVlLGimpH7/1xFI9vn6irf0
-6alOBFURg/rIuecxy4HLXkCBqH/eAWl4BdjU+8py9MznZtJk/C3eKfiKG5METM5k
-ZG+BjI1FXFJCxArHOfoKjuwbWmzgSgJjcWuYgIHdC8e6zpYpkqZLG6xR2//1H9Ax
-znY/K1T1Pluo4TEhoro7D+1fymmTRyJRVreEoo4/Hy/Yc/dVuQwIafEtA+FDejKg
-zW3qmo5y
-=pli6
+jv8AEQEAAYkCPAQYAQgAJgIbDBYhBE82wX84FpE2VKHoUGkYIpGLojccBQJlwoVN
+BQkZEMf3AAoJEGkYIpGLojccZDgP/iFnR8WJlz6Jsl00hJ2qzzXN7Ynwn+cSBQvT
+4Zc5VNkvs3K/CGDmYeVf0mdSMMZOnCLHDmHrQx65V2Prn1q7QNI7KNZU0NyGVWSS
+UyTu1++wC1PQxvgo7vXok2ypZ5sSqWVesKTUeLJ1ZUDhGKmpSpYQhxuE2GKNjxIx
+H5F69jXzegVWot4kS99toOUY6Nz3YWUOfBNYHtIrjWRaZOhuSn+9zMDM23FcOr2a
+k4bE9NHrpCXF6bKWuLfUU3BcDrLTGAVMrZ/Wmf3WS9AlSIDeUKN8RkGqXttM8hYK
+eH86S2N4nrUGfXDuUmQ2iBE3J5UeYukIxVgXCLXZqDxR7Rnq65Ngu58Ay4Kcweac
+2odVEg9brrk5H+nGXnaoe2/cfdYp3+HIUqUTfyrV1YZlroOsUuhmS3FSR3OlNlsG
+tcy4aOUy5BJfcRRm1piiZ8WHx+uQzApfcqQqumQajc4b+FTTlGucxUZe/PjyNQC9
+e0oqgTGwF8LesqmfQpLoyBnjW5uGxhRHITvOBWvhA342xexCm32pn2gqeyykWzPx
+k0NSp6jHkGsbCAGN8MpxCnZJDZJERpUP/6BD1qRAn9sRYbAFJho7HsEyhsqv+M6d
+bcSSq//MslWvX3LVYRgia/FMeUEXkCiFyoWjbC8NO/12kt1LM6+MmVHgQFZ3lmVe
+OOpXX4XP
+=6rFb
 -----END PGP PUBLIC KEY BLOCK-----