From: Christian Hofstaedtler Date: Mon, 6 Jun 2016 18:59:56 +0000 (+0200) Subject: Rename notify to pdns_notify to avoid conflicts X-Git-Tag: rec-4.0.0-rc1~6^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3931%2Fhead;p=thirdparty%2Fpdns.git Rename notify to pdns_notify to avoid conflicts Note that this does not change regression-tests.recursor for now, because that needs a newer pdns-tools deb. --- diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm index d90dd66260..e9647f1e0c 100755 --- a/build-scripts/build-auth-rpm +++ b/build-scripts/build-auth-rpm @@ -243,7 +243,7 @@ fi %{_bindir}/dnswasher %{_bindir}/dumresp %{_bindir}/ixplore -%{_bindir}/notify +%{_bindir}/pdns_notify %{_bindir}/nproxy %{_bindir}/nsec3dig %{_bindir}/saxfr @@ -258,7 +258,7 @@ fi %{_mandir}/man1/dnswasher.1.gz %{_mandir}/man1/dumresp.1.gz %{_mandir}/man1/ixplore.1.gz -%{_mandir}/man1/notify.1.gz +%{_mandir}/man1/pdns_notify.1.gz %{_mandir}/man1/nproxy.1.gz %{_mandir}/man1/nsec3dig.1.gz %{_mandir}/man1/saxfr.1.gz @@ -519,7 +519,7 @@ exit 0 %{_bindir}/dnswasher %{_bindir}/dumresp %{_bindir}/ixplore -%{_bindir}/notify +%{_bindir}/pdns_notify %{_bindir}/nproxy %{_bindir}/nsec3dig %{_bindir}/saxfr @@ -534,7 +534,7 @@ exit 0 %{_mandir}/man1/dnswasher.1.gz %{_mandir}/man1/dumresp.1.gz %{_mandir}/man1/ixplore.1.gz -%{_mandir}/man1/notify.1.gz +%{_mandir}/man1/pdns_notify.1.gz %{_mandir}/man1/nproxy.1.gz %{_mandir}/man1/nsec3dig.1.gz %{_mandir}/man1/saxfr.1.gz @@ -779,7 +779,7 @@ exit 0 %{_bindir}/dnswasher %{_bindir}/dumresp %{_bindir}/ixplore -%{_bindir}/notify +%{_bindir}/pdns_notify %{_bindir}/nproxy %{_bindir}/nsec3dig %{_bindir}/saxfr @@ -794,7 +794,7 @@ exit 0 %{_mandir}/man1/dnswasher.1.gz %{_mandir}/man1/dumresp.1.gz %{_mandir}/man1/ixplore.1.gz -%{_mandir}/man1/notify.1.gz +%{_mandir}/man1/pdns_notify.1.gz %{_mandir}/man1/nproxy.1.gz %{_mandir}/man1/nsec3dig.1.gz %{_mandir}/man1/saxfr.1.gz diff --git a/build-scripts/debian-authoritative/pdns-tools.install b/build-scripts/debian-authoritative/pdns-tools.install index d16e803f8c..dd9d70c4f1 100644 --- a/build-scripts/debian-authoritative/pdns-tools.install +++ b/build-scripts/debian-authoritative/pdns-tools.install @@ -8,8 +8,8 @@ usr/bin/dnstcpbench usr/bin/dnswasher usr/bin/dumresp usr/bin/ixplore -usr/bin/notify usr/bin/nproxy usr/bin/nsec3dig +usr/bin/pdns_notify usr/bin/saxfr usr/bin/sdig diff --git a/build-scripts/debian-authoritative/pdns-tools.manpages b/build-scripts/debian-authoritative/pdns-tools.manpages index 49ffa00100..afbafe82f8 100644 --- a/build-scripts/debian-authoritative/pdns-tools.manpages +++ b/build-scripts/debian-authoritative/pdns-tools.manpages @@ -8,8 +8,8 @@ debian/tmp/usr/share/man/man1/dnstcpbench.1 debian/tmp/usr/share/man/man1/dnswasher.1 debian/tmp/usr/share/man/man1/dumresp.1 debian/tmp/usr/share/man/man1/ixplore.1 -debian/tmp/usr/share/man/man1/notify.1 debian/tmp/usr/share/man/man1/nproxy.1 debian/tmp/usr/share/man/man1/nsec3dig.1 +debian/tmp/usr/share/man/man1/pdns_notify.1 debian/tmp/usr/share/man/man1/saxfr.1 debian/tmp/usr/share/man/man1/sdig.1 diff --git a/build-scripts/test-auth b/build-scripts/test-auth index db14644717..aa2e5e0692 100755 --- a/build-scripts/test-auth +++ b/build-scripts/test-auth @@ -19,7 +19,7 @@ export PDNS=/usr/sbin/pdns_server export PDNS2=$PDNS export SDIG=/usr/bin/sdig export NSEC3DIG=/usr/bin/nsec3dig -export NOTIFY=/usr/bin/notify +export NOTIFY=/usr/bin/pdns_notify export SAXFR=/usr/bin/saxfr export ZONE2SQL=/usr/bin/zone2sql export PDNSUTIL=/usr/bin/pdnsutil diff --git a/docs/Makefile.am b/docs/Makefile.am index 179a241f03..0b3ffe3886 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -15,7 +15,7 @@ MANPAGES_TARGET_TOOLS = calidns.1 \ dnswasher.1 \ dumresp.1 \ ixplore.1 \ - notify.1 \ + pdns_notify.1 \ nproxy.1 \ nsec3dig.1 \ saxfr.1 \ diff --git a/docs/manpages/notify.1.md b/docs/manpages/notify.1.md deleted file mode 100644 index 166bccaf3e..0000000000 --- a/docs/manpages/notify.1.md +++ /dev/null @@ -1,16 +0,0 @@ -% NOTIFY(1) -% PowerDNS.com BV -% April 2016 - -# NAME -**notify** - A simple DNS NOTIFY sender - -# SYNOPSIS -**notify** *IP_ADDRESS*[:*PORT*] *DOMAIN* - -# DESCRIPTION -**notify** sends a DNS NOTIFY message to *IP_ADDRESS*, by default on port 53, for -*DOMAIN* and prints the remote nameserver's response. - -# OPTIONS -None diff --git a/docs/manpages/pdns_notify.1.md b/docs/manpages/pdns_notify.1.md new file mode 100644 index 0000000000..f189240935 --- /dev/null +++ b/docs/manpages/pdns_notify.1.md @@ -0,0 +1,16 @@ +% PDNS_NOTIFY(1) +% PowerDNS.com BV +% April 2016 + +# NAME +**pdns_notify** - A simple DNS NOTIFY sender + +# SYNOPSIS +**pdns_notify** *IP_ADDRESS*[:*PORT*] *DOMAIN* + +# DESCRIPTION +**pdns_notify** sends a DNS NOTIFY message to *IP_ADDRESS*, by default on port 53, for +*DOMAIN* and prints the remote nameserver's response. + +# OPTIONS +None diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 6294f5d7dd..c42674a6f0 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -98,7 +98,7 @@ pages: - 'Manpage: dnstcpbench.1': manpages/dnstcpbench.1.md - 'Manpage: dnswasher.1': manpages/dnswasher.1.md - 'Manpage: ixplore.1': manpages/ixplore.1.md - - 'Manpage: notify.1': manpages/notify.1.md + - 'Manpage: pdns_notify.1': manpages/pdns_notify.1.md - 'Manpage: nproxy.1': manpages/nproxy.1.md - 'Manpage: nsec3dig.1': manpages/nsec3dig.1.md - 'Manpage: saxfr.1': manpages/saxfr.1.md diff --git a/pdns/.gitignore b/pdns/.gitignore index 2f5bc3fa63..e48ccf4081 100644 --- a/pdns/.gitignore +++ b/pdns/.gitignore @@ -31,7 +31,7 @@ /dnswasher /ixplore /kvresp -/notify +/pdns_notify /nproxy /speedtest /tcpbench diff --git a/pdns/Makefile.am b/pdns/Makefile.am index 7332a7c80f..de08741b18 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -86,7 +86,7 @@ bin_PROGRAMS += \ dnstcpbench \ dnswasher \ dumresp \ - notify \ + pdns_notify \ nproxy \ nsec3dig \ saxfr \ @@ -114,7 +114,7 @@ EXTRA_PROGRAMS = \ dumresp \ kvresp \ ixplore \ - notify \ + pdns_notify \ nproxy \ nsec3dig \ saxfr \ @@ -923,7 +923,7 @@ nproxy_LDADD = \ $(OPENSSL_LIBS) \ $(BOOST_PROGRAM_OPTIONS_LIBS) -notify_SOURCES = \ +pdns_notify_SOURCES = \ arguments.cc \ base32.cc \ base64.cc base64.hh \ @@ -944,12 +944,12 @@ notify_SOURCES = \ statbag.cc \ unix_utility.cc -notify_LDFLAGS = \ +pdns_notify_LDFLAGS = \ $(AM_LDFLAGS) \ $(OPENSSL_LDFLAGS) \ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) -notify_LDADD = \ +pdns_notify_LDADD = \ $(OPENSSL_LIBS) \ $(BOOST_PROGRAM_OPTIONS_LIBS) diff --git a/pdns/notify.cc b/pdns/notify.cc index c07514c2f0..1d7b22f423 100644 --- a/pdns/notify.cc +++ b/pdns/notify.cc @@ -32,7 +32,7 @@ ArgvMap &arg() } void usage() { - cerr<<"Syntax: notify IP_ADDRESS[:PORT] DOMAIN"<