current/debian config, NONE, 1.1 templates, NONE, 1.1 README.Debian, 1.8, 1.9 changelog, 1.31, 1.32 control, 1.17, 1.18 copyright, 1.6, 1.7 dirs, 1.2, 1.3 postinst, 1.10, 1.11 postrm, 1.4, 1.5 privoxy.service, 1.1, 1.2 rules, 1.22, 1.23
Roland Rosenfeld <[email protected]> Mon, 29 Aug 2016 12:04:11 +0000
| Newsgroups | gmane.comp.web.privoxy.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ijbswa/current/debian In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31992 Modified Files: README.Debian changelog control copyright dirs postinst postrm privoxy.service rules Added Files: config templates Log Message: Add all Debian changes since 3.0.24-2. --- NEW FILE: templates --- Template: privoxy/listen-address Type: string Default: 127.0.0.1:8118 [::1]:8118 _Description: Adresses on with Privoxy listens: Please enter a space separated list of address:port combinations on which Privoxy will listen for client requests. Index: dirs =================================================================== RCS file: /cvsroot/ijbswa/current/debian/dirs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dirs 20 Sep 2008 16:39:53 -0000 1.2 --- dirs 29 Aug 2016 12:04:09 -0000 1.3 *************** *** 3,6 **** --- 3,7 ---- usr/sbin usr/share/doc/privoxy + usr/share/privoxy var/log/privoxy usr/share/man/man1 Index: copyright =================================================================== RCS file: /cvsroot/ijbswa/current/debian/copyright,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** copyright 6 Feb 2016 12:29:53 -0000 1.6 --- copyright 29 Aug 2016 12:04:09 -0000 1.7 *************** *** 1,15 **** Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Privoxy ! Upstream-Contact: Privoxy team <[email protected]> ! Source: http://sourceforge.net/projects/ijbswa/files/Sources/ Files: * ! Copyright: Written by and Copyright (C) 2001-2014 the Privoxy team. ! http://www.privoxy.org/ ! License: GPL-2 Based on the Internet Junkbuster originally written by and Copyright (C) 1997 Anonymous Coders and Junkbusters Corporation. http://www.junkbusters.com . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General --- 1,67 ---- Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Privoxy ! Upstream-Contact: Privoxy Developers <[email protected]> ! Source: http://www.privoxy.org/sf-download-mirror/Sources/ Files: * ! Copyright: ! Copyright (C) 2001-2016 by the Privoxy team. http://www.privoxy.org/ ! Parts Copyright (C) 1999 Adam Lock <[email protected]> ! Parts Copyright (C) 2003 Ian Cummings <[email protected]> ! Parts Copyright (C) 2000, 2001 by Andreas S. Oesterhelt <[email protected]> ! Parts Copyright (C) 2006-2016 Fabian Keil <[email protected]> ! Comment: Based on the Internet Junkbuster originally written by and Copyright (C) 1997 Anonymous Coders and Junkbusters Corporation. http://www.junkbusters.com + License: GPL-2+ + + Files: regression-tests.action tools/uagen.pl tools/privoxy-regression-test.pl + tools/privoxy-log-parser.pl tools/url-pattern-translator.pl utils/changelog2doc.pl + utils/create-package-feed.pl + Copyright: + Copyright (c) 2006-2016 Fabian Keil <[email protected]> + 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 <[email protected]>, 1996. + License: GPL-2+ + + Files: debian/* + Copyright: + 2002-2016 Roland Rosenfeld <[email protected]> + License: GPL-2+ + + Files: pcre/* + Copyright: Copyright (c) 1997-2000 University of Cambridge + Comment: + Written by: Philip Hazel <[email protected]> + . + University of Cambridge Computing Service, + Cambridge, England. Phone: +44 1223 334714. + License: BSD-like + Permission is granted to anyone to use this software for any purpose on any + computer system, and to redistribute it freely, subject to the following + restrictions: + . + 1. This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + . + 2. The origin of this software must not be misrepresented, either by + explicit claim or by omission. + . + 3. Altered versions must be plainly marked as such, and must not be + misrepresented as being the original software. . + 4. If PCRE is embedded in any software that is released under the GNU + General Purpose Licence (GPL), then the terms of that licence shall + supersede any condition above with which it is incompatible. + + License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General *************** *** 33,34 **** --- 85,99 ---- License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. + + License: ISC + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. Index: changelog =================================================================== RCS file: /cvsroot/ijbswa/current/debian/changelog,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** changelog 6 Feb 2016 12:29:53 -0000 1.31 --- changelog 29 Aug 2016 12:04:09 -0000 1.32 *************** *** 1,7 **** privoxy (3.0.24-2) unstable; urgency=medium ! * Upgrade Standards-Version to 3.9.7 (no changes). ! -- Roland Rosenfeld <[email protected]> Thu, 04 Feb 2016 19:35:59 +0100 privoxy (3.0.24-1) unstable; urgency=medium --- 1,50 ---- + privoxy (3.0.26-1) unstable; urgency=medium + + * New upstream version 3.0.26. + * This includes 36_listen-nohost.patch. + * Updated all patches to new version. + + -- Roland Rosenfeld <[email protected]> Sat, 27 Aug 2016 22:28:32 +0200 + + privoxy (3.0.25-2) unstable; urgency=medium + + * Add pt_BR debconf translation. Thanks to Adriano Rafael Gomes + (Closes: #827327). + * Symlink p_doc.css to user-manual. + * Install regression-tests.action. + * Enable autopkgtest and run privoxy-regression-test.pl. + * Install privoxy-regression-test and man page to binary package. + * Updated debian/copyright to catch all copyright variants. + * Remove outdated stuff from README.Debian. + * 36_listen-nohost: Fix crashes with "listen-addr :8118" (Closes: #834941). + + -- Roland Rosenfeld <[email protected]> Tue, 23 Aug 2016 09:27:34 +0200 + + privoxy (3.0.25-1) unstable; urgency=medium + + * New upstream version 3.0.25 (beta). + * Adapt all patches to new upstream version. + * Update debian/copyright to new privoxy home. + * Add sv debconf translation. Thanks to Jonatan Nyberg (Closes: #824913). + * Add fr debconf translation. Thanks to Steve Petruzzello (Closes: #825478). + * Add nl debconf translation. Thanks to Frans Spiesschaert (Closes: #825691). + * privoxy.service: Run after network.target (Closes: #825358). + + -- Roland Rosenfeld <[email protected]> Sat, 28 May 2016 23:13:56 +0200 + 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. ! -- Roland Rosenfeld <[email protected]> Sun, 01 May 2016 14:21:22 +0200 privoxy (3.0.24-1) unstable; urgency=medium *************** *** 91,95 **** * 34_CVE-2015-1030: Fix memory leak in rfc2553_connect_to(). CID 66382 ! * 35_CVE-2015-1031-CID66394: unmap(): Prevent use-after-free if the map only consists of one item. CID 66394. * 36_CVE-2015-1031-CID66376: pcrs_execute(): Consistently set *result to --- 134,138 ---- * 34_CVE-2015-1030: Fix memory leak in rfc2553_connect_to(). CID 66382 ! * 35_CVE-2015-1031-CID66394: unmap(): Prevent use-after-free if the map only consists of one item. CID 66394. * 36_CVE-2015-1031-CID66376: pcrs_execute(): Consistently set *result to *************** *** 97,101 **** likely. CID 66391, CID 66376. * These 3 patches Closes: #775167. ! -- Roland Rosenfeld <[email protected]> Mon, 12 Jan 2015 08:44:23 +0100 --- 140,144 ---- likely. CID 66391, CID 66376. * These 3 patches Closes: #775167. ! -- Roland Rosenfeld <[email protected]> Mon, 12 Jan 2015 08:44:23 +0100 *************** *** 144,147 **** --- 187,199 ---- -- Roland Rosenfeld <[email protected]> Thu, 24 Jan 2013 17:40:51 +0100 + privoxy (3.0.19-2+deb7u4) oldstable; urgency=high + + * 42_CVE-2013-2503: Proxy authentication headers are removed unless the + new directive enable-proxy-authentication-forwarding is used. + Forwarding the headers potentionally allows malicious sites to trick + the user into providing it with login information (Closes: #702896). + + -- Roland Rosenfeld <[email protected]> Tue, 08 Mar 2016 08:52:26 +0100 + privoxy (3.0.19-2+deb7u3) wheezy-security; urgency=high *************** *** 164,168 **** privoxy (3.0.19-2+deb7u1) stable-security; urgency=medium ! * 35_CVE-2015-1031-CID66394: unmap(): Prevent use-after-free if the map only consists of one item. CID 66394. * 36_CVE-2015-1031-CID66376: pcrs_execute(): Consistently set *result to --- 216,220 ---- privoxy (3.0.19-2+deb7u1) stable-security; urgency=medium ! * 35_CVE-2015-1031-CID66394: unmap(): Prevent use-after-free if the map only consists of one item. CID 66394. * 36_CVE-2015-1031-CID66376: pcrs_execute(): Consistently set *result to *************** *** 218,228 **** privoxy (3.0.16-1+deb6u2) squeeze-lts; urgency=high ! * Non-maintainer upload by the Squeeze LTS Team. * CVE-2016-1982 Prevent invalid reads in case of corrupt chunk-encoded content * CVE-2016-1983 ! Remove empty Host headers in client requests; resulting in invalid reads. ! -- Thorsten Alteholz <[email protected]> Fri, 22 Jan 2016 18:03:02 +0100 --- 270,280 ---- privoxy (3.0.16-1+deb6u2) squeeze-lts; urgency=high ! * Non-maintainer upload by the Squeeze LTS Team. * CVE-2016-1982 Prevent invalid reads in case of corrupt chunk-encoded content * CVE-2016-1983 ! Remove empty Host headers in client requests; resulting in invalid reads. ! -- Thorsten Alteholz <[email protected]> Fri, 22 Jan 2016 18:03:02 +0100 *************** *** 268,272 **** * 30_localhost_fixup: Remove workaround for "localhost" listen-address, ! which should solve all problems with privoxy not starting. (Closes: #534735). --- 320,324 ---- * 30_localhost_fixup: Remove workaround for "localhost" listen-address, ! which should solve all problems with privoxy not starting. (Closes: #534735). *************** *** 332,336 **** (Closes: #375174) * Modify init.d script to be more lsb compliant. ! Depends on lsb-base (>= 3.2-13) * Allow disabling privoxy via RUN_DAEMON=no in /etc/default/privoxy. (Closes: #482563). --- 384,388 ---- (Closes: #375174) * Modify init.d script to be more lsb compliant. ! Depends on lsb-base (>= 3.2-13) * Allow disabling privoxy via RUN_DAEMON=no in /etc/default/privoxy. (Closes: #482563). *************** *** 343,347 **** * IPv6 patch added again: 03_ipv6: privoxy-3.0.10-ipv6-all-6.diff by Petr Písař (Closes: #179461). ! It seems that the old bugs #391600 and #393605, which appeared with the previous version, are fixed now. * 28_listen_localhost: Listen on localhost:8118 instead of 127.0.0.1:8118, --- 395,399 ---- * IPv6 patch added again: 03_ipv6: privoxy-3.0.10-ipv6-all-6.diff by Petr Písař (Closes: #179461). ! It seems that the old bugs #391600 and #393605, which appeared with the previous version, are fixed now. * 28_listen_localhost: Listen on localhost:8118 instead of 127.0.0.1:8118, *************** *** 458,467 **** * Disable the IPv6 patch, because this is seems to have too many bugs ! for a release right now. - This reopens #179461. - This solves the problem, that "listen-address :8118" listens on localhost only (Closes: #391600). - This solves the problem, that regex pattern at front of hostname ! is ignored (Closes: #393605). * Use /usr/share/dpatch/dpatch.make in debian/rules instead of adding the content by hand. --- 510,519 ---- * Disable the IPv6 patch, because this is seems to have too many bugs ! for a release right now. - This reopens #179461. - This solves the problem, that "listen-address :8118" listens on localhost only (Closes: #391600). - This solves the problem, that regex pattern at front of hostname ! is ignored (Closes: #393605). * Use /usr/share/dpatch/dpatch.make in debian/rules instead of adding the content by hand. *************** *** 483,488 **** * New upstream version 3.0.5-beta. ! * hide-referrer{foo} now allows everything as a forged referrer not ! only http/https URLs and ignoring invalid URLs (Closes: #258193). * Fixes the name of the filter from "popups" to "all-popups" in user.action. (Closes: #385886). --- 535,540 ---- * New upstream version 3.0.5-beta. ! * hide-referrer{foo} now allows everything as a forged referrer not ! only http/https URLs and ignoring invalid URLs (Closes: #258193). * Fixes the name of the filter from "popups" to "all-popups" in user.action. (Closes: #385886). *************** *** 587,591 **** privoxy (3.0.3-4) unstable; urgency=low ! * Stop converting entities to 8bit chars in the documentation (Closes: #203697). * Fix typos ('persistant' and 'Januar') in man page and man page sources --- 639,643 ---- privoxy (3.0.3-4) unstable; urgency=low ! * Stop converting entities to 8bit chars in the documentation (Closes: #203697). * Fix typos ('persistant' and 'Januar') in man page and man page sources *************** *** 603,607 **** * Now really remove multiproxy.org from all documentation, not only from ! the config file (Closes: #198953). -- Roland Rosenfeld <[email protected]> Sun, 15 Feb 2004 23:11:29 +0100 --- 655,659 ---- * Now really remove multiproxy.org from all documentation, not only from ! the config file (Closes: #198953). -- Roland Rosenfeld <[email protected]> Sun, 15 Feb 2004 23:11:29 +0100 *************** *** 630,634 **** the "blank page" problem (Closes: #215231). - Avoid the conversion of "open" in scripts to "PrivoxyWindowOpen" ! (Closes: #197995). - "advocancy" is no longer blocked (Closes: #202042). - Fixed yet another two memory leaks (Closes: #215911). --- 682,686 ---- the "blank page" problem (Closes: #215231). - Avoid the conversion of "open" in scripts to "PrivoxyWindowOpen" ! (Closes: #197995). - "advocancy" is no longer blocked (Closes: #202042). - Fixed yet another two memory leaks (Closes: #215911). *************** *** 636,640 **** upstream package. * Create doc/pdf, which is missing upstream. ! * disable filter{unsolicited-popups} for www.perl.com/language/newdocs/pod/ to avoid problems with "PrivoxyWindowOpen" in Perl manuals (Closes: #195311). --- 688,692 ---- upstream package. * Create doc/pdf, which is missing upstream. ! * disable filter{unsolicited-popups} for www.perl.com/language/newdocs/pod/ to avoid problems with "PrivoxyWindowOpen" in Perl manuals (Closes: #195311). *************** *** 712,716 **** * Stop build-depending on special versions of libc6-dev and gcc. Hopefully all auto-builders run new versions which shouldn't cause ! trouble (Closes: #182267) -- Roland Rosenfeld <[email protected]> Mon, 24 Feb 2003 19:07:11 +0100 --- 764,768 ---- * Stop build-depending on special versions of libc6-dev and gcc. Hopefully all auto-builders run new versions which shouldn't cause ! trouble (Closes: #182267) -- Roland Rosenfeld <[email protected]> Mon, 24 Feb 2003 19:07:11 +0100 *************** *** 791,795 **** docbook, but use the converted versions which come with the upstream package. ! * default.action fixed upstream: "downloads" no longer blocked (Closes: #148290). * default.filter fixed upstream: Made WeBugs job ungreedy (Closes: #149450). --- 843,847 ---- docbook, but use the converted versions which come with the upstream package. ! * default.action fixed upstream: "downloads" no longer blocked (Closes: #148290). * default.filter fixed upstream: Made WeBugs job ungreedy (Closes: #149450). Index: rules =================================================================== RCS file: /cvsroot/ijbswa/current/debian/rules,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** rules 6 Feb 2016 12:29:53 -0000 1.22 --- rules 29 Aug 2016 12:04:09 -0000 1.23 *************** *** 1,5 **** #!/usr/bin/make -f # ! # (c) 2002-2015 Roland Rosenfeld <[email protected]> # # Uncomment this to turn on verbose mode. --- 1,5 ---- #!/usr/bin/make -f # ! # (c) 2002-2016 Roland Rosenfeld <[email protected]> # # Uncomment this to turn on verbose mode. *************** *** 52,59 **** 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 install -m 0644 default.filter $(DEBDIR)/etc/privoxy/default.filter install -m 0644 user.filter $(DEBDIR)/etc/privoxy/user.filter --- 52,63 ---- override_dh_auto_install: install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy ! sed -e 's/\(Sample Configuration File for Privoxy\).*/\1/;' \ ! -e 's/\$$Id: config,v.*/Id: config,v/' < config \ ! > $(DEBDIR)/usr/share/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 + install -m 0644 regression-tests.action \ + $(DEBDIR)/etc/privoxy/regression-tests.action install -m 0644 default.filter $(DEBDIR)/etc/privoxy/default.filter install -m 0644 user.filter $(DEBDIR)/etc/privoxy/user.filter *************** *** 65,68 **** --- 69,77 ---- > $(DEBDIR)/usr/share/man/man1/privoxy-log-parser.1 + install -m 0755 tools/privoxy-regression-test.pl \ + $(DEBDIR)/usr/bin/privoxy-regression-test + pod2man tools/privoxy-regression-test.pl \ + > $(DEBDIR)/usr/share/man/man1/privoxy-regression-test.1 + cp -r templates $(DEBDIR)/etc/privoxy/ rm -f $(DEBDIR)/etc/privoxy/templates/*~ *************** *** 84,87 **** --- 93,97 ---- (cd $(DEBDIR)/usr/share/doc/privoxy/; \ mv privoxy-index.html index.html) + (cd $(DEBDIR)/usr/share/doc/privoxy/user-manual; ln -s '../p_doc.css') override_dh_perl: Index: control =================================================================== RCS file: /cvsroot/ijbswa/current/debian/control,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** control 6 Feb 2016 12:29:53 -0000 1.17 --- control 29 Aug 2016 12:04:09 -0000 1.18 *************** *** 14,29 **** libpcre3-dev, man2html, sgmlspl, sp, w3m, zlib1g-dev ! Standards-Version: 3.9.7 ! Homepage: http://www.privoxy.org/ Package: privoxy Architecture: any Depends: adduser, logrotate, lsb-base (>= 3.2-13), ${misc:Depends}, ${perl:Depends}, --- 14,33 ---- libpcre3-dev, man2html, + po-debconf, sgmlspl, sp, w3m, zlib1g-dev ! Standards-Version: 3.9.8 ! Homepage: https://www.privoxy.org/ ! Testsuite: autopkgtest Package: privoxy Architecture: any Depends: adduser, + debconf, logrotate, lsb-base (>= 3.2-13), + ucf, ${misc:Depends}, ${perl:Depends}, Index: postrm =================================================================== RCS file: /cvsroot/ijbswa/current/debian/postrm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** postrm 7 Jun 2007 10:41:02 -0000 1.4 --- postrm 29 Aug 2016 12:04:09 -0000 1.5 *************** *** 22,26 **** --- 22,36 ---- 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 ;; Index: privoxy.service =================================================================== RCS file: /cvsroot/ijbswa/current/debian/privoxy.service,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** privoxy.service 6 Feb 2016 12:29:53 -0000 1.1 --- privoxy.service 29 Aug 2016 12:04:09 -0000 1.2 *************** *** 1,4 **** --- 1,6 ---- [Unit] Description=Privacy enhancing HTTP Proxy + Documentation=man:privoxy(8) https://www.privoxy.org/user-manual/ + After=network.target [Service] Index: README.Debian =================================================================== RCS file: /cvsroot/ijbswa/current/debian/README.Debian,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** README.Debian 27 Dec 2011 14:55:07 -0000 1.8 --- README.Debian 29 Aug 2016 12:04:09 -0000 1.9 *************** *** 2,21 **** ================== - - enable-edit-actions, enable-remote-toggle, and - enable-remote-http-toggle are disabled in the Debian package for - security reasons, because these options allow every user of your - privoxy to change its configuration. Except this there exist - exploits using Java and/or JavaScript that tell your browser to send - out requests for disabling the proxy or the filtering, which may - compromise your anonymity. If you still want to use these features, - you can enable them in /etc/privoxy/config and do a - "/etc/init.d/privoxy restart". - - - Experimental IPv6 support was added to the package. - - - The global default for all URLs (/) is now set in match-all.action - in contrast to versions up to 3.0.10, where a Debian only patch - configured them in global.action. - - Since 3.0.5 the upstream package uses the Cautious default settings instead of Medium (like 3.0.3 did). To avoid problems on upgrades --- 2,5 ---- *************** *** 45,47 **** Roland Rosenfeld <[email protected]> - $Id$ --- 29,30 ---- --- NEW FILE: config --- #!/bin/sh set -e . /usr/share/debconf/confmodule CONFIG=/etc/privoxy/config # Get current configuration. if [ -e $CONFIG ]; then LISTENADDRESS=$(perl -le ' my @listens; while (<STDIN>) { chomp; if ($_ =~ m/^\s*listen-address\s+(\S+)/) { push @listens, $1; } } print "@listens\n";' \ < $CONFIG) db_set privoxy/listen-address "$LISTENADDRESS" fi db_input medium privoxy/listen-address || true db_go || true Index: postinst =================================================================== RCS file: /cvsroot/ijbswa/current/debian/postinst,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** postinst 27 Dec 2011 14:55:07 -0000 1.10 --- postinst 29 Aug 2016 12:04:09 -0000 1.11 *************** *** 26,29 **** --- 26,32 ---- CONFDIR=/etc/privoxy CONFIG=$CONFDIR/config + EXAMPLE_CONFIG=/usr/share/privoxy/config + + . /usr/share/debconf/confmodule case "$1" in *************** *** 37,40 **** --- 40,65 ---- && chown privoxy $CONFDIR/match-all.action + db_get privoxy/listen-address || true + perl -le ' + $done = 0; + while (<STDIN>) { + chomp; + if ($_ =~ m/^\s*listen-address\s+.*/) { + if (!$done) { + foreach (@ARGV) { + print "listen-address $_"; + } + } + $done = 1; + } else { + print; + } + }' \ + $RET \ + < $EXAMPLE_CONFIG > $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 ------------------------------------------------------------------------------ _______________________________________________ ijbswa-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ijbswa-commits