src/patches/dnsmasq/002-Add_--help_to_manpage.patch

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