[Privoxy-commits] [privoxy] 01/02: Merge Debian 4.1.0-1 release to debian/ direcetory.
User Git
git at git.privoxy.org
Sat Apr 11 13:10:41 CEST 2026
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository privoxy.
commit 925b819b686cb0fa428fd0434a60937fae82aaae
Author: Roland Rosenfeld <roland at debian.org>
AuthorDate: Sat Apr 11 12:18:40 2026 +0200
Merge Debian 4.1.0-1 release to debian/ direcetory.
---
debian/changelog | 20 +++++++++++++++--
debian/control | 22 +++++++++---------
debian/copyright | 31 +++++++++++++------------
debian/gbp.conf | 4 ++++
debian/lrc.config | 12 ++++++++++
debian/patches/14_config.patch | 10 ++++-----
debian/patches/17_502_no_such_domain.patch | 4 ++--
debian/patches/25_standard_medium.patch | 1 -
debian/patches/32_bind_fixup.patch | 2 +-
debian/po/zh_CN.po | 36 ++++++++++++++++++++++++++++++
debian/po/zh_TW.po | 36 ++++++++++++++++++++++++++++++
debian/postinst | 4 +---
debian/privoxy-cleanup.service | 1 -
debian/rules | 2 +-
debian/watch | 9 ++++----
15 files changed, 145 insertions(+), 49 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cfba0a11..c038168f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,26 @@
-privoxy (4.1.0~gitsnapshot-1) UNRELEASED; urgency=medium
+privoxy (4.2.0~gitsnapshot-1) UNRELEASED; urgency=medium
* Unreleased GIT snapshot.
+ * Update all patches to new version.
+
+ -- Roland Rosenfeld <roland at debian.org> Sat, 11 Apr 2026 12:15:13 +0200
+
+privoxy (4.1.0-1) unstable; urgency=medium
+
+ * New upstream version 4.1.0.
* Update 25_standard_medium to changed upstream.
+ * Update debian/watch to version 5.
+ * Remove «Rules-Requires-Root: no», which is the current default.
+ * Update years of packaging copyright.
+ * Remove «Priority: optional», which is the current default.
+ * Update FSF address in copyright to URL.
+ * debian/lrc.config: exclude docs pointing to other licenses.
+ * Add zh_CN and zh_TW translation. Thanks to Yangfl (Closes: #1124422).
* Enable zstd support.
+ * Update debian/copyright (and adjust debian/lrc.config).
+ * Declare compliance with Debian Policy 4.7.3.
- -- Roland Rosenfeld <roland at debian.org> Sun, 22 Jun 2025 15:12:38 +0200
+ -- Roland Rosenfeld <roland at debian.org> Mon, 05 Jan 2026 19:51:13 +0100
privoxy (4.0.0-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index b13ddfaf..72cc882d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,6 @@
Source: privoxy
-Section: web
-Priority: optional
Maintainer: Roland Rosenfeld <roland at debian.org>
+Section: web
Build-Depends: autoconf,
debhelper-compat (= 13),
dh-apparmor,
@@ -19,24 +18,23 @@ Build-Depends: autoconf,
sgmlspl <!nodoc>,
w3m <!nodoc>,
zlib1g-dev
-Standards-Version: 4.7.0
-Homepage: https://www.privoxy.org/
-Vcs-Git: https://salsa.debian.org/debian/privoxy.git
+Standards-Version: 4.7.3
Vcs-Browser: https://salsa.debian.org/debian/privoxy
-Rules-Requires-Root: no
+Vcs-Git: https://salsa.debian.org/debian/privoxy.git
+Homepage: https://www.privoxy.org/
Package: privoxy
Architecture: any
-Depends: adduser,
+Depends: ${misc:Depends},
+ ${perl:Depends},
+ ${shlibs:Depends},
+ adduser,
debconf,
logrotate,
- ucf,
- ${misc:Depends},
- ${perl:Depends},
- ${shlibs:Depends}
-Pre-Depends: ${misc:Pre-Depends}
+ ucf
Recommends: doc-base
Suggests: apparmor
+Pre-Depends: ${misc:Pre-Depends}
Description: Privacy enhancing HTTP Proxy
Privoxy is a web proxy with advanced filtering capabilities for
protecting privacy, filtering web page content, managing cookies,
diff --git a/debian/copyright b/debian/copyright
index 9740b165..71fa31a5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://sourceforge.net/projects/ijbswa/files/Sources/
Upstream-Name: Privoxy
Upstream-Contact: Privoxy Developers <privoxy-devel at lists.privoxy.org>
-Source: https://sourceforge.net/projects/ijbswa/files/Sources/
Files: *
Copyright:
- Copyright (C) 2001-2025 by the Privoxy team. https://www.privoxy.org/
- Copyright (C) 2001-2025 by Privoxy Developers <privoxy-devel at lists.privoxy.org>
+ Copyright (C) 2001-2026 by the Privoxy team. https://www.privoxy.org/
+ Copyright (C) 2001-2026 by Privoxy Developers <privoxy-devel at lists.privoxy.org>
Parts Copyright (c) 1997 by Anonymous Coders and Junkbusters, Inc.
Parts Copyright (C) 1999 Adam Lock <locka at iol.ie>
Parts Copyright (C) 1998-1999 Steve Cheng <steve at ggi-project.org>
@@ -17,6 +17,7 @@ Copyright:
Parts Copyright (C) 2006-2021 Fabian Keil <fk at fabiankeil.de>
Parts Copyright (c) 2020 Maxim Antonov <mantonov at gmail.com>
Parts Copyright (C) 2017-2020 Vaclav Svec. FIT CVUT.
+License: GPL-2+
Comment:
Some source code is based on code Copyright (c) 1997 by Anonymous
Coders and Junkbusters, Inc. and licensed under the GNU General
@@ -33,7 +34,6 @@ Comment:
binaries under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the
license, or (at your option) any later version.
-License: GPL-2+
Files: regression-tests.action tools/uagen.pl
tools/privoxy-regression-test.pl tools/privoxy-log-parser.pl
@@ -59,9 +59,6 @@ License: ISC
Files: strptime.h
Copyright:
Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-Comment:
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper at cygnus.com>, 1996.
License: LGPL-2+
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
@@ -74,9 +71,14 @@ License: LGPL-2+
Library General Public License for more details.
.
You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
- Floor, Boston, MA 02110-1301, USA.
+ License along with this library; if not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU Librarry General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/LGPL-2'.
+Comment:
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper at cygnus.com>, 1996.
Files: config.guess config.sub
Copyright:
@@ -115,7 +117,7 @@ License: HPND-sell-variant
Files: debian/*
Copyright:
- 2002-2025 Roland Rosenfeld <roland at debian.org>
+ 2002-2026, Roland Rosenfeld <roland at debian.org>
License: GPL-2+
License: GPL-2+
@@ -131,11 +133,8 @@ License: GPL-2+
PARTICULAR PURPOSE. See the GNU General Public
License for more details.
.
- The GNU General Public License should be included with
- this file. If not, you can view it at
- http://www.gnu.org/copyleft/gpl.html
- or write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 00000000..6b65fe07
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+debian-branch = debian/latest
+upstream-branch = upstream/latest
+pristine-tar = True
diff --git a/debian/lrc.config b/debian/lrc.config
new file mode 100644
index 00000000..a05fe3dc
--- /dev/null
+++ b/debian/lrc.config
@@ -0,0 +1,12 @@
+# licenserecon
+#
+# This file lists files and directories to be excluded from checking,
+# to avoid false positives.
+#
+# These files often contain licenses for other files.
+# (File foo also treated as foo.*)
+doc/source/license.sgml
+doc/webserver/man-page/privoxy-man-page.html
+doc/webserver/announce.txt
+privoxy.8
+ChangeLog
diff --git a/debian/patches/14_config.patch b/debian/patches/14_config.patch
index dcb14984..12197e69 100644
--- a/debian/patches/14_config.patch
+++ b/debian/patches/14_config.patch
@@ -32,7 +32,7 @@ Forwarded: not-needed
#
# 2.5. actionsfile
# =================
-@@ -2483,7 +2483,7 @@ socket-timeout 300
+@@ -2485,7 +2485,7 @@ socket-timeout 300
#
# ca-directory /usr/local/etc/privoxy/CA
#
@@ -41,16 +41,16 @@ Forwarded: not-needed
#
# 7.2. ca-cert-file
# ==================
-@@ -2650,7 +2650,7 @@ socket-timeout 300
+@@ -2652,7 +2652,7 @@ socket-timeout 300
#
# certificate-directory /usr/local/var/privoxy/certs
#
-#certificate-directory /usr/local/var/privoxy/certs
+#certificate-directory /var/lib/privoxy/certs
#
- # 7.6. cipher-list
- # =================
-@@ -2779,7 +2779,7 @@ socket-timeout 300
+ # 7.6. elliptic-curve-keys
+ # =========================
+@@ -2818,7 +2818,7 @@ elliptic-curve-keys 1
#
# trusted-cas-file trusted_cas_file.pem
#
diff --git a/debian/patches/17_502_no_such_domain.patch b/debian/patches/17_502_no_such_domain.patch
index b528dfb0..ad7abc4f 100644
--- a/debian/patches/17_502_no_such_domain.patch
+++ b/debian/patches/17_502_no_such_domain.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
--- a/templates/no-such-domain
+++ b/templates/no-such-domain
-@@ -78,7 +78,7 @@
+@@ -79,7 +79,7 @@
<html>
<head>
@@ -16,7 +16,7 @@ Forwarded: not-needed
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-@@ -94,7 +94,7 @@
+@@ -95,7 +95,7 @@
<table summary="" cellpadding="20" cellspacing="10" border="0" width="100%">
<tr>
<td class="status">
diff --git a/debian/patches/25_standard_medium.patch b/debian/patches/25_standard_medium.patch
index 475de28e..c53c537b 100644
--- a/debian/patches/25_standard_medium.patch
+++ b/debian/patches/25_standard_medium.patch
@@ -1,6 +1,5 @@
From: Roland Rosenfeld <roland at debian.org>
Date: Sat, 23 Sep 2006 23:37:03 +0200
-Last-Update: 2025-06-22
Subject: Change the global default from standard.Cautious to standard.Medium,
which is similar to the old 3.0.3 behavior and doesn't change too much.
Forwarded: not-needed
diff --git a/debian/patches/32_bind_fixup.patch b/debian/patches/32_bind_fixup.patch
index e0d82f35..4a590347 100644
--- a/debian/patches/32_bind_fixup.patch
+++ b/debian/patches/32_bind_fixup.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/jbsockets.c
+++ b/jbsockets.c
-@@ -918,20 +918,7 @@ int bind_port(const char *hostnam, int p
+@@ -921,20 +921,7 @@ int bind_port(const char *hostnam, int p
}
memset(&hints, 0, sizeof(struct addrinfo));
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
new file mode 100644
index 00000000..c0755883
--- /dev/null
+++ b/debian/po/zh_CN.po
@@ -0,0 +1,36 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Yangfl <mmyangfl at gmail.com>, 2026.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: privoxy\n"
+"Report-Msgid-Bugs-To: privoxy at packages.debian.org\n"
+"POT-Creation-Date: 2016-04-08 17:17+0200\n"
+"PO-Revision-Date: 2026-01-01 06:42+0800\n"
+"Last-Translator: Yangfl <mmyangfl at gmail.com>\n"
+"Language-Team: 汉语 <debian-l10n-chinese at lists.debian.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 3.8\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Adresses on with Privoxy listens:"
+msgstr "Privoxy 监听的地址："
+
+#. 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 ""
+"请输入以空格分隔的 地址:端口 组合列表，Privoxy 将在这些地址和端口上监听客"
+"户端请求。"
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
new file mode 100644
index 00000000..7cae6266
--- /dev/null
+++ b/debian/po/zh_TW.po
@@ -0,0 +1,36 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Yangfl <mmyangfl at gmail.com>, 2026.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: privoxy\n"
+"Report-Msgid-Bugs-To: privoxy at packages.debian.org\n"
+"POT-Creation-Date: 2016-04-08 17:17+0200\n"
+"PO-Revision-Date: 2026-01-01 06:42+0800\n"
+"Last-Translator: Yangfl <mmyangfl at gmail.com>\n"
+"Language-Team: 漢語 <debian-l10n-chinese at lists.debian.org>\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 3.8\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Adresses on with Privoxy listens:"
+msgstr "Privoxy 監聽的位址："
+
+#. 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 ""
+"請輸入以空格分隔的 位址:連接埠 組合列表，Privoxy 將在這些位址和連接埠上監"
+"聽客戶端請求。"
diff --git a/debian/postinst b/debian/postinst
index a841de78..849393e0 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -75,7 +75,7 @@ case "$1" in
if [ "x$2" != "x" ] && dpkg --compare-versions "$2" lt "3.0.7" \
&& grep -q '^actionsfile [a-z]*[[:space:]]*#.*$' $CONFIG
then
- # Upgrading from version before 3.0.7 where the user kept his old
+ # Upgrading from version before 3.0.7 where the user kept his old
# (modified) config file:
# Try to change "actionsfile foo" to "actionsfile foo.action"
# as needed in 3.0.7:
@@ -130,5 +130,3 @@ esac
#DEBHELPER#
exit 0
-
-
diff --git a/debian/privoxy-cleanup.service b/debian/privoxy-cleanup.service
index 88871817..5a9bb330 100644
--- a/debian/privoxy-cleanup.service
+++ b/debian/privoxy-cleanup.service
@@ -11,4 +11,3 @@ ExecStart=/etc/cron.daily/privoxy systemd-timer
Nice=19
IOSchedulingClass=best-effort
IOSchedulingPriority=7
-
diff --git a/debian/rules b/debian/rules
index 23d0cc9b..b2c78243 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
#
-# (c) 2002-2024 Roland Rosenfeld <roland at debian.org>
+# (c) 2002-2026 Roland Rosenfeld <roland at debian.org>
#
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
diff --git a/debian/watch b/debian/watch
index e6077914..2b2b28c7 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,5 @@
-# See uscan(1) for format
+Version: 5
-version=4
-
-opts=pgpsigurlmangle=s/$/.asc/ \
-https://sf.net/ijbswa/privoxy-(\d+.*)-(?:stable|beta)-src.tar.gz
+Source: https://sf.net/ijbswa/
+Matching-Pattern: privoxy-(\d+.*)-(?:stable|beta)-src.tar.gz
+Pgpsigurlmangle: s/$/.asc/
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Privoxy-commits
mailing list