Your message dated Sun, 01 May 2016 13:20:39 +0000
with message-id <[email protected]>
and subject line Bug#798219: fixed in privoxy 3.0.24-2
has caused the Debian Bug report #798219,
regarding privoxy: Please add debconf support for setting listen-address
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
798219: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798219
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: privoxy
Version: 3.0.23-3
Severity: wishlist
Tags: patch
Dear Maintainer,
Please consider adding debconf support to privoxy, specifically for
setting the listen-address. This change is needed for FreedomBox to
offer smooth upgrades to our users.
The attached patch does this as follows:
1. The config shipped with privoxy is installed under /usr/share/privoxy
instead of /etc/privoxy.
2. Debconf can ask for listen-address, with localhost:8118 as the
default. The question priority is medium, so it won't be shown to those
with the default debconf settings.
3. ucf is used to merge config updates during upgrades.
Some more background on why this is needed:
FreedomBox (through its user interface, plinth) can install privoxy and
configure it to be available to client devices on the LAN (by setting
listen-address). But currently, our changes to /etc/privoxy/config make
it difficult to upgrade privoxy, because it will ask which config file
to keep. If plinth can configure privoxy solely through debconf, then
upgrades can be done without prompting (via unattended-upgrades), and
our users can also receive any updates that are made to the packaged config.
--
James
diff --git a/debian/config b/debian/config
new file mode 100755
index 0000000..bfda17a
--- /dev/null
+++ b/debian/config
@@ -0,0 +1,16 @@
+#!/bin/sh
+CONFIG=/etc/privoxy/config
+set -e
+. /usr/share/debconf/confmodule
+
+# Load config file, if it exists.
+if [ -e $CONFIG ]; then
+ LISTENADDRESS=$(awk '/^listen-address/ {print $2}' $CONFIG)
+
+ # Store values from config file into debconf db.
+ db_set privoxy/listen-address "$LISTENADDRESS"
+fi
+
+# Ask questions.
+db_input medium privoxy/listen-address || true
+db_go || true
diff --git a/debian/control b/debian/control
index d1d478d..c74c1ba 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: optional
Maintainer: Roland Rosenfeld <[email protected]>
Build-Depends: debhelper (>= 9), autoconf, autotools-dev, libpcre3-dev,
jade, docbook-dsssl, docbook, w3m, sp, sgmlspl, groff, man2html, zlib1g-dev,
- dh-systemd (>= 1.4)
+ dh-systemd (>= 1.4), po-debconf
Standards-Version: 3.9.6
Homepage: http://www.privoxy.org/
Package: privoxy
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, logrotate,
- adduser, lsb-base (>= 3.2-13), initscripts (>= 2.87dsf-8)
+ adduser, lsb-base (>= 3.2-13), initscripts (>= 2.87dsf-8), debconf, ucf
Recommends: doc-base
Description: Privacy enhancing HTTP Proxy
Privoxy is a web proxy with advanced filtering capabilities for
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..a1729f0
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+config usr/share/privoxy
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
new file mode 100644
index 0000000..98e8416
--- /dev/null
+++ b/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
\ No newline at end of file
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
new file mode 100644
index 0000000..c8a2543
--- /dev/null
+++ b/debian/po/templates.pot
@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: privoxy\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2015-09-05 19:17-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Address and TCP port on which Privoxy will listen for client requests:"
+msgstr ""
diff --git a/debian/postinst b/debian/postinst
index f55b3c8..5467504 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -25,6 +25,9 @@ set -e
CONFDIR=/etc/privoxy
CONFIG=$CONFDIR/config
+EXAMPLE_CONFIG=/usr/share/privoxy/config
+
+. /usr/share/debconf/confmodule
case "$1" in
configure)
@@ -36,6 +39,13 @@ case "$1" in
[ -f $CONFDIR/match-all.action ] \
&& chown privoxy $CONFDIR/match-all.action
+ cp -a -f $EXAMPLE_CONFIG $CONFIG.ucftmp
+ db_get privoxy/listen-address || true
+ sed -i "s/^listen-address.*/listen-address $RET/" $CONFIG.ucftmp
+ ucf --three-way --debconf-ok $CONFIG.ucftmp $CONFIG
+ ucfr privoxy $CONFIG
+ rm -f $CONFIG.ucftmp
+
if [ "x$2" != "x" ] && dpkg --compare-versions "$2" lt "3.0.4"
then
# Upgrading from a 3.0.3* version
diff --git a/debian/postrm b/debian/postrm
index 3b761d0..afd3038 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -21,7 +21,17 @@ set -e
case "$1" in
purge)
# deluser --quiet privoxy
+ if [ -x "$(which ucf 2>/dev/null)" ]; then
+ ucf --purge /etc/privoxy/config
+ fi
+ if [ -x "$(which ucfr 2>/dev/null)" ]; then
+ ucfr --purge privoxy /etc/privoxy/config
+ fi
rm -rf /var/log/privoxy /etc/privoxy
+ if [ -e /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ db_purge
+ fi
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/rules b/debian/rules
index 286a79c..dfd6bed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,6 @@ override_dh_auto_clean:
override_dh_auto_install:
install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy
- install -m 644 config $(DEBDIR)/etc/privoxy/config
install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action
install -m 0644 match-all.action $(DEBDIR)/etc/privoxy/match-all.action
install -m 0644 user.action $(DEBDIR)/etc/privoxy/user.action
diff --git a/debian/templates b/debian/templates
new file mode 100644
index 0000000..b42052b
--- /dev/null
+++ b/debian/templates
@@ -0,0 +1,4 @@
+Template: privoxy/listen-address
+Type: string
+Default: localhost:8118
+_Description: Address and TCP port on which Privoxy will listen for client requests:
signature.asc
Description: OpenPGP digital signature
--- End Message ---
--- Begin Message ---
Source: privoxy
Source-Version: 3.0.24-2
We believe that the bug you reported is fixed in the latest version of
privoxy, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Roland Rosenfeld <[email protected]> (supplier of updated privoxy package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sun, 01 May 2016 14:21:22 +0200
Source: privoxy
Binary: privoxy
Architecture: source amd64
Version: 3.0.24-2
Distribution: unstable
Urgency: medium
Maintainer: Roland Rosenfeld <[email protected]>
Changed-By: Roland Rosenfeld <[email protected]>
Description:
privoxy - Privacy enhancing HTTP Proxy
Closes: 518010 557443 798219
Changes:
privoxy (3.0.24-2) unstable; urgency=medium
.
* Upgrade Standards-Version to 3.9.8 (no changes).
* Add -p to QUILT_DIFF_OPTS.
* Add Documentation key to privoxy.service.
* 35_man-spelling: Fix spelling error in privoxy-log-parser(1).
* Add debconf and ucf support to make listen-address configurable.
Thanks to James Valleroy for providing the code (Closes: #798219).
* Remove 28_listen_localhost, but listen on 127.0.0.1:8118 and
[::1]:8118 by default, since otherwise privoxy listens only on IPv6
(Closes: #518010, #557443).
* Change several URLs from http to https.
Checksums-Sha1:
32cb315370ca3ab39355c9d1ac45da066c8b117a 1852 privoxy_3.0.24-2.dsc
f65f54640a85d25a38560fa107b0322a35ae80a8 22768 privoxy_3.0.24-2.debian.tar.xz
7046997e51cbbd248136d2879e4375d8da5bb4e0 264884
privoxy-dbgsym_3.0.24-2_amd64.deb
d83b4f2ddb3b5d933c0e2375620d28c68a1e4ec6 507092 privoxy_3.0.24-2_amd64.deb
Checksums-Sha256:
037329ad1d2882192f3e25e79702b699296970b724d5d6713464c521d5dba267 1852
privoxy_3.0.24-2.dsc
7270e11ebef21b9ede555e9d259607e03794ec73e32e81c9349db0dd07d50367 22768
privoxy_3.0.24-2.debian.tar.xz
43ce1b81d858c2a1fb0d4eeb5e83c617a3ea112c3902cd65aa3d9622e5ccdd02 264884
privoxy-dbgsym_3.0.24-2_amd64.deb
918deac1ecd7c39bb25c7bb52de33e69b18169902d56af9a55c822ac1ef30a37 507092
privoxy_3.0.24-2_amd64.deb
Files:
a0c227822193cc6e3c7fe03954b67f2a 1852 web optional privoxy_3.0.24-2.dsc
e3d59132cde53e7029f60d679811b5f9 22768 web optional
privoxy_3.0.24-2.debian.tar.xz
d9f099b4aa54326702c1c20e64027d7b 264884 debug extra
privoxy-dbgsym_3.0.24-2_amd64.deb
6ca7ccb81cd5e4a762472ae0b5111a9f 507092 web optional privoxy_3.0.24-2_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJXJfvJAAoJEAJxO8/KVBCyKBsP/jrLoDrjxsOqvzK7q+3krpoj
iKdCDekbM3b2DbjkXYvaCEJawG8eyLXT4hgbwdGy/Df3nBy86ujFBfRXlz5qSzQG
Hg7kOsnSgfyLlcDkA6cX3GkuPCW0hqANmpdnDbGCLB7Ay4FhyVoUsQq9h9PqNiwK
lGNV98u9l2Yg7MCT3VaMyERpcxvwuo/yyOAQwyqVTsNtLUPKRW1ixtkkOWHWxGha
ywnWQCcRAOTb+LuZthg95hEzuTV8Z+rOgpEFXFN05q2yM7QwoqEsSheM1src0mkM
tsVKrYjI4B5JxtH2gSi/xniMHzCymiD3T+lgyvMDe12/SzLMx5ccrZlEIq4PqUo1
iBFH+Z0kZJrCV/U2WXPIdptDGO+CIXiPi1IqfJOnH3SCBdyOeQnzrXWDdkOhX6A4
wuD51KsNFI8T/JdUV8cJ8uFuCbmA79veIcJuzciLxyZCT5Su/6HmnFwY2dJsOuIA
vrVs1wsJ5VWugTRagNjg7Tywdju7gWUTpK+rS5xFCRrE8mBkGdAJaJtfEUT3fY6X
ioL/nsjFPJrrUglhErhhqrehpuIhD6cR3gO9XY/kqHqKLTh5ci1Gd/VCkfYdiqWI
glXnUsD1uHeQrm5NuAOB3R4m+j6sT0A8VY5pNqfmLJKX09iBgTlhawL/lvC4UyLD
C8X5VIn1kLyBPq68rkS3
=2b+n
-----END PGP SIGNATURE-----
--- End Message ---