dnsmasq: Update to 2.76test13 with latest patches (001-006)

[ipfire-2.x.git] / src / patches / dnsmasq / 002-Add_--help_to_manpage.patch

diff --git a/src/patches/dnsmasq/002-Add_--help_to_manpage.patch b/src/patches/dnsmasq/002-Add_--help_to_manpage.patch
new file mode 100644 (file)
index 0000000..82de3ee
--- /dev/null
+++ b/src/patches/dnsmasq/002-Add_--help_to_manpage.patch
@@ -0,0 +1,66 @@
+From 09217a1a874c654bfd4d29a1097f44435b4c632d Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Tue, 3 May 2016 17:04:35 +0100
+Subject: [PATCH] Add --help to manpage .
+
+---
+ debian/changelog | 1 +
+ man/dnsmasq.8    | 9 ++++++++-
+ src/option.c     | 2 +-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/debian/changelog b/debian/changelog
+index 8a0341c..e028f57 100644
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -5,6 +5,7 @@ dnsmasq (2.76-1) unstable; urgency=low
+      to avoid problems before /var is mounted. (closes: #800351)
+    * Test for the existance of /usr/share/doc/dnsmasq rather then
+      /etc/dnsmasq.d/README in the daemon startup script. (closes: #819856)
++   * Add --help to manpage and mention dhcp6 in summary. (closes: #821226)
+ 
+  -- Simon Kelley <simon@thekelleys.org.uk>  Thur, 10 Sep 2015 23:07:21 +0000
+ 
+diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
+index fd4b7c5..dacd9ce 100644
+--- a/man/dnsmasq.8
++++ b/man/dnsmasq.8
+@@ -42,6 +42,13 @@ the configuration file.
+ Read and syntax check configuration file(s). Exit with code 0 if all
+ is OK, or a non-zero code otherwise. Do not start up dnsmasq.
+ .TP
++.B \-w, --help
++Display all command-line options. 
++.B --help dhcp 
++will display known DHCPv4 configuration options, and 
++.B --help dhcp6 
++will display DHCPv6 options.
++.TP
+ .B \-h, --no-hosts
+ Don't read the hostnames in /etc/hosts.
+ .TP
+@@ -317,7 +324,7 @@ instead of the correct NXDOMAIN response. This option tells dnsmasq to
+ fake the correct response when it sees this behaviour. As at Sept 2003
+ the IP address being returned by Verisign is 64.94.110.11
+ .TP 
+-.B \-B, --ignore-address=<ipaddr>
++.B --ignore-address=<ipaddr>
+ Ignore replies to A-record queries which include the specified address. 
+ No error is generated, dnsmasq simply continues to listen for another reply. 
+ This is useful to defeat blocking strategies which rely on quickly supplying a
+diff --git a/src/option.c b/src/option.c
+index c66f401..0b35500 100644
+--- a/src/option.c
++++ b/src/option.c
+@@ -402,7 +402,7 @@ static struct {
+   { 'v', 0, NULL, gettext_noop("Display dnsmasq version and copyright information."), NULL },
+   { 'V', ARG_DUP, "<ipaddr>,<ipaddr>,<netmask>", gettext_noop("Translate IPv4 addresses from upstream servers."), NULL },
+   { 'W', ARG_DUP, "<name>,<target>,...", gettext_noop("Specify a SRV record."), NULL },
+-  { 'w', 0, NULL, gettext_noop("Display this message. Use --help dhcp for known DHCP options."), NULL },
++  { 'w', 0, NULL, gettext_noop("Display this message. Use --help dhcp or --help dhcp6 for known DHCP options."), NULL },
+   { 'x', ARG_ONE, "<path>", gettext_noop("Specify path of PID file (defaults to %s)."), RUNFILE },
+   { 'X', ARG_ONE, "<integer>", gettext_noop("Specify maximum number of DHCP leases (defaults to %s)."), "&" },
+   { 'y', OPT_LOCALISE, NULL, gettext_noop("Answer DNS queries based on the interface a query was sent to."), NULL },
+-- 
+2.5.5
+