From b1f25d63e134f8efce6f4d3851940468ace1f2df Mon Sep 17 00:00:00 2001 From: Roland Rosenfeld Date: Sat, 6 Feb 2016 12:29:54 +0000 Subject: [PATCH] Add all Debian changes from 3.0.19-2 to 3.0.24-1 --- debian/README.source | 31 --- debian/changelog | 215 +++++++++++++++++- debian/compat | 2 +- debian/control | 28 ++- debian/copyright | 81 +++---- debian/init.d | 30 +-- debian/logrotate | 6 +- debian/patches/00list | 12 - ...t_action.dpatch => 05_defaut_action.patch} | 19 +- ...bit_manual.dpatch => 06_8bit_manual.patch} | 14 +- debian/patches/10_backup_doc.dpatch | 27 --- debian/patches/11_backup_autotools.dpatch | 25 -- debian/patches/14_config.dpatch | 46 ---- debian/patches/14_config.patch | 41 ++++ debian/patches/15_mansection8.dpatch | 31 --- debian/patches/15_mansection8.patch | 25 ++ debian/patches/17_502_no_such_domain.dpatch | 30 --- debian/patches/17_502_no_such_domain.patch | 25 ++ debian/patches/25_standard_medium.dpatch | 29 --- debian/patches/25_standard_medium.patch | 24 ++ debian/patches/27_remove_nsl.dpatch | 19 -- debian/patches/27_remove_nsl.patch | 14 ++ debian/patches/28_listen_localhost.dpatch | 21 -- debian/patches/28_listen_localhost.patch | 17 ++ debian/patches/29_typos.dpatch | 31 --- ..._bind_fixup.dpatch => 32_bind_fixup.patch} | 16 +- debian/patches/33_manpage_hyphen.patch | 15 ++ debian/patches/34_system-docbook2man.patch | 15 ++ debian/patches/series | 11 + debian/privoxy.service | 15 ++ debian/rules | 117 +++------- debian/source/format | 2 +- debian/upstream/signing-key.asc | 41 ++++ debian/watch | 2 +- 34 files changed, 585 insertions(+), 492 deletions(-) delete mode 100644 debian/README.source delete mode 100644 debian/patches/00list rename debian/patches/{05_defaut_action.dpatch => 05_defaut_action.patch} (60%) rename debian/patches/{06_8bit_manual.dpatch => 06_8bit_manual.patch} (67%) delete mode 100644 debian/patches/10_backup_doc.dpatch delete mode 100644 debian/patches/11_backup_autotools.dpatch delete mode 100644 debian/patches/14_config.dpatch create mode 100644 debian/patches/14_config.patch delete mode 100644 debian/patches/15_mansection8.dpatch create mode 100644 debian/patches/15_mansection8.patch delete mode 100755 debian/patches/17_502_no_such_domain.dpatch create mode 100644 debian/patches/17_502_no_such_domain.patch delete mode 100755 debian/patches/25_standard_medium.dpatch create mode 100644 debian/patches/25_standard_medium.patch delete mode 100755 debian/patches/27_remove_nsl.dpatch create mode 100644 debian/patches/27_remove_nsl.patch delete mode 100755 debian/patches/28_listen_localhost.dpatch create mode 100644 debian/patches/28_listen_localhost.patch delete mode 100755 debian/patches/29_typos.dpatch rename debian/patches/{32_bind_fixup.dpatch => 32_bind_fixup.patch} (59%) mode change 100755 => 100644 create mode 100644 debian/patches/33_manpage_hyphen.patch create mode 100644 debian/patches/34_system-docbook2man.patch create mode 100644 debian/patches/series create mode 100644 debian/privoxy.service create mode 100644 debian/upstream/signing-key.asc diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 264b9b9a..00000000 --- a/debian/README.source +++ /dev/null @@ -1,31 +0,0 @@ -This package uses dpatch to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -To get the fully patched source after unpacking the source package, cd -to the root level of the source package and run: - - debian/rules patch - -Removing a patch is as simple as removing its entry from the -debian/patches/00list file, and please also remove the patch file -itself. - -Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" -where you should replace XX with a new number and patchname with a -descriptive shortname of the patch. You can then simply edit all the -files your patch wants to edit, and then simply "exit 0" from the shell -to actually create the patch file. - -To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" -and replace XX_patchname with the actual filename from debian/patches -you want to use. - -To clean up afterwards again, "debian/rules unpatch" will do the -work for you - or you can of course choose to call -"fakeroot debian/rules clean" all together. - ---- - -original text by Gerfried Fuchs, edited by Junichi Uekawa -10 Aug 2008. diff --git a/debian/changelog b/debian/changelog index 97e171cd..f5cfe613 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,190 @@ +privoxy (3.0.24-2) unstable; urgency=medium + + * Upgrade Standards-Version to 3.9.7 (no changes). + + -- Roland Rosenfeld Thu, 04 Feb 2016 19:35:59 +0100 + +privoxy (3.0.24-1) unstable; urgency=medium + + * New upstream version 3.0.24. + * This fixes CVE-2016-1982 and CVE-2016-1983. + * Adapt all patches to new upstream version. + + -- Roland Rosenfeld Fri, 22 Jan 2016 16:08:05 +0100 + +privoxy (3.0.23-5) unstable; urgency=medium + + * Remove /lib/init/vars.sh from init script since it is no longer used. + As a consequence remove initscripts dependency (Closes: #804961). + * --enable-external-filters (Closes: #805296). + + -- Roland Rosenfeld Mon, 16 Nov 2015 21:05:41 +0100 + +privoxy (3.0.23-4) unstable; urgency=medium + + * Add rotate option to init.d script. + * Change logrotate to use rotate option (Closes: #783399). + * privoxy.service: define SuccessExitStatus=15. + * Set locales to C.UTF-8 for doc generation to make build reproducible. + * Run wrap-and-sort. + * 34_system-docbook2man: Use Debian docbook2man-spec.pl (from + docbook-utils) instead of local copy, to make package reproducible. + * Stop runing "make man2html", since this overrides "make man", which + should work reproducible. + + -- Roland Rosenfeld Sat, 19 Sep 2015 15:05:41 +0200 + +privoxy (3.0.23-3) unstable; urgency=medium + + * Since there are no new bugs found, this goes to unstable now. + * Depend on perl-base instead of full perl. + + -- Roland Rosenfeld Sun, 26 Apr 2015 11:01:08 +0200 + +privoxy (3.0.23-2) experimental; urgency=low + + * Fix cleanup to allow build twice in a row. + * Preserve auto build configuration from source package. + * This version checks and fails if the config file has erros + (Closes: #518006). + * init script is no longer silent (Closes: #543811). + + -- Roland Rosenfeld Sat, 31 Jan 2015 12:31:26 +0100 + +privoxy (3.0.23-1) experimental; urgency=low + + * New upstream version 3.0.23-stable. + * Update all patches. + + -- Roland Rosenfeld Mon, 26 Jan 2015 14:15:47 +0100 + +privoxy (3.0.22-1) unstable; urgency=low + + * New upstream version 3.0.22-stable. + * Update all patches. + * Upgrade to Standards-Version 3.9.5 (no changes). + * Add upstream GPG signature check. + * Convert debian/copyright to DEP5. + + -- Roland Rosenfeld Sun, 16 Nov 2014 18:38:40 +0100 + +privoxy (3.0.21-7+deb8u1) jessie-security; urgency=high + + * 40_CVE-2016-1982: Prevent invalid reads in case of corrupt + chunk-encoded content. + * 41_CVE-2016-1983: Remove empty Host headers in client requests. + Previously they would result in invalid reads. + + -- Roland Rosenfeld Fri, 22 Jan 2016 17:09:48 +0100 + +privoxy (3.0.21-7) unstable; urgency=medium + + * 37_CVE-2015-1380: denial of service. + * 38_CVE-2015-1381: multiple segmentation faults and memory leaks in the + pcrs code. + * 39_CVE-2015-1382: invalid read. + * These 3 patches Closes: #776490. + + -- Roland Rosenfeld Wed, 28 Jan 2015 19:46:42 +0100 + +privoxy (3.0.21-5) unstable; urgency=low + + * 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 + NULL in case of errors. Should make use-after-free in the caller less + likely. CID 66391, CID 66376. + * These 3 patches Closes: #775167. + + -- Roland Rosenfeld Mon, 12 Jan 2015 08:44:23 +0100 + +privoxy (3.0.21-4) unstable; urgency=low + + * Enable hardening=+all + * Hardcode PIDFile in privoxy.service, since this isn't allowed as + variable (Closes: #746262). + + -- Roland Rosenfeld Sat, 10 May 2014 14:19:03 +0200 + +privoxy (3.0.21-3) unstable; urgency=low + + * When starting via systemd, do not run daemon as root, and honour log + file configuration. Thanks to Carlos Maddela for providing a patch + (Closes: #745274) + + -- Roland Rosenfeld Mon, 21 Apr 2014 17:24:01 +0200 + +privoxy (3.0.21-2) unstable; urgency=low + + * Use autotools-dev for arm64 compatibility (Closes: #727948). + * Depend on initscripts >= 2.87dsf-8, (Closes: #564563). + * Add systemd support (Thanks to Michael Stapelberg) (Closes: #639635). + * Upgrade to Standards-Version 3.9.5 (no changes). + + -- Roland Rosenfeld Sat, 12 Apr 2014 12:54:58 +0200 + +privoxy (3.0.21-1) unstable; urgency=low + + * New upstream version 3.0.21-stable. + * This fixes CVE-2013-2503 (Closes: #702896). + * Update all patches. + * Upgrade to Standards-Version 3.9.4 (no changes). + + -- Roland Rosenfeld Fri, 05 Jul 2013 14:46:54 +0200 + +privoxy (3.0.20-1) unstable; urgency=low + + * New upstream version 3.0.20-beta. + * Update all patches. + * Remove 29_typos, which is incorporated upstream now. + * 33_manpage_hyphen: Replace all -- in man page by \-\- to make lintian + happy. + + -- Roland Rosenfeld Thu, 24 Jan 2013 17:40:51 +0100 + +privoxy (3.0.19-2+deb7u3) wheezy-security; urgency=high + + * 40_CVE-2016-1982: Prevent invalid reads in case of corrupt + chunk-encoded content. + * 41_CVE-2016-1983: Remove empty Host headers in client requests. + Previously they would result in invalid reads. + + -- Roland Rosenfeld Fri, 22 Jan 2016 17:51:41 +0100 + +privoxy (3.0.19-2+deb7u2) wheezy-security; urgency=medium + + * 38_CVE-2015-1381: multiple segmentation faults and memory leaks in the + pcrs code. + * 39_CVE-2015-1382: invalid read. + * These 2 patches Closes: #776490 in wheezy. + + -- Roland Rosenfeld Wed, 28 Jan 2015 20:33:47 +0100 + +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 + NULL in case of errors. Should make use-after-free in the caller less + likely. CID 66391, CID 66376. + * These 2 patches Closes: #775167. + + -- Roland Rosenfeld Sat, 17 Jan 2015 17:20:15 +0100 + +privoxy (3.0.19-2) unstable; urgency=low + + * Migrate from dpatch to 3.0 (quilt) format. + * Reformat all patches. + * Change build depenency from dpatch to debhelper (>= 9). + * Change debian/compat to "9". + * Complete rewrite of debian/rules. + * Now uses hardening via debhelper. + * Remove README.source. + * Update to Standards-Version 3.9.3 (no changes). + + -- Roland Rosenfeld Fri, 18 May 2012 21:24:55 +0200 + privoxy (3.0.19-1) unstable; urgency=low * New upstream version 3.0.19-stable. @@ -28,6 +215,33 @@ privoxy (3.0.17-1) unstable; urgency=low -- Roland Rosenfeld Tue, 01 Mar 2011 21:10:26 +0100 +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 Fri, 22 Jan 2016 18:03:02 +0100 + +privoxy (3.0.16-1+deb6u1) squeeze-lts; urgency=medium + + * Non-maintainer upload by the Squeeze LTS team. + * Thanks to Roland Rosenfeld for maintaining privoxy and preparing these + patches: + - 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 + NULL in case of errors. Should make use-after-free in the caller less + likely. CID 66391, CID 66376. + - 38_CVE-2015-1381: multiple segmentation faults and memory leaks in the + pcrs code. + - 39_CVE-2015-1382: invalid read. + + -- Holger Levsen Wed, 28 Jan 2015 19:44:30 +0100 + privoxy (3.0.16-1) unstable; urgency=low * New upstream version 3.0.16-stable. @@ -627,4 +841,3 @@ privoxy (2.9.13-beta-1) unstable; urgency=low * Initial Release. -- Roland Rosenfeld Fri, 29 Mar 2002 11:52:03 +0100 - diff --git a/debian/compat b/debian/compat index 7ed6ff82..ec635144 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index b40b4f00..7aad0ca8 100644 --- a/debian/control +++ b/debian/control @@ -2,16 +2,32 @@ Source: privoxy Section: web Priority: optional Maintainer: Roland Rosenfeld -Build-Depends: debhelper (>= 5.0.0), autoconf, autotools-dev, libpcre3-dev, - jade, docbook-dsssl, docbook, w3m, sp, sgmlspl, groff, man2html, dpatch, - zlib1g-dev -Standards-Version: 3.9.2 +Build-Depends: autoconf, + autotools-dev, + debhelper (>= 9), + dh-systemd (>= 1.4), + docbook, + docbook-dsssl, + docbook-utils, + groff, + jade, + libpcre3-dev, + man2html, + sgmlspl, + sp, + w3m, + zlib1g-dev +Standards-Version: 3.9.7 Homepage: http://www.privoxy.org/ Package: privoxy Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, logrotate, - adduser, lsb-base (>= 3.2-13) +Depends: adduser, + logrotate, + lsb-base (>= 3.2-13), + ${misc:Depends}, + ${perl:Depends}, + ${shlibs:Depends} Recommends: doc-base Description: Privacy enhancing HTTP Proxy Privoxy is a web proxy with advanced filtering capabilities for diff --git a/debian/copyright b/debian/copyright index 74d4e07f..c4d99ac5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,47 +1,34 @@ -This package was debianized by Roland Rosenfeld on -Fri, 29 Mar 2002 11:52:03 +0100. - -It was downloaded from http://www.privoxy.org/ and -http://sourceforge.net/project/showfiles.php?group_id=11118 - -Upstream Authors: ijbswa-developers@lists.sourceforge.net - -Current Development Team: - - Hal Burgiss (docs) - Jon Foster - Andreas Oesterhelt - David Schmidt (OS/2, Mac OSX ports) - -Originally developed by: - - Junkbusters Corp. - Anonymous Coders - -Copyright: Written by and Copyright (C) 2001-2010 the - Privoxy team. http://www.privoxy.org/ - - 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 - Public License as published by the Free Software - Foundation; either version 2 of the License, or (at - your option) any later version. - - This program 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. 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. - -The complete GNU General Public License can be found at -/usr/share/common-licenses/GPL-2 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Privoxy +Upstream-Contact: Privoxy team +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 + Public License as published by the Free Software + Foundation; either version 2 of the License, or (at + your option) any later version. + . + This program 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. 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. + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. diff --git a/debian/init.d b/debian/init.d index baec7495..0660d92c 100644 --- a/debian/init.d +++ b/debian/init.d @@ -42,9 +42,6 @@ if [ ! -d "$LOGDIR" ]; then chown $OWNER:adm $LOGDIR fi -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - # Define LSB log_* functions. # Depend on lsb-base (>= 3.0-6) to ensure that this file is present. . /lib/lsb/init-functions @@ -97,13 +94,13 @@ do_stop() # # Function that sends a SIGHUP to the daemon/service # -do_reload() { +do_rotate() { # # If the daemon can reload its configuration without # restarting (for example, when it is sent a SIGHUP), # then implement that here. # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE --name $NAME return 0 } @@ -111,23 +108,23 @@ do_reload() { case "$1" in start) if [ "$RUN_DAEMON" = "no" ]; then - [ "$VERBOSE" != no ] && log_warning_msg "Not starting $DESC (disabled in $DEFAULTSFILE)." + log_warning_msg "Not starting $DESC (disabled in $DEFAULTSFILE)." exit 0 fi - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + log_daemon_msg "Starting $DESC" "$NAME" do_start case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + 0|1) log_end_msg 0 ;; + 2) log_end_msg 1 ;; esac ;; stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + log_daemon_msg "Stopping $DESC" "$NAME" do_stop case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + 0|1) log_end_msg 0 ;; + 2) log_end_msg 1 ;; esac ;; #reload|force-reload) @@ -139,13 +136,18 @@ case "$1" in #do_reload #log_end_msg $? #;; + rotate) + log_daemon_msg "Closing open files" "$NAME" + do_rotate + log_end_msg $? + ;; restart|force-reload) # # If the "reload" option is implemented then remove the # 'force-reload' alias # if [ "$RUN_DAEMON" = "no" ]; then - [ "$VERBOSE" != no ] && log_warning_msg "Not restarting $DESC (disabled in $DEFAULTSFILE)." + log_warning_msg "Not restarting $DESC (disabled in $DEFAULTSFILE)." exit 0 fi @@ -173,7 +175,7 @@ case "$1" in *) #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|rotate|restart|force-reload|status}" >&2 exit 3 ;; esac diff --git a/debian/logrotate b/debian/logrotate index a110e932..deddd262 100644 --- a/debian/logrotate +++ b/debian/logrotate @@ -6,11 +6,11 @@ compress sharedscripts postrotate - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d privoxy restart > /dev/null + if which invoke-rc.d >/dev/null 2>&1; then + invoke-rc.d privoxy rotate > /dev/null else if [ -f /var/run/privoxy.pid ]; then - /etc/init.d/privoxy restart > /dev/null + /etc/init.d/privoxy rotate > /dev/null fi fi endscript diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index f2092884..00000000 --- a/debian/patches/00list +++ /dev/null @@ -1,12 +0,0 @@ -05_defaut_action.dpatch -06_8bit_manual.dpatch -10_backup_doc.dpatch -11_backup_autotools.dpatch -14_config.dpatch -15_mansection8.dpatch -17_502_no_such_domain.dpatch -25_standard_medium.dpatch -27_remove_nsl.dpatch -28_listen_localhost.dpatch -29_typos.dpatch -32_bind_fixup.dpatch diff --git a/debian/patches/05_defaut_action.dpatch b/debian/patches/05_defaut_action.patch similarity index 60% rename from debian/patches/05_defaut_action.dpatch rename to debian/patches/05_defaut_action.patch index 87e731b7..8cda9ade 100644 --- a/debian/patches/05_defaut_action.dpatch +++ b/debian/patches/05_defaut_action.patch @@ -1,14 +1,9 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 05_default_action.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Serveral changes/additons to default.action. +Author: Roland Rosenfeld +Description: Serveral changes/additons to default.action. -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/default.action.master privoxy/default.action.master ---- privoxy~/default.action.master -+++ privoxy/default.action.master -@@ -2259,6 +2259,9 @@ +--- a/default.action.master ++++ b/default.action.master +@@ -2413,6 +2413,9 @@ schneegans.de/sv/\?url=referer #MASTER# REMARKS: Exclude per Debian bug report #377843 # URL = http://blogs.msdn.com/wga/archive/2006/07/16/667063.aspx blogs.msdn.com @@ -18,12 +13,12 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/default.action.master priv {-filter{unsolicited-popups}} # Sticky Actions = -filter{unsolicited-popups} -@@ -2312,6 +2315,11 @@ +@@ -2471,6 +2474,11 @@ tr.anp.se/ {+filter{tiny-textforms}} .sourceforge.net/tracker +{-filter{ie-exploits}} -+#MASTER# REMARKS: Allow %01 and %02 in URLs as they are used in Amazon's ++#MASTER# REMARKS: Allow %01 and %02 in URLs as they are used in Amazon's +#MASTER# REMARKS: multi-page results see http://bugs.debian.org/243245 +.amazon.de + diff --git a/debian/patches/06_8bit_manual.dpatch b/debian/patches/06_8bit_manual.patch similarity index 67% rename from debian/patches/06_8bit_manual.dpatch rename to debian/patches/06_8bit_manual.patch index 9666b590..676bc780 100644 --- a/debian/patches/06_8bit_manual.dpatch +++ b/debian/patches/06_8bit_manual.patch @@ -1,13 +1,9 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 06_8bit_manual.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Stop converting 8bit chars in the documentation (#203697) +Author: Roland Rosenfeld +Description: Stop converting 8bit chars in the documentation (#203697) +Bug-Debian: http://bugs.debian.org/203697 -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/doc/source/ldp.dsl.in privoxy/doc/source/ldp.dsl.in ---- privoxy~/doc/source/ldp.dsl.in -+++ privoxy/doc/source/ldp.dsl.in +--- a/doc/source/ldp.dsl.in ++++ b/doc/source/ldp.dsl.in @@ -47,9 +47,9 @@ ;; this is necessary because right now jadetex does not understand diff --git a/debian/patches/10_backup_doc.dpatch b/debian/patches/10_backup_doc.dpatch deleted file mode 100644 index 050df8fe..00000000 --- a/debian/patches/10_backup_doc.dpatch +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh -e -## 10_backup_doc.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Backup the upstream versions of all generated documentation - -dpatch_patch () -{ - tar cf debian/patched/doc.bak.tar README - for i in doc/source doc/text doc/webserver \ - INSTALL AUTHORS privoxy.1 - do - if [ -e $i ] - then - tar rf debian/patched/doc.bak.tar $i - fi - done -} - -dpatch_unpatch () -{ - tar xf debian/patched/doc.bak.tar -} - -DPATCH_LIB_NO_DEFAULT=1 - -. /usr/share/dpatch/dpatch.lib.sh diff --git a/debian/patches/11_backup_autotools.dpatch b/debian/patches/11_backup_autotools.dpatch deleted file mode 100644 index b3aa917f..00000000 --- a/debian/patches/11_backup_autotools.dpatch +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh -e -## 11_backup_autotools.dpatch by Ralf Treinen -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: replace all config.{guess,sub} by the vesion installed in -## DP: /usr/share/misc - -dpatch_patch () -{ - find . -name config.guess -o -name config.sub \ - | tar cf debian/patched/config.guess+sub.tar -T - - find . -name config.guess \ - -exec ln -sf /usr/share/misc/config.guess '{}' \; - find . -name config.sub \ - -exec ln -sf /usr/share/misc/config.sub '{}' \; -} - -dpatch_unpatch () -{ - tar xf debian/patched/config.guess+sub.tar -} - -DPATCH_LIB_NO_DEFAULT=1 - -. /usr/share/dpatch/dpatch.lib.sh diff --git a/debian/patches/14_config.dpatch b/debian/patches/14_config.dpatch deleted file mode 100644 index 3785d4fe..00000000 --- a/debian/patches/14_config.dpatch +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 14_config.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Several Debian specific changes to config file - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/config privoxy/config ---- privoxy~/config -+++ privoxy/config -@@ -1,6 +1,6 @@ --# Sample Configuration File for Privoxy v3.0.19 -+# Sample Configuration File for Privoxy - # --# $Id: config,v 1.98 2011/12/26 17:04:50 fabiankeil Exp $ -+# Id: config,v - # - # Copyright (C) 2001-2011 Privoxy Developers http://www.privoxy.org/ - # -@@ -128,7 +128,7 @@ - # If set, this option should be the first option in the config - # file, because it is used while the config file is being read. - # --#user-manual http://www.privoxy.org/user-manual/ -+user-manual /usr/share/doc/privoxy/user-manual - # - # - # 1.2. trust-info-url -@@ -265,7 +265,7 @@ - # - # No trailing "/", please. - # --confdir . -+confdir /etc/privoxy - # - # - # 2.2. templdir -@@ -322,7 +322,7 @@ - # - # No trailing "/", please. - # --logdir . -+logdir /var/log/privoxy - # - # - # 2.4. actionsfile diff --git a/debian/patches/14_config.patch b/debian/patches/14_config.patch new file mode 100644 index 00000000..943f36dd --- /dev/null +++ b/debian/patches/14_config.patch @@ -0,0 +1,41 @@ +Author: Roland Rosenfeld +Description: Several Debian specific changes to config file + +--- a/config ++++ b/config +@@ -1,6 +1,6 @@ +-# Sample Configuration File for Privoxy 3.0.24 ++# Sample Configuration File for Privoxy + # +-# $Id: config,v 1.108 2016/01/17 14:33:03 fabiankeil Exp $ ++# Id: config,v + # + # Copyright (C) 2001-2014 Privoxy Developers http://www.privoxy.org/ + # +@@ -128,7 +128,7 @@ + # config file, because it is used while the config file is + # being read. + # +-#user-manual http://www.privoxy.org/user-manual/ ++user-manual /usr/share/doc/privoxy/user-manual + # + # 1.2. trust-info-url + # ==================== +@@ -260,7 +260,7 @@ + # + # No trailing "/", please. + # +-confdir . ++confdir /etc/privoxy + # + # 2.2. templdir + # ============== +@@ -345,7 +345,7 @@ confdir . + # + # No trailing "/", please. + # +-logdir . ++logdir /var/log/privoxy + # + # 2.5. actionsfile + # ================= diff --git a/debian/patches/15_mansection8.dpatch b/debian/patches/15_mansection8.dpatch deleted file mode 100644 index 7df513cb..00000000 --- a/debian/patches/15_mansection8.dpatch +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 15_mansection8.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Move man page from man section 1 to man section 8. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/GNUmakefile.in privoxy/GNUmakefile.in ---- privoxy~/GNUmakefile.in -+++ privoxy/GNUmakefile.in -@@ -60,7 +60,7 @@ - SBIN_DEST = @sbindir@ - MAN_DIR = @mandir@ - MAN_DEST = $(MAN_DIR)/man1 --MAN_PAGE = privoxy.1 -+MAN_PAGE = privoxy.8 - SHARE_DEST = @datadir@ - DOC_DEST = $(SHARE_DEST)/doc/privoxy - VAR_DEST = @localstatedir@ -diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/doc/source/privoxy-man-page.sgml privoxy/doc/source/privoxy-man-page.sgml ---- privoxy~/doc/source/privoxy-man-page.sgml -+++ privoxy/doc/source/privoxy-man-page.sgml -@@ -58,7 +58,7 @@ - - - privoxy -- 1 -+ 8 - - Privoxy &p-version; - diff --git a/debian/patches/15_mansection8.patch b/debian/patches/15_mansection8.patch new file mode 100644 index 00000000..df84a8b3 --- /dev/null +++ b/debian/patches/15_mansection8.patch @@ -0,0 +1,25 @@ +Author: Roland Rosenfeld +Description: Move man page from man section 1 to man section 8. + +--- a/GNUmakefile.in ++++ b/GNUmakefile.in +@@ -60,7 +60,7 @@ CONF_BASE = @sysconfdir@ + SBIN_DEST = @sbindir@ + MAN_DIR = @mandir@ + MAN_DEST = $(MAN_DIR)/man1 +-MAN_PAGE = privoxy.1 ++MAN_PAGE = privoxy.8 + SHARE_DEST = @datadir@ + DOC_DEST = $(SHARE_DEST)/doc/privoxy + VAR_DEST = @localstatedir@ +--- a/doc/source/privoxy-man-page.sgml ++++ b/doc/source/privoxy-man-page.sgml +@@ -58,7 +58,7 @@ + + + privoxy +- 1 ++ 8 + + Privoxy &p-version; + diff --git a/debian/patches/17_502_no_such_domain.dpatch b/debian/patches/17_502_no_such_domain.dpatch deleted file mode 100755 index ee7f454e..00000000 --- a/debian/patches/17_502_no_such_domain.dpatch +++ /dev/null @@ -1,30 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 17_502_no_such_domain.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Changes the 404 HTTP status code of the "No such Domain" template -## DP: to 502 Bad Gateway, which seems to be more correct according to -## DP: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/templates/no-such-domain privoxy/templates/no-such-domain ---- privoxy~/templates/no-such-domain -+++ privoxy/templates/no-such-domain -@@ -79,7 +79,7 @@ - - - -- 404 - No such Domain (Privoxy@@my-hostname@) -+ 502 - Bad Gateway (Privoxy@@my-hostname@) - - - -@@ -95,7 +95,7 @@ - - - -
-- 404 -+ 502 - - diff --git a/debian/patches/17_502_no_such_domain.patch b/debian/patches/17_502_no_such_domain.patch new file mode 100644 index 00000000..7935892d --- /dev/null +++ b/debian/patches/17_502_no_such_domain.patch @@ -0,0 +1,25 @@ +Author: Roland Rosenfeld +Description: Changes the 404 HTTP status code of the "No such Domain" template + to 502 Bad Gateway, which seems to be more correct according to + http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html + +--- a/templates/no-such-domain ++++ b/templates/no-such-domain +@@ -79,7 +79,7 @@ + + + +- 404 - No such Domain (Privoxy@@my-hostname@) ++ 502 - Bad Gateway (Privoxy@@my-hostname@) + + + +@@ -95,7 +95,7 @@ + + + +
+- 404 ++ 502 + + diff --git a/debian/patches/25_standard_medium.dpatch b/debian/patches/25_standard_medium.dpatch deleted file mode 100755 index be10f097..00000000 --- a/debian/patches/25_standard_medium.dpatch +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 25_standard_medium.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Change the global default from standard.Cautious to -## DP: standard.Medium, which is similar to the old 3.0.3 behavior and -## DP: doesn't change too much. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/match-all.action privoxy/match-all.action ---- privoxy~/match-all.action -+++ privoxy/match-all.action -@@ -10,7 +10,16 @@ - +change-x-forwarded-for{block} \ - +client-header-tagger{css-requests} \ - +client-header-tagger{image-requests} \ -++deanimate-gifs{last} \ -++filter{refresh-tags} \ -++filter{img-reorder} \ -++filter{banners-by-size} \ -++filter{webbugs} \ -++filter{jumping-windows} \ -++filter{ie-exploits} \ - +hide-from-header{block} \ -++hide-referrer{conditional-block} \ -++session-cookies-only \ - +set-image-blocker{pattern} \ - } - / # Match all URLs diff --git a/debian/patches/25_standard_medium.patch b/debian/patches/25_standard_medium.patch new file mode 100644 index 00000000..a91ede0b --- /dev/null +++ b/debian/patches/25_standard_medium.patch @@ -0,0 +1,24 @@ +Author: Roland Rosenfeld +Description: 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. + +--- a/match-all.action ++++ b/match-all.action +@@ -10,7 +10,16 @@ + +change-x-forwarded-for{block} \ + +client-header-tagger{css-requests} \ + +client-header-tagger{image-requests} \ +++deanimate-gifs{last} \ +++filter{refresh-tags} \ +++filter{img-reorder} \ +++filter{banners-by-size} \ +++filter{webbugs} \ +++filter{jumping-windows} \ +++filter{ie-exploits} \ + +hide-from-header{block} \ +++hide-referrer{conditional-block} \ +++session-cookies-only \ + +set-image-blocker{pattern} \ + } + / # Match all URLs diff --git a/debian/patches/27_remove_nsl.dpatch b/debian/patches/27_remove_nsl.dpatch deleted file mode 100755 index 1c9e556b..00000000 --- a/debian/patches/27_remove_nsl.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 27_remove_nsl.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove unnecessary linking against libnsl. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/configure.in privoxy/configure.in ---- privoxy~/configure.in -+++ privoxy/configure.in -@@ -469,7 +469,7 @@ - dnl ================================================================= - - dnl Next line needed to find the gethost*_r functions on Solaris --AC_CHECK_LIB(nsl, gethostbyname) -+dnl AC_CHECK_LIB(nsl, gethostbyname) - - AC_CHECK_FUNC(gethostbyaddr_r, [ - AC_MSG_CHECKING([signature of gethostbyaddr_r]) diff --git a/debian/patches/27_remove_nsl.patch b/debian/patches/27_remove_nsl.patch new file mode 100644 index 00000000..e8c5657b --- /dev/null +++ b/debian/patches/27_remove_nsl.patch @@ -0,0 +1,14 @@ +Author: Roland Rosenfeld +Description: Remove unnecessary linking against libnsl. + +--- a/configure.in ++++ b/configure.in +@@ -470,7 +470,7 @@ dnl gmtime and localtime + dnl ================================================================= + + dnl Next line needed to find the gethost*_r functions on Solaris +-AC_CHECK_LIB(nsl, gethostbyname) ++dnl AC_CHECK_LIB(nsl, gethostbyname) + + AC_CHECK_FUNC(gethostbyaddr_r, [ + AC_MSG_CHECKING([signature of gethostbyaddr_r]) diff --git a/debian/patches/28_listen_localhost.dpatch b/debian/patches/28_listen_localhost.dpatch deleted file mode 100755 index 6f8244ce..00000000 --- a/debian/patches/28_listen_localhost.dpatch +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 28_listen_localhost.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Listen on localhost:8118 instead of 127.0.0.1:8118, because -## DP: this is independent from localhost IP (127.0.0.1 vs. 127.0.1.1) -## DP: and also supports IPv6 (Closes: #512888) - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/config privoxy/config ---- privoxy~/config -+++ privoxy/config -@@ -773,7 +773,7 @@ - # - # listen-address [::1]:8118 - # --listen-address 127.0.0.1:8118 -+listen-address localhost:8118 - # - # - # 4.2. toggle diff --git a/debian/patches/28_listen_localhost.patch b/debian/patches/28_listen_localhost.patch new file mode 100644 index 00000000..df0f43ac --- /dev/null +++ b/debian/patches/28_listen_localhost.patch @@ -0,0 +1,17 @@ +Author: Roland Rosenfeld +Description: Listen on localhost:8118 instead of 127.0.0.1:8118, because + this is independent from localhost IP (127.0.0.1 vs. 127.0.1.1) + and also supports IPv6 (Closes: #512888) +Bug-Debian: http://bugs.debian.org/512888 + +--- a/config ++++ b/config +@@ -780,7 +780,7 @@ logfile logfile + # + # listen-address [::1]:8118 + # +-listen-address 127.0.0.1:8118 ++listen-address localhost:8118 + # + # 4.2. toggle + # ============ diff --git a/debian/patches/29_typos.dpatch b/debian/patches/29_typos.dpatch deleted file mode 100755 index f91b57db..00000000 --- a/debian/patches/29_typos.dpatch +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 29_typos.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: fix some common typos: lenght -> length, reenable -> re-enable - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/cgi.c privoxy/cgi.c ---- privoxy~/cgi.c -+++ privoxy/cgi.c -@@ -2145,7 +2145,7 @@ - if (!err) err = map(exports, "time", 1, html_encode(buf), 0); - if (!err) err = map(exports, "my-ip-address", 1, html_encode(ip_address ? ip_address : "unknown"), 0); - freez(ip_address); -- if (!err) err = map(exports, "my-port", 1, html_encode(port ? port : "unkown"), 0); -+ if (!err) err = map(exports, "my-port", 1, html_encode(port ? port : "unknown"), 0); - freez(port); - if (!err) err = map(exports, "my-hostname", 1, html_encode(hostname ? hostname : "unknown"), 0); - freez(hostname); -diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/tools/privoxy-log-parser.pl privoxy/tools/privoxy-log-parser.pl ---- privoxy~/tools/privoxy-log-parser.pl -+++ privoxy/tools/privoxy-log-parser.pl -@@ -2518,7 +2518,7 @@ - Doesn't do anything else, so you probably want to pipe the output into - B again. - --[B<--url-statistics-threshold>] Only show the request count for a ressource -+[B<--url-statistics-threshold>] Only show the request count for a resource - if it's above or equal to the given threshold. If the threshold is 0, URL - statistics are disabled. - diff --git a/debian/patches/32_bind_fixup.dpatch b/debian/patches/32_bind_fixup.patch old mode 100755 new mode 100644 similarity index 59% rename from debian/patches/32_bind_fixup.dpatch rename to debian/patches/32_bind_fixup.patch index 2c5bad61..317b6e04 --- a/debian/patches/32_bind_fixup.dpatch +++ b/debian/patches/32_bind_fixup.patch @@ -1,14 +1,10 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 32_bind_fixup.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Work around bind problems on startup (Closes: #534735) +Author: Roland Rosenfeld +Description: Work around bind problems on startup (Closes: #534735) +Bug-Debian: http://bugs.debian.org/534735 -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/jbsockets.c privoxy/jbsockets.c ---- privoxy~/jbsockets.c -+++ privoxy/jbsockets.c -@@ -757,20 +757,7 @@ +--- a/jbsockets.c ++++ b/jbsockets.c +@@ -867,20 +867,7 @@ int bind_port(const char *hostnam, int p } memset(&hints, 0, sizeof(struct addrinfo)); diff --git a/debian/patches/33_manpage_hyphen.patch b/debian/patches/33_manpage_hyphen.patch new file mode 100644 index 00000000..aa229942 --- /dev/null +++ b/debian/patches/33_manpage_hyphen.patch @@ -0,0 +1,15 @@ +Author: Roland Rosenfeld +Description: Replace all -- in man page by \-\- to make lintian happy. + +--- a/GNUmakefile.in ++++ b/GNUmakefile.in +@@ -474,8 +474,7 @@ man: dok-release + perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" $(MAN_PAGE); \ + perl -pi.bak -e "s/ö/\\\\[:o]/g" $(MAN_PAGE); \ + perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' $(MAN_PAGE); \ +- perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' $(MAN_PAGE); \ +- perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' $(MAN_PAGE); \ ++ perl -pi.bak -e 's/--/\\-\\-/g' $(MAN_PAGE); \ + $(DB) ../privoxy-man-page.sgml && $(MV) -f $(MAN_PAGE) ../../../$(MAN_PAGE) + + # For those with man2html ala RH7s. diff --git a/debian/patches/34_system-docbook2man.patch b/debian/patches/34_system-docbook2man.patch new file mode 100644 index 00000000..11288bc6 --- /dev/null +++ b/debian/patches/34_system-docbook2man.patch @@ -0,0 +1,15 @@ +Author: Roland Rosenfeld +Description: Use Debian docbook2man-spec.pl (from docbook-utils) + instead of local copy, to make package reproducible. + +--- a/GNUmakefile.in ++++ b/GNUmakefile.in +@@ -469,7 +469,7 @@ dok-man: + # target for man page generation! + man: dok-release + mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\ +- nsgmls ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\ ++ nsgmls ../privoxy-man-page.sgml | sgmlspl /usr/share/perl5/sgmlspl-specs/docbook2man-spec.pl &&\ + perl -pi.bak -e 's/ //; s/\[ /\[/g' $(MAN_PAGE) ;\ + perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" $(MAN_PAGE); \ + perl -pi.bak -e "s/ö/\\\\[:o]/g" $(MAN_PAGE); \ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..1ef2478f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,11 @@ +05_defaut_action.patch +06_8bit_manual.patch +14_config.patch +15_mansection8.patch +17_502_no_such_domain.patch +25_standard_medium.patch +27_remove_nsl.patch +28_listen_localhost.patch +32_bind_fixup.patch +33_manpage_hyphen.patch +34_system-docbook2man.patch diff --git a/debian/privoxy.service b/debian/privoxy.service new file mode 100644 index 00000000..63cd84b4 --- /dev/null +++ b/debian/privoxy.service @@ -0,0 +1,15 @@ +[Unit] +Description=Privacy enhancing HTTP Proxy + +[Service] +Environment=PIDFILE=/var/run/privoxy.pid +Environment=OWNER=privoxy +Environment=CONFIGFILE=/etc/privoxy/config +Type=forking +PIDFile=/var/run/privoxy.pid +ExecStart=/usr/sbin/privoxy --pidfile $PIDFILE --user $OWNER $CONFIGFILE +ExecStopPost=/bin/rm -f $PIDFILE +SuccessExitStatus=15 + +[Install] +WantedBy=multi-user.target diff --git a/debian/rules b/debian/rules index c2ba1323..113dadb7 100755 --- a/debian/rules +++ b/debian/rules @@ -1,77 +1,56 @@ #!/usr/bin/make -f # -# (C) 2002-2011 Roland Rosenfeld , based on -# Sample debian/rules that uses debhelper. -# This file is public domain software, originally written by Joey Hess. - +# (c) 2002-2015 Roland Rosenfeld +# # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +#export DH_OPTIONS=-v -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all DEBDIR=`pwd`/debian/privoxy -# Include dpatch stuff. -include /usr/share/dpatch/dpatch.make - -OPTIMIZE= -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - OPTIMIZE=-O0 -else - OPTIMIZE=-O2 -endif - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp -build-stamp: patch-stamp - dh_testdir +%: + dh $@ --with autotools_dev --with systemd +override_dh_auto_configure: autoheader autoconf - env CFLAGS="$(OPTIMIZE) -g" \ - ./configure --prefix=/usr --sysconfdir=/etc \ - --mandir=/usr/share/man $(WITHDEBUG) \ - --enable-zlib --enable-no-gifs \ + dh_auto_configure -- \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --enable-zlib \ + --enable-no-gifs \ + --enable-external-filters \ --with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular - $(MAKE) - $(MAKE) dok - env -u LANG $(MAKE) man - $(MAKE) man2html - - touch build-stamp - -clean: clean1 unpatch -clean1: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp +override_dh_auto_build: + $(MAKE) +# preserve auto build documentation from source package: + tar cf debian/doc.tar README INSTALL AUTHORS doc/source doc/webserver + env -u LANG LC_ALL=C.UTF-8 $(MAKE) dok + rm -f doc/webserver/user-manual/*.bak + env -u LANG LC_ALL=C.UTF-8 $(MAKE) man + +override_dh_auto_clean: +# restore auto build documentation from source package: + [ ! -f debian/doc.tar ] || tar xf debian/doc.tar + rm -f debian/doc.tar + find doc/source -name \*.html | xargs -r rm -f [ ! -f GNUmakefile ] || $(MAKE) clean [ ! -f GNUmakefile ] || $(MAKE) distclean rm -f configure config.h GNUmakefile rm -f privoxy.8 - rm -rf obj rm -f ActivityConsole.jar rm -f src/java/org/privoxy/activityconsole/*.class - rm -f doc/source/ldp.dsl rm -rf doc/source/temp - dh_clean -Xrc.privoxy.orig -install: build-stamp - dh_testdir - dh_testroot - dh_clean -k -Xrc.privoxy.orig - dh_installdirs - +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 @@ -100,43 +79,11 @@ install: build-stamp mv -f $$f.new $$f; \ done -# Build architecture-independent files here. -binary-indep: build-stamp install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build-stamp install - dh_testdir - dh_testroot -# dh_installdebconf +override_dh_installdocs: dh_installdocs -XCVS (cd $(DEBDIR)/usr/share/doc/privoxy/; \ mv privoxy-index.html index.html) - dh_installexamples - dh_installmenu - dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime - dh_installinit - dh_installcron - dh_installman - dh_installinfo -# dh_undocumented - dh_installchangelogs ChangeLog - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_makeshlibs - dh_installdeb - dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install patch unpatch \ - clean1 +override_dh_perl: +# We only need perl-base: + dh_perl -d diff --git a/debian/source/format b/debian/source/format index d3827e75..163aaf8d 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 00000000..7dff8348 --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,41 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +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 +=IyrL +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index 6b81d791..0e2c1260 100644 --- a/debian/watch +++ b/debian/watch @@ -5,4 +5,4 @@ version=3 #http://sourceforge.net/project/showfiles.php?group_id=11118 http://prdownloads.sourceforge.net/ijbswa/privoxy-(.*)-stable-src.tar.gz\?download -http://sf.net/ijbswa/privoxy-(\d+.*)-(?:stable|beta)-src.tar.gz +opts=pgpsigurlmangle=s/$/.asc/ http://sf.net/ijbswa/privoxy-(\d+.*)-(?:stable|beta)-src.tar.gz -- 2.39.2