From: Roland Rosenfeld <roland@debian.org>
Date: Fri, 4 Sep 2020 15:47:12 +0000 (+0200)
Subject: Merge Debian changes from unpublished 3.0.28-4 (as of 2020-09-04)
X-Git-Tag: v_3_0_29~163
X-Git-Url: http://www.privoxy.org/gitweb/@default-cgi@/static/developer-manual/@proxy-info-url@?a=commitdiff_plain;h=033e9983e313873b7be2d96d2482d07fbfa93148;p=privoxy.git
Merge Debian changes from unpublished 3.0.28-4 (as of 2020-09-04)
---
diff --git a/debian/changelog b/debian/changelog
index 9a8214ff..4c81ad8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,12 @@ privoxy (3.0.29~gitc62254-1) UNRELEASED; urgency=medium
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.
diff --git a/debian/control b/debian/control
index b7464f8c..9cc22bf1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: optional
Maintainer: Roland Rosenfeld <roland@debian.org>
Build-Depends: autoconf,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
docbook,
docbook-dsssl,
docbook-utils,
diff --git a/debian/patches/05_defaut_action.patch b/debian/patches/05_defaut_action.patch
deleted file mode 100644
index 68053c70..00000000
--- a/debian/patches/05_defaut_action.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.
diff --git a/debian/patches/14_config.patch b/debian/patches/14_config.patch
index 05c39203..2fe3c1c8 100644
--- a/debian/patches/14_config.patch
+++ b/debian/patches/14_config.patch
@@ -1,6 +1,7 @@
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
diff --git a/debian/patches/15_mansection8.patch b/debian/patches/15_mansection8.patch
index f8535e3d..36d064bb 100644
--- a/debian/patches/15_mansection8.patch
+++ b/debian/patches/15_mansection8.patch
@@ -1,6 +1,7 @@
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
diff --git a/debian/patches/17_502_no_such_domain.patch b/debian/patches/17_502_no_such_domain.patch
index da529ffc..b528dfb0 100644
--- a/debian/patches/17_502_no_such_domain.patch
+++ b/debian/patches/17_502_no_such_domain.patch
@@ -3,6 +3,7 @@ Date: Sat, 5 Aug 2006 15:15:17 +0200
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
diff --git a/debian/patches/25_standard_medium.patch b/debian/patches/25_standard_medium.patch
index ba6745c9..d54f32b1 100644
--- a/debian/patches/25_standard_medium.patch
+++ b/debian/patches/25_standard_medium.patch
@@ -2,6 +2,7 @@ From: Roland Rosenfeld <roland@debian.org>
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
diff --git a/debian/patches/27_remove_nsl.patch b/debian/patches/27_remove_nsl.patch
index c317c223..673614b6 100644
--- a/debian/patches/27_remove_nsl.patch
+++ b/debian/patches/27_remove_nsl.patch
@@ -1,6 +1,7 @@
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
diff --git a/debian/patches/32_bind_fixup.patch b/debian/patches/32_bind_fixup.patch
index aeff2720..ab948364 100644
--- a/debian/patches/32_bind_fixup.patch
+++ b/debian/patches/32_bind_fixup.patch
@@ -2,6 +2,7 @@ From: Roland Rosenfeld <roland@debian.org>
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
diff --git a/debian/patches/33_manpage_hyphen.patch b/debian/patches/33_manpage_hyphen.patch
index c79fef3b..492d32ee 100644
--- a/debian/patches/33_manpage_hyphen.patch
+++ b/debian/patches/33_manpage_hyphen.patch
@@ -1,6 +1,7 @@
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
diff --git a/debian/patches/34_system-docbook2man.patch b/debian/patches/34_system-docbook2man.patch
index 55b38072..06fb54f4 100644
--- a/debian/patches/34_system-docbook2man.patch
+++ b/debian/patches/34_system-docbook2man.patch
@@ -2,6 +2,7 @@ From: Roland Rosenfeld <roland@debian.org>
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
diff --git a/debian/patches/35_man-spelling.patch b/debian/patches/35_man-spelling.patch
index 51158f70..3a2f19d0 100644
--- a/debian/patches/35_man-spelling.patch
+++ b/debian/patches/35_man-spelling.patch
@@ -1,6 +1,7 @@
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
diff --git a/debian/patches/38_SOURCE_DATE_EPOCH.patch b/debian/patches/38_SOURCE_DATE_EPOCH.patch
new file mode 100644
index 00000000..554e68a0
--- /dev/null
+++ b/debian/patches/38_SOURCE_DATE_EPOCH.patch
@@ -0,0 +1,17 @@
+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
diff --git a/debian/patches/series b/debian/patches/series
index 505ae47c..7bcaa7d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-05_defaut_action.patch
14_config.patch
15_mansection8.patch
17_502_no_such_domain.patch
@@ -8,3 +7,4 @@
33_manpage_hyphen.patch
34_system-docbook2man.patch
35_man-spelling.patch
+38_SOURCE_DATE_EPOCH.patch
diff --git a/debian/rules b/debian/rules
index 1aff66f0..1a632959 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,7 @@ override_dh_auto_build:
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:
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
deleted file mode 100644
index b7dc52a0..00000000
--- a/debian/salsa-ci.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-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