From: Tomas Krizek Date: Fri, 23 Feb 2018 12:09:52 +0000 (+0100) Subject: debian: rebase patches X-Git-Tag: v2.2.0~16^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a5865ea972292be804df8ad60704fe7b60a1780;p=thirdparty%2Fknot-resolver.git debian: rebase patches --- diff --git a/distro/debian/debian/patches/0001-avoid-shipping-duplicate-root.hints-and-icann-ca.pem.patch b/distro/debian/debian/patches/0001-avoid-shipping-duplicate-root.hints-and-icann-ca.pem.patch index 7ffbe6fb5..1012e1076 100644 --- a/distro/debian/debian/patches/0001-avoid-shipping-duplicate-root.hints-and-icann-ca.pem.patch +++ b/distro/debian/debian/patches/0001-avoid-shipping-duplicate-root.hints-and-icann-ca.pem.patch @@ -6,10 +6,10 @@ Subject: avoid shipping duplicate root.hints and icann-ca.pem etc/etc.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/etc/etc.mk b/etc/etc.mk -index 7aa6cb6..fa9e008 100644 ---- a/etc/etc.mk -+++ b/etc/etc.mk +Index: knot-resolver/etc/etc.mk +=================================================================== +--- knot-resolver.orig/etc/etc.mk ++++ knot-resolver/etc/etc.mk @@ -1,9 +1,9 @@ -etc_SOURCES := icann-ca.pem \ +etc_SOURCES := \ @@ -22,4 +22,4 @@ index 7aa6cb6..fa9e008 100644 + etc-install: $(DESTDIR)$(ETCDIR) - $(INSTALL) -m 0640 $(addprefix etc/,$(etc_SOURCES)) $(DESTDIR)$(ETCDIR) + $(INSTALL) -m 0644 $(addprefix etc/,$(etc_SOURCES)) $(DESTDIR)$(ETCDIR) diff --git a/distro/debian/debian/patches/0002-Update-documentation-of-keyfile-ro.patch b/distro/debian/debian/patches/0002-Update-documentation-of-keyfile-ro.patch index 75735bfcc..0c2da1d8b 100644 --- a/distro/debian/debian/patches/0002-Update-documentation-of-keyfile-ro.patch +++ b/distro/debian/debian/patches/0002-Update-documentation-of-keyfile-ro.patch @@ -9,10 +9,10 @@ option less scary-sounding, as it is the default. doc/kresd.8.in | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -diff --git a/doc/kresd.8.in b/doc/kresd.8.in -index cbf7252..7f73876 100644 ---- a/doc/kresd.8.in -+++ b/doc/kresd.8.in +Index: knot-resolver/doc/kresd.8.in +=================================================================== +--- knot-resolver.orig/doc/kresd.8.in ++++ knot-resolver/doc/kresd.8.in @@ -24,7 +24,7 @@ .IR config ] .RB [ \-k | \-\-keyfile @@ -22,7 +22,7 @@ index cbf7252..7f73876 100644 .IR keyfile ] .RB [ \-m | \-\-moduledir .IR path ] -@@ -123,7 +123,7 @@ file at the default location (\fIconfig\fR). The syntax is +@@ -123,7 +123,7 @@ file at the default location (\fIconfig\ described in \fIdaemon/README.md\fR. .TP .B \-k\fI keyfile\fR, \fB\-\-keyfile=\fI @@ -31,7 +31,7 @@ index cbf7252..7f73876 100644 Root trust anchors in this file are managed using standard RFC 5011 (Automated Updates of DNS Security Trust Anchors). Kresd needs write access to the directory containing the keyfile. -@@ -133,10 +133,13 @@ and warning that you need to to check the key before trusting it will be issued. +@@ -133,10 +133,13 @@ and warning that you need to to check th The file contains DNSKEY/DS records in presentation format, and is compatible with Unbound and BIND 9 root key files. .TP diff --git a/distro/debian/debian/patches/0003-look-for-modules-in-python3.patch b/distro/debian/debian/patches/0003-look-for-modules-in-python3.patch index ab8abe899..a7ee39765 100644 --- a/distro/debian/debian/patches/0003-look-for-modules-in-python3.patch +++ b/distro/debian/debian/patches/0003-look-for-modules-in-python3.patch @@ -8,10 +8,10 @@ python 2.7. This is what the executable is named in debian. platform.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/platform.mk b/platform.mk -index 170269c..63a305d 100644 ---- a/platform.mk -+++ b/platform.mk +Index: knot-resolver/platform.mk +=================================================================== +--- knot-resolver.orig/platform.mk ++++ knot-resolver/platform.mk @@ -200,7 +200,7 @@ endef # Find Python package