incorporated upstream.
* d/copyright: use ./ prefix to upstream filenames, because orig.tar.gz
is build with a ./ prefix.
+ * Upgrade to debhelper v13.
+ * Rebuild privoxy-man-page.html.
+ * 38_SOURCE_DATE_EPOCH: Remove hardcoded SOURCE_DATE_EPOCH from
+ configure.in but use the date from debian/changelog.
+ * Remove 05_defaut_action since this is no longer needed.
+ * Tag all patches with Forwarded header.
* Compile --with-mbedtls to allow https-inspection.
* Adapt TLS/SSL settings to Debian FHS.
* Generate dirs with correct permissions for https-inspection.
Priority: optional
Maintainer: Roland Rosenfeld <roland@debian.org>
Build-Depends: autoconf,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
docbook,
docbook-dsssl,
docbook-utils,
+++ /dev/null
-From: Roland Rosenfeld <roland@debian.org>
-Date: Sun, 15 Feb 2009 13:39:10 +0100
-Subject: Several changes/additons to default.action.
-
---- a/default.action.master
-+++ b/default.action.master
-@@ -2462,6 +2462,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
-+#MASTER# REMARKS: Exclude per Debian bug report #441256
-+#MASTER# PROBLEM-URL: http://www.memo.de/
-+www.memo.de
-
- {-filter{unsolicited-popups}}
- # Sticky Actions = -filter{unsolicited-popups}
-@@ -2520,6 +2523,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: multi-page results see http://bugs.debian.org/243245
-+.amazon.de
-+
- {+downgrade-http-version}
- #MASTER# COMMENTS: This section not checked 10/17/06 HB
- #MASTER# REMARKS: This is work-around for CUPS http configuration.
From: Roland Rosenfeld <roland@debian.org>
Date: Fri, 05 Jun 2020 15:51:09 +0200
Subject: Several Debian specific changes to config file
+Forwarded: not-needed
--- a/config
+++ b/config
From: Roland Rosenfeld <roland@debian.org>
Date: Mon, 21 Apr 2003 11:11:31 +0200
Subject: Move man page from man section 1 to man section 8.
+Forwarded: not-needed
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
Subject: 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
+Forwarded: not-needed
--- a/templates/no-such-domain
+++ b/templates/no-such-domain
Date: Sat, 23 Sep 2006 23:37:03 +0200
Subject: Change the global default from standard.Cautious to standard.Medium,
which is similar to the old 3.0.3 behavior and doesn't change too much.
+Forwarded: not-needed
--- a/match-all.action
+++ b/match-all.action
From: Roland Rosenfeld <roland@debian.org>
Date: Sat, 7 Oct 2006 13:12:13 +0200
Subject: Remove unnecessary linking against libnsl.
+Forwarded: not-needed
--- a/configure.in
+++ b/configure.in
Date: Tue, 18 May 2010 10:14:18 +0200
Subject: Work around bind problems on startup (Closes: #534735)
Bug-Debian: https://bugs.debian.org/534735
+Forwarded: not-needed
--- a/jbsockets.c
+++ b/jbsockets.c
From: Roland Rosenfeld <roland@debian.org>
Date: Thu, 24 Jan 2013 17:40:51 +0100
Subject: Replace all -- in man page by \-\- to make lintian happy.
+Forwarded: not-needed
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
Date: Sat, 19 Sep 2015 15:05:41 +0200
Subject: Use Debian docbook2man-spec.pl (from docbook-utils) instead of local
copy, to make package reproducible.
+Forwarded: not-needed
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
From: Roland Rosenfeld <roland@debian.org>
Date: Sun, 1 May 2016 14:21:22 +0200
Subject: Fix typo in man page privoxy-log-parser(1)
+Forwarded: not-needed
--- a/tools/privoxy-log-parser.pl
+++ b/tools/privoxy-log-parser.pl
--- /dev/null
+From: Roland Rosenfeld <roland@debian.org>
+Date: Fri, 04 Sep 2020 16:30:48 +0200
+Subject: Remove hardcoded SOURCE_DATE_EPOCH from configure.in but use the date
+ from debian/changelog.
+Forwarded: not-necessary
+
+--- a/configure.in
++++ b/configure.in
+@@ -81,7 +81,7 @@ CODE_STATUS="stable"
+
+ dnl Timestamp (date +%s) used by the mtree-spec target.
+ dnl Should be updated before releases but forgetting it isn't critical.
+-SOURCE_DATE_EPOCH=1545411710
++dnl SOURCE_DATE_EPOCH=1545411710
+
+ dnl CODE_STATUS can be "alpha", "beta", "stable" or "UNRELEASED",
+ dnl and will be used for CGI output. Increment version number and
-05_defaut_action.patch
14_config.patch
15_mansection8.patch
17_502_no_such_domain.patch
33_manpage_hyphen.patch
34_system-docbook2man.patch
35_man-spelling.patch
+38_SOURCE_DATE_EPOCH.patch
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
+ env -u LANG LC_ALL=C.UTF-8 $(MAKE) man2html
override_dh_auto_clean:
# restore auto build documentation from source package:
+++ /dev/null
-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