From 6a358e07e91282c0f5011696d3918a6a13fed905 Mon Sep 17 00:00:00 2001 From: Roland Rosenfeld Date: Sat, 30 Nov 2019 12:37:22 +0100 Subject: [PATCH] Apply Debian package changes 3.0.28-1 and 3.0.28-2 --- debian/changelog | 44 +++++++++++ debian/compat | 2 +- debian/control | 6 +- debian/copyright | 8 +- debian/gitlab-ci.yml | 16 ++++ debian/init.d | 2 +- debian/logrotate | 2 +- debian/maintscript | 1 + debian/patches/05_defaut_action.patch | 4 +- debian/patches/06_8bit_manual.patch | 33 -------- debian/patches/14_config.patch | 6 +- debian/patches/15_mansection8.patch | 2 +- debian/patches/17_502_no_such_domain.patch | 4 +- debian/patches/25_standard_medium.patch | 2 +- debian/patches/27_remove_nsl.patch | 2 +- debian/patches/32_bind_fixup.patch | 2 +- debian/patches/33_manpage_hyphen.patch | 2 +- debian/patches/34_system-docbook2man.patch | 6 +- debian/patches/35_man-spelling.patch | 2 +- debian/patches/36_openspopenjade.patch | 35 --------- .../36_trusted-cgi-referer-example.patch | 15 ++++ debian/patches/37_adventofcode.patch | 18 ----- debian/patches/37_ppedit-tests403.patch | 78 +++++++++++++++++++ debian/patches/series | 5 +- debian/po/es.po | 54 +++++++++++++ debian/privoxy.service | 4 +- debian/rules | 15 ++-- debian/tests/privoxy-regression-test | 16 ++-- debian/upstream/signing-key.asc | 65 +++++++++------- debian/watch | 2 +- 30 files changed, 292 insertions(+), 161 deletions(-) create mode 100644 debian/gitlab-ci.yml create mode 100644 debian/maintscript delete mode 100644 debian/patches/06_8bit_manual.patch delete mode 100644 debian/patches/36_openspopenjade.patch create mode 100644 debian/patches/36_trusted-cgi-referer-example.patch delete mode 100644 debian/patches/37_adventofcode.patch create mode 100644 debian/patches/37_ppedit-tests403.patch create mode 100644 debian/po/es.po diff --git a/debian/changelog b/debian/changelog index f7badbc9..a45a84ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,47 @@ +privoxy (3.0.28-2) unstable; urgency=medium + + * d/tests/privoxy-regression-test: Remove tmpdir on exit. + * 36_trusted-cgi-referer-example: Comment trusted-cgi-referer pointing + to example.org + * d/maintscript: Remove orphaned /etc/privoxy/templates/show-version + (Closes: #918110). + * 37_ppedit-tests403: Update a bunch of regression tests that have to + expect status code 403 now. + * Enable enable-edit-actions in privoxy-regression-test again. + * Upgrade to debhelper v12. + * Update (minimal) upstream signing key. + * Add Pre-Depends: ${misc:Pre-Depends} for --skip-systemd-native. + + -- Roland Rosenfeld Sun, 06 Jan 2019 13:07:14 +0100 + +privoxy (3.0.28-1) unstable; urgency=medium + + [ Roland Rosenfeld ] + * Add es debconf translation. Thanks to Jonathan Bustillos (Closes: #903863). + * 38_connection_close: Don't add a "Connection" header for CONNECT requests. + + [ Ondřej Nový ] + * d/tests: Use AUTOPKGTEST_TMP instead of ADTTMP + * d/watch: Use https protocol + + [ Roland Rosenfeld ] + * d/tests: Fix leftover ADTTMP. + * Add salsa CI pipeline in debian/gitlab-ci.yml. + * New upstream version 3.0.28. + * Adapt all patches to new version (06_8bit_manual is implemented in a + better way upstream now, 36_openspopenjade is replaced by some + autoconf code, 37_adventofcode and 38_connection_close are included + upstream). + * Update debian/copyright. + * Upgrade to Standards-Version 4.3.0 (Declare Rules-Requires-Root: no). + * Move PID file from /var/run to /run. + * Undo voodoo to remove CVS tags from configs since upstream uses git + now. + * Disable enable-edit-actions in privoxy-regression-test, since the test + seems to be broken (does not use referrer, which is required here). + + -- Roland Rosenfeld Mon, 31 Dec 2018 16:52:27 +0100 + privoxy (3.0.26-6) unstable; urgency=medium * Fix typo in patch description. diff --git a/debian/compat b/debian/compat index b4de3947..48082f72 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/debian/control b/debian/control index 5373a5e4..c483d5c5 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: Roland Rosenfeld Build-Depends: autoconf, - debhelper (>= 11~), + debhelper (>= 12~), docbook, docbook-dsssl, docbook-utils, @@ -15,10 +15,11 @@ Build-Depends: autoconf, sgmlspl, w3m, zlib1g-dev -Standards-Version: 4.1.4 +Standards-Version: 4.3.0 Homepage: https://www.privoxy.org/ Vcs-Git: https://salsa.debian.org/debian/privoxy.git Vcs-Browser: https://salsa.debian.org/debian/privoxy +Rules-Requires-Root: no Package: privoxy Architecture: any @@ -30,6 +31,7 @@ Depends: adduser, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-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 acf6ef3d..059f5193 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,11 +5,11 @@ Source: https://sourceforge.net/projects/ijbswa/files/Sources/ Files: * Copyright: - Copyright (C) 2001-2016 by the Privoxy team. http://www.privoxy.org/ + Copyright (C) 2001-2018 by the Privoxy team. http://www.privoxy.org/ Parts Copyright (C) 1999 Adam Lock Parts Copyright (C) 2003 Ian Cummings Parts Copyright (C) 2000, 2001 by Andreas S. Oesterhelt - Parts Copyright (C) 2006-2016 Fabian Keil + Parts Copyright (C) 2006-2018 Fabian Keil Comment: Based on the Internet Junkbuster originally written by and Copyright (C) 1997 Anonymous Coders and @@ -20,7 +20,7 @@ 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 + Copyright (c) 2006-2017 Fabian Keil License: ISC Files: strptime.h @@ -33,7 +33,7 @@ License: GPL-2+ Files: debian/* Copyright: - 2002-2016 Roland Rosenfeld + 2002-2018 Roland Rosenfeld License: GPL-2+ Files: pcre/* diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml new file mode 100644 index 00000000..b7dc52a0 --- /dev/null +++ b/debian/gitlab-ci.yml @@ -0,0 +1,16 @@ +include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + +build: + extends: .build-unstable + +reprotest: + extends: .test-reprotest + +lintian: + extends: .test-lintian + +autopkgtest: + extends: .test-autopkgtest + +piuparts: + extends: .test-piuparts diff --git a/debian/init.d b/debian/init.d index 0660d92c..d089d739 100644 --- a/debian/init.d +++ b/debian/init.d @@ -22,7 +22,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="filtering proxy server" NAME=privoxy DAEMON=/usr/sbin/$NAME -PIDFILE=/var/run/$NAME.pid +PIDFILE=/run/$NAME.pid OWNER=privoxy CONFIGFILE=/etc/privoxy/config DAEMON_ARGS="--pidfile $PIDFILE --user $OWNER $CONFIGFILE" diff --git a/debian/logrotate b/debian/logrotate index deddd262..d86c12b9 100644 --- a/debian/logrotate +++ b/debian/logrotate @@ -9,7 +9,7 @@ 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 + if [ -f /run/privoxy.pid ]; then /etc/init.d/privoxy rotate > /dev/null fi fi diff --git a/debian/maintscript b/debian/maintscript new file mode 100644 index 00000000..e6f00897 --- /dev/null +++ b/debian/maintscript @@ -0,0 +1 @@ +rm_conffile /etc/privoxy/templates/show-version 3.0.28-2~ privoxy diff --git a/debian/patches/05_defaut_action.patch b/debian/patches/05_defaut_action.patch index c3ffd5b9..fc4551f1 100644 --- a/debian/patches/05_defaut_action.patch +++ b/debian/patches/05_defaut_action.patch @@ -4,7 +4,7 @@ Subject: Several changes/additons to default.action. --- a/default.action.master +++ b/default.action.master -@@ -2419,6 +2419,9 @@ schneegans.de/sv/\?url=referer +@@ -2427,6 +2427,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 @@ -14,7 +14,7 @@ Subject: Several changes/additons to default.action. {-filter{unsolicited-popups}} # Sticky Actions = -filter{unsolicited-popups} -@@ -2477,6 +2480,11 @@ tr.anp.se/ +@@ -2485,6 +2488,11 @@ tr.anp.se/ {+filter{tiny-textforms}} .sourceforge.net/tracker diff --git a/debian/patches/06_8bit_manual.patch b/debian/patches/06_8bit_manual.patch deleted file mode 100644 index 1bf225e0..00000000 --- a/debian/patches/06_8bit_manual.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Roland Rosenfeld -Date: Sun, 15 May 2005 15:28:56 +0200 -Subject: Stop converting 8bit chars in the documentation (#203697) -Bug-Debian: https://bugs.debian.org/203697 - ---- 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 - ;; symbolic entities, whereas things work well with numeric entities. --(declare-characteristic preserve-sdata? -- "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" -- #f) -+;(declare-characteristic preserve-sdata? -+; "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" -+; #f) - - ;; put the legal notice in a separate file - (define %generate-legalnotice-link% -@@ -257,9 +257,9 @@ - - ;; this is necessary because right now jadetex does not understand - ;; symbolic entities, whereas things work well with numeric entities. --(declare-characteristic preserve-sdata? -- "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" -- #f) -+;(declare-characteristic preserve-sdata? -+; "UNREGISTERED::James Clark//Characteristic::preserve-sdata?" -+; #f) - - ;; put the legal notice in a separate file - (define %generate-legalnotice-link% diff --git a/debian/patches/14_config.patch b/debian/patches/14_config.patch index 0a28cb18..2de0aa64 100644 --- a/debian/patches/14_config.patch +++ b/debian/patches/14_config.patch @@ -4,7 +4,7 @@ Subject: Several Debian specific changes to config file --- a/config +++ b/config -@@ -128,7 +128,7 @@ +@@ -126,7 +126,7 @@ # config file, because it is used while the config file is # being read. # @@ -13,7 +13,7 @@ Subject: Several Debian specific changes to config file # # 1.2. trust-info-url # ==================== -@@ -260,7 +260,7 @@ +@@ -258,7 +258,7 @@ # # No trailing "/", please. # @@ -22,7 +22,7 @@ Subject: Several Debian specific changes to config file # # 2.2. templdir # ============== -@@ -345,7 +345,7 @@ confdir . +@@ -343,7 +343,7 @@ confdir . # # No trailing "/", please. # diff --git a/debian/patches/15_mansection8.patch b/debian/patches/15_mansection8.patch index 36dbb253..f8535e3d 100644 --- a/debian/patches/15_mansection8.patch +++ b/debian/patches/15_mansection8.patch @@ -15,7 +15,7 @@ Subject: Move man page from man section 1 to man section 8. VAR_DEST = @localstatedir@ --- a/doc/source/privoxy-man-page.sgml +++ b/doc/source/privoxy-man-page.sgml -@@ -58,7 +58,7 @@ +@@ -54,7 +54,7 @@ privoxy diff --git a/debian/patches/17_502_no_such_domain.patch b/debian/patches/17_502_no_such_domain.patch index 27c5d676..da529ffc 100644 --- a/debian/patches/17_502_no_such_domain.patch +++ b/debian/patches/17_502_no_such_domain.patch @@ -6,7 +6,7 @@ Subject: Changes the 404 HTTP status code of the "No such Domain" template --- a/templates/no-such-domain +++ b/templates/no-such-domain -@@ -79,7 +79,7 @@ +@@ -78,7 +78,7 @@ @@ -15,7 +15,7 @@ Subject: Changes the 404 HTTP status code of the "No such Domain" template -@@ -95,7 +95,7 @@ +@@ -94,7 +94,7 @@
diff --git a/debian/patches/25_standard_medium.patch b/debian/patches/25_standard_medium.patch index df505d0e..ba6745c9 100644 --- a/debian/patches/25_standard_medium.patch +++ b/debian/patches/25_standard_medium.patch @@ -5,7 +5,7 @@ Subject: Change the global default from standard.Cautious to standard.Medium, --- a/match-all.action +++ b/match-all.action -@@ -11,7 +11,16 @@ +@@ -10,7 +10,16 @@ +client-header-tagger{css-requests} \ +client-header-tagger{image-requests} \ +client-header-tagger{range-requests} \ diff --git a/debian/patches/27_remove_nsl.patch b/debian/patches/27_remove_nsl.patch index 09d70a66..c317c223 100644 --- a/debian/patches/27_remove_nsl.patch +++ b/debian/patches/27_remove_nsl.patch @@ -4,7 +4,7 @@ Subject: Remove unnecessary linking against libnsl. --- a/configure.in +++ b/configure.in -@@ -491,7 +491,7 @@ dnl gmtime and localtime +@@ -508,7 +508,7 @@ dnl gmtime and localtime dnl ================================================================= dnl Next line needed to find the gethost*_r functions on Solaris diff --git a/debian/patches/32_bind_fixup.patch b/debian/patches/32_bind_fixup.patch index d4f4713e..aeff2720 100644 --- a/debian/patches/32_bind_fixup.patch +++ b/debian/patches/32_bind_fixup.patch @@ -5,7 +5,7 @@ Bug-Debian: https://bugs.debian.org/534735 --- a/jbsockets.c +++ b/jbsockets.c -@@ -867,20 +867,7 @@ int bind_port(const char *hostnam, int p +@@ -975,20 +975,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 index d3df6e23..7c684a37 100644 --- a/debian/patches/33_manpage_hyphen.patch +++ b/debian/patches/33_manpage_hyphen.patch @@ -4,7 +4,7 @@ Subject: Replace all -- in man page by \-\- to make lintian happy. --- a/GNUmakefile.in +++ b/GNUmakefile.in -@@ -484,8 +484,7 @@ man: dok-release +@@ -532,8 +532,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); \ diff --git a/debian/patches/34_system-docbook2man.patch b/debian/patches/34_system-docbook2man.patch index 5c51dd80..83f8ba16 100644 --- a/debian/patches/34_system-docbook2man.patch +++ b/debian/patches/34_system-docbook2man.patch @@ -5,12 +5,12 @@ Subject: Use Debian docbook2man-spec.pl (from docbook-utils) instead of local --- a/GNUmakefile.in +++ b/GNUmakefile.in -@@ -479,7 +479,7 @@ dok-man: +@@ -527,7 +527,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 &&\ +- $(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/35_man-spelling.patch b/debian/patches/35_man-spelling.patch index 59681da6..841fd629 100644 --- a/debian/patches/35_man-spelling.patch +++ b/debian/patches/35_man-spelling.patch @@ -4,7 +4,7 @@ Subject: Fix typo in man page privoxy-log-parser(1) --- a/tools/privoxy-log-parser.pl +++ b/tools/privoxy-log-parser.pl -@@ -2612,7 +2612,7 @@ omitted, ANSI escape sequences are used +@@ -2628,7 +2628,7 @@ omitted, ANSI escape sequences are used This option is only intended to make embedding log excerpts in web pages easier. It does not escape any input! diff --git a/debian/patches/36_openspopenjade.patch b/debian/patches/36_openspopenjade.patch deleted file mode 100644 index 969f9505..00000000 --- a/debian/patches/36_openspopenjade.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Neil Roeth -Date: Sat, 10 Sep 2016 08:48:35 +0200 -Subject: Replace sp and jade with opensp and openjade. -Bug-Debian: https://bugs.debian.org/837207 - ---- a/GNUmakefile.in -+++ b/GNUmakefile.in -@@ -479,7 +479,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 /usr/share/perl5/sgmlspl-specs/docbook2man-spec.pl &&\ -+ onsgmls ../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); \ ---- a/utils/docbook2man/docbook2man-spec.pl.1 -+++ b/utils/docbook2man/docbook2man-spec.pl.1 -@@ -11,14 +11,14 @@ docbook2man-spec.pl \- convert DocBook R - \fBsgmlspl\fR \fBdocbook2man-spec.pl\fR - - --\fBnsgmls\fR [ \fB\fIsgml document\fB\fR ]\fB| sgmlspl\fR \fBdocbook2man-spec.pl\fR -+\fBonsgmls\fR [ \fB\fIsgml document\fB\fR ]\fB| sgmlspl\fR \fBdocbook2man-spec.pl\fR - - .SH "DESCRIPTION" - .PP - \fBdocbook2man\fR is a sgmlspl spec file that produced man - pages (using the -man macros) from DocBook RefEntry markup. - .PP --The program reads ESIS produced by nsgmls (or other SGML parsers) from -+The program reads ESIS produced by onsgmls (or other SGML parsers) from - standard input. Markup not found in RefEntry is discarded. - .PP - Its output, the converted man pages, are written to the current directory. If diff --git a/debian/patches/36_trusted-cgi-referer-example.patch b/debian/patches/36_trusted-cgi-referer-example.patch new file mode 100644 index 00000000..bc0f1ba2 --- /dev/null +++ b/debian/patches/36_trusted-cgi-referer-example.patch @@ -0,0 +1,15 @@ +From: Roland Rosenfeld +Date: Tue, 01 Jan 2019 17:33:42 +0100 +Subject: Comment trusted-cgi-referer pointing to example.org + +--- a/config ++++ b/config +@@ -1215,7 +1215,7 @@ enable-proxy-authentication-forwarding 0 + # |the user's knowledge. | + # +-----------------------------------------------------+ + # +-trusted-cgi-referer http://www.example.org/ ++#trusted-cgi-referer http://www.example.org/ + # + # + # 5. FORWARDING diff --git a/debian/patches/37_adventofcode.patch b/debian/patches/37_adventofcode.patch deleted file mode 100644 index 12969fb5..00000000 --- a/debian/patches/37_adventofcode.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Roland Rosenfeld -Date: Wed, 11 Jan 2017 22:24:55 +0100 -Subject: unblock adventofcode.com -Bug-Debian: https://bugs.debian.org/848211 -Forwarded: https://sourceforge.net/p/ijbswa/actionsfile-feedback/937/ - ---- a/default.action.master -+++ b/default.action.master -@@ -1941,7 +1941,8 @@ klikki.fi/adv/ - #MASTER# UNBLOCK-REFERRER: http://www.ardmediathek.de/tv - # URL = http://www.ardmediathek.de/ard/static/img/ardmt/banner/ard-mediathek.svg - .ardmediathek.de/ -- -+#MASTER# UNBLOCK-REFERRER: http://adventofcode.com -+adventofcode.com - - ############################################################################# - # Site-specific special rules: diff --git a/debian/patches/37_ppedit-tests403.patch b/debian/patches/37_ppedit-tests403.patch new file mode 100644 index 00000000..68e3b817 --- /dev/null +++ b/debian/patches/37_ppedit-tests403.patch @@ -0,0 +1,78 @@ +From: Fabian Keil +Date: Fri, 4 Jan 2019 14:03:14 +0000 +Subject: Update a bunch of tests that have to expect status code 403 now +Origin: https://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=HEAD;hp=10a83542e5fba75cd6da2e08ad461ac7439ba807 + +--- a/regression-tests.action ++++ b/regression-tests.action +@@ -722,48 +722,70 @@ TAG:^Proxy-Authorization header forwardi + # Expect Status Code = 403 + # Level = 21 + # Fetch Test = http://p.p/edit-actions ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/eaa ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/eau ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/ear ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/eal ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/eafu ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/eas ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/easa ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/easr ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/eass ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/edit-actions-for-url ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/edit-actions-list + # Level = 12 + # Fetch Test = http://p.p/edit-actions-submit ++# Expect Status Code = 403 + # Level = 12 ++# Expect Status Code = 403 + # Fetch Test = http://p.p/edit-actions-url ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/edit-actions-url-form ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/edit-actions-add-url ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/edit-actions-add-url-form ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/edit-actions-remove-url ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/edit-actions-remove-url-form ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/edit-actions-section-add ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/edit-actions-section-remove ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/edit-actions-section-swap ++# Expect Status Code = 403 + # Level = 12 + # Fetch Test = http://p.p/error-favicon.ico + # Fetch Test = http://p.p/favicon.ico diff --git a/debian/patches/series b/debian/patches/series index e640852f..beefcda6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 05_defaut_action.patch -06_8bit_manual.patch 14_config.patch 15_mansection8.patch 17_502_no_such_domain.patch @@ -9,5 +8,5 @@ 33_manpage_hyphen.patch 34_system-docbook2man.patch 35_man-spelling.patch -36_openspopenjade.patch -37_adventofcode.patch +36_trusted-cgi-referer-example.patch +37_ppedit-tests403.patch diff --git a/debian/po/es.po b/debian/po/es.po new file mode 100644 index 00000000..6e0b44b5 --- /dev/null +++ b/debian/po/es.po @@ -0,0 +1,54 @@ +# privoxy po-debconf translation to Spanish. +# Copyright (C) 2018 Software in the Public Interest +# This file is distributed under the same license as the privoxy package. +# +# - Initial translation +# Jonathan Bustillos , 2018. +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +msgid "" +msgstr "" +"Project-Id-Version: privoxy\n" +"Report-Msgid-Bugs-To: privoxy@packages.debian.org\n" +"POT-Creation-Date: 2016-04-08 17:17+0200\n" +"PO-Revision-Date: 2018-07-16 00:23+0200\n" +"Last-Translator: Jonathan Bustillos \n" +"Language-Team: Debian Spanish \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.7\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Adresses on with Privoxy listens:" +msgstr "Direcciones que Privoxy escucha:" + +#. 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 "" +"Introduzca una lista de combinaciones dirección:puerto separadas por " +"espacios en las que Privoxy escuchará las solicitudes de los clientes." diff --git a/debian/privoxy.service b/debian/privoxy.service index f7b3f5dd..8ad06d39 100644 --- a/debian/privoxy.service +++ b/debian/privoxy.service @@ -4,11 +4,11 @@ Documentation=man:privoxy(8) https://www.privoxy.org/user-manual/ After=network.target [Service] -Environment=PIDFILE=/var/run/privoxy.pid +Environment=PIDFILE=/run/privoxy.pid Environment=OWNER=privoxy Environment=CONFIGFILE=/etc/privoxy/config Type=forking -PIDFile=/var/run/privoxy.pid +PIDFile=/run/privoxy.pid ExecStart=/usr/sbin/privoxy --pidfile $PIDFILE --user $OWNER $CONFIGFILE ExecStopPost=/bin/rm -f $PIDFILE SuccessExitStatus=15 diff --git a/debian/rules b/debian/rules index aeedd3ba..c8f914e8 100755 --- a/debian/rules +++ b/debian/rules @@ -51,8 +51,7 @@ override_dh_auto_clean: 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 \ + sed -e 's/\(Sample Configuration File for Privoxy\).*/\1/;' < 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 @@ -75,21 +74,17 @@ override_dh_auto_install: cp -r templates $(DEBDIR)/etc/privoxy/ rm -f $(DEBDIR)/etc/privoxy/templates/*~ - rm -rf $(DEBDIR)/etc/privoxy/templates/CVS -# Remove CVS tags and trailing spaces from config files: +# Remove trailing spaces from config files: find $(DEBDIR)/etc/privoxy -type f \ - | xargs grep -l '\$$[A-Z][^$$]*:[^$$]*\$$' \ + | xargs grep -l ' $$' \ | while read f; do \ - sed -e 's/\$$\(Id: [^$$]*,v\)[^$$]*\$$/\1/' \ - -e 's/\$$\(Source: [^$$]*\)\$$/\1/' \ - -e 's/\$$\(Log: [^$$]*\)\$$/\1/' \ - -e 's/ *$$//' < $$f > $$f.new; \ + sed -e 's/ *$$//' < $$f > $$f.new; \ mv -f $$f.new $$f; \ done override_dh_installdocs: - dh_installdocs -XCVS + dh_installdocs (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') diff --git a/debian/tests/privoxy-regression-test b/debian/tests/privoxy-regression-test index 3122a1a6..eb068b70 100755 --- a/debian/tests/privoxy-regression-test +++ b/debian/tests/privoxy-regression-test @@ -3,18 +3,20 @@ # Run privoxy-regression-test.pl on a configuration extended by # regression-tests.action. # -# (c) 2016 Roland Rosenfeld +# (c) 2018 Roland Rosenfeld PORT=8119 -if [ -z "$ADTTMP" ]; then - ADTTMP=$(mktemp -d) +if [ -z "$AUTOPKGTEST_TMP" ]; then + AUTOPKGTEST_TMP=$(mktemp -d) fi -CONFIG=$ADTTMP/config -PIDFILE=$ADTTMP/privoxy.pid +trap "rm -rf $AUTOPKGTEST_TMP" EXIT + +CONFIG=$AUTOPKGTEST_TMP/config +PIDFILE=$AUTOPKGTEST_TMP/privoxy.pid sed -e "s/^listen-address.*/listen-address 127.0.0.1:$PORT/" \ - -e "s%^logdir.*%logdir $ADTTMP%" \ + -e "s%^logdir.*%logdir $AUTOPKGTEST_TMP%" \ -e "s/^enable-edit-actions.*/enable-edit-actions 1/" \ -e "s/^keep-alive-timeout.*/keep-alive-timeout 21/" \ -e "s/^#connection-sharing.*/connection-sharing 1/" \ @@ -27,7 +29,7 @@ echo "Starting privoxy on port $PORT" http_proxy=http://127.0.0.1:$PORT/ export http_proxy -OUTFILE=$ADTTMP/output +OUTFILE=$AUTOPKGTEST_TMP/output /usr/bin/privoxy-regression-test --max-level 200 --show-skipped-tests \ | tee $OUTFILE 2>&1 diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 7dff8348..e49a9e4c 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -1,5 +1,4 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) mQINBFB0JFYBEACy/Kz2i9v9hLuZpZWsToyVhhByN2wNVPv6vi3+U+fGNndG0Gxk SzEMqJDmNGSCrsllZCaAion3MgmdyZP8gNURf56NhE/CaMD3XLQWHTtBwTPPg/Bm @@ -12,30 +11,42 @@ rQ57YHkt9urf+Xzsn+5/7z6qfxK5/H+R8vM8m5SPK54kFIL6HP3/4aYv96lQST/v WNHdHqjgQ0zxT31WxE6lYCCv9cwfLFoY7ZG6YuRhQEeVNazRb+YrcIxpbvkbamBu VmSEvzIhGN9PiWL1yOYJkNogR199f8zVRvuA4NYztg3e6RSOi3D3wyrZ7OIo2DI0 en0AWSt0bpdGoaTiLWLyoZg1WOc5wNTWimDeZZkFrWhKLhE7RKagQXGeBwARAQAB -tB5GYWJpYW4gS2VpbCA8ZmtAZmFiaWFua2VpbC5kZT6JAj0EEwEIACcFAlB0JFYC -GwMFCQPCZwAFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQaRgikYuiNxySZg// -VDHj0S26AEYynVbswitx79kEppfz7LHIJq37KTnOLZm29+q59hbfi1t5hSz13s76 -vdUSRvL1PH0hm/pZ5D4+ZNvsfA4sHUrO/l/YR6XZbsC0FggxGvEhXXR3ZDf0y9Am -4N4iauC3dC7nJdA0MURV12Ckd47J76IQGhHZBscKAG7rwBm9nGhxCfp1gzo1a+Uw -zPXktvqKEwpw+8qx5oeKjxaGzBxrTbW8gFa8KlKftkAbfIprdLMVos5ojMqbBx2V -Eh7GSu+eEodS3vDQf+WZ2zCwtfYwfsWhLRsLhljIyNA8yKQR0fePS8NI0drxrx8C -hputf20T0TJVmSAWktCppaNa1Lw2sd+Jh6ol/ioIWm68FgwdTXqrcmjkX8OwPIPh -9FyBUlcix4tDJGnhQcgdy9DLvleEupIiE3F1L8hfrBJRUA/au1m6iEcOMslXaScm -0UspqV0HMG47Clw0Gs/GoukHCYbk8Z1Xp14xBHPUodUgMEFzsgvBprgJf4gkrD/z -700eChSalxxpsyDppwBMUSVmSiFSfLeANzmH6ADbmjlpMtDhQ/Y11HfEnBL9uvrA -9cxNy4fVU9wsUmo84u3XxbyTCFMYf93IQBoRu9kdnAP9CMIs8Eix5ZS6p/wOQ9BN -gFRhLnHVxcX2kSe33qXIq8H7l+OTrxChP68BznWx38GJAj0EEwEIACcCGwMFCwkI -BwMFFQoJCAsFFgIDAQACHgECF4AFAlQ2yq0FCQeFDVIACgkQaRgikYuiNxzpBQ/8 -Cihlrd9wwkCEBDU+rPA+xi0VCo+OZ/UBsdCqe0L7dZim3jtc6N9kRMOFzWlilgMr -SlDpYihYr7Ws2CCfdckcQ+zcMcEHiXqROWxqOB4ho+DoDj197pib3PZyyGZGnE8K -e5KeoMG7InCUY4wsfRp9U4/NrocHmd3Umm5HVl7bontkOSOmw85wr+erqoAncnNC -mxj5ZZ8lsP3kjNF/W9OBsg1MFiGPQYlBrxc1EPN6GG0/tTW+tCJTU+J1uhvtcvmf -Sv0YLQPz70vN0KZ0UDe2wp5apenlnyKG1Nhce5dZrF8qVm9Z+RXkoz53+i8StC+D -0dq9+c2/VDCkzrQIP2hWPkQH6jSYxbHAYWH22QF18xdsiPkLZ/cO0oyj+NrKUJCq -z1rMveHRej1xV9zQDACm/9AovtnzaU1AMjqpL+4gQd3za+uimT7q0I64qxXqNmBs -Qdm2PAH3YLZCMP/kYAiM1/Z8PxPjsDdE/0Hi58VwvN9IQ+QtXWMMm/Ne08od7+n1 -4ufFNpIy8JP1Jw84Fy610iqN312AYRpZ2lXPvdDryfKI2gJO6tR1MchQn/MY3B4D -dMoLphp4VeFvAszI8AWUTmOPdpy1k2GuewyTB0UOkWsxVUjpRtuFE9XxpabQhFaO -deNH8d2qvrh78wDQjLVcVb6tKTra4vkYMA1BtsX8lzc= -=IyrL +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 +zW3qmo5y +=pli6 -----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index 0e2c1260..2687b2ed 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 -opts=pgpsigurlmangle=s/$/.asc/ http://sf.net/ijbswa/privoxy-(\d+.*)-(?:stable|beta)-src.tar.gz +opts=pgpsigurlmangle=s/$/.asc/ https://sf.net/ijbswa/privoxy-(\d+.*)-(?:stable|beta)-src.tar.gz -- 2.39.2