Bug#717069: Patch to allow alternatives to dnsutils and host

Thu, 03 Jul 2014 03:22:29 -0700 

Control: tags -1 +patch

Hi LaMont,

here's a set of patches I have prepared to use update-alternatives
for host and dnsutils commands.

Please apply (and update Bind to 9.10.1 in one go when it's out...)

Thanks,
O.
-- 
Ondřej Surý <ond...@sury.org>
Knot DNS (https://www.knot-dns.cz/) – a high-performance DNS server

From f26b5dc017d6c6db7f31a5c154f8b8aed6916306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ond...@sury.org>
Date: Thu, 3 Jul 2014 11:08:57 +0200
Subject: [PATCH 2/2] prepare 1:9.10.0.dfsg~rc2-2 release

---
 debian/changelog |   11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 775c628..d2ae195 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+bind9 (1:9.10.0.dfsg~rc2-2) experimental; urgency=medium
+
+  [ Ondřej Surý ]
+  * Allow alternative dnsutils and host providers
+   + Use update-alternatives to register dnsutils & host
+   + Rename dnsutils package to bind9-dnsutils
+   + Install utilities with bind9- prefix and use update-alternatives to
+     register them as primary providers
+
+ -- Ondřej Surý <ond...@debian.org>  Thu, 03 Jul 2014 11:06:39 +0200
+
 bind9 (1:9.10.0.dfsg~rc2-1) experimental; urgency=low
 
   * New upstream version
-- 
1.7.10.4


From e2a880b3b9daa199597c3ad6f3746a6c85ccf191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ond...@sury.org>
Date: Thu, 3 Jul 2014 10:11:57 +0200
Subject: [PATCH 1/2] Install dnsutils and bind9-host prefixed with bind9 and
 use update-alternatives

---
 debian/bind9-dnsutils.dirs     |    3 +++
 debian/bind9-dnsutils.install  |    6 ++++++
 debian/bind9-dnsutils.postinst |   12 ++++++++++++
 debian/bind9-dnsutils.prerm    |   11 +++++++++++
 debian/bind9-host.install      |    4 ++--
 debian/bind9-host.postinst     |   12 ++++++++++++
 debian/bind9-host.prerm        |   11 +++++++++++
 debian/control                 |   17 +++++++++++++----
 debian/dnsutils.dirs           |    3 ---
 debian/dnsutils.install        |    6 ------
 debian/dnsutils.postinst       |    5 -----
 debian/rules                   |    8 ++++++++
 12 files changed, 78 insertions(+), 20 deletions(-)
 create mode 100644 debian/bind9-dnsutils.dirs
 create mode 100644 debian/bind9-dnsutils.install
 create mode 100644 debian/bind9-dnsutils.postinst
 create mode 100644 debian/bind9-dnsutils.prerm
 create mode 100644 debian/bind9-host.postinst
 create mode 100644 debian/bind9-host.prerm
 delete mode 100644 debian/dnsutils.dirs
 delete mode 100644 debian/dnsutils.install
 delete mode 100644 debian/dnsutils.postinst

diff --git a/debian/bind9-dnsutils.dirs b/debian/bind9-dnsutils.dirs
new file mode 100644
index 0000000..b8d2de1
--- /dev/null
+++ b/debian/bind9-dnsutils.dirs
@@ -0,0 +1,3 @@
+usr/bin
+usr/share/doc/dnsutils
+usr/share/man/man1
diff --git a/debian/bind9-dnsutils.install b/debian/bind9-dnsutils.install
new file mode 100644
index 0000000..9ef7346
--- /dev/null
+++ b/debian/bind9-dnsutils.install
@@ -0,0 +1,6 @@
+usr/bin/bind9-dig
+usr/bin/bind9-nslookup
+usr/bin/bind9-nsupdate
+usr/share/man/man1/bind9-dig.1*
+usr/share/man/man1/bind9-nslookup.1*
+usr/share/man/man1/bind9-nsupdate.1*
diff --git a/debian/bind9-dnsutils.postinst b/debian/bind9-dnsutils.postinst
new file mode 100644
index 0000000..6c4d293
--- /dev/null
+++ b/debian/bind9-dnsutils.postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+mandir=/usr/share/man
+
+for i in dig nsupdate nslookup; do
+    update-alternatives --install /usr/bin/$i $i /usr/bin/bind9-$i 20 \
+	--slave $mandir/man1/$i.1.gz $i.1.gz $mandir/man1/bind9-$i.1.gz
+done
+
+#DEBHELPER#
diff --git a/debian/bind9-dnsutils.prerm b/debian/bind9-dnsutils.prerm
new file mode 100644
index 0000000..a855173
--- /dev/null
+++ b/debian/bind9-dnsutils.prerm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ]; then
+    for i in dig nsupdate nslookup; do
+	update-alternatives --remove $i /usr/bin/bind9-$i
+    done
+fi
+
+#DEBHELPER#
diff --git a/debian/bind9-host.install b/debian/bind9-host.install
index f07a04d..3d7b574 100644
--- a/debian/bind9-host.install
+++ b/debian/bind9-host.install
@@ -1,2 +1,2 @@
-usr/bin/host
-usr/share/man/man1/host.1*
+usr/bin/bind9-host
+usr/share/man/man1/bind9-host.1*
diff --git a/debian/bind9-host.postinst b/debian/bind9-host.postinst
new file mode 100644
index 0000000..49aae93
--- /dev/null
+++ b/debian/bind9-host.postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+mandir=/usr/share/man
+
+for i in host; do
+    update-alternatives --install /usr/bin/$i $i /usr/bin/bind9-$i 20 \
+	--slave $mandir/man1/$i.1.gz $i.1.gz $mandir/man1/bind9-$i.1.gz
+done
+
+#DEBHELPER#
diff --git a/debian/bind9-host.prerm b/debian/bind9-host.prerm
new file mode 100644
index 0000000..94a6e18
--- /dev/null
+++ b/debian/bind9-host.prerm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ]; then
+    for i in host; do
+	update-alternatives --remove $i /usr/bin/bind9-$i
+    done
+fi
+
+#DEBHELPER#
diff --git a/debian/control b/debian/control
index 64ce07b..48634f8 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, debconf | debconf-2.0, netbase, adduser, libdns142 (=${binary:Version}), libisccfg140 (=${binary:Version}), libisc142 (=${binary:Version}), libisccc140 (=${binary:Version}), lsb-base (>= 3.2-14), bind9utils (=${binary:Version}), liblwres140 (=${binary:Version}), libbind9-140 (=${binary:Version}), net-tools
 Conflicts: bind, apparmor-profiles (<< 2.1+1075-0ubuntu4)
 Replaces: bind, dnsutils (<< 1:9.1.0-3), apparmor-profiles (<< 2.1+1075-0ubuntu4), bind9utils (<< 1:9.9.3.dfsg.P2-3)
-Suggests: dnsutils, bind9-doc, resolvconf, ufw
+Suggests: bind9-dnsutils, bind9-doc, resolvconf, ufw
 Description: Internet Domain Name Server
  ${Description}
  .
@@ -44,6 +44,14 @@ Description: Transitional package
  This dummy package is provided for a smooth transition from the previous
  host package.  It may safely be removed after installation.
 
+Package: dnsutils
+Priority: standard
+Architecture: all
+Depends: ${misc:Depends}, bind9-dnsutils
+Description: Transitional package
+ This dummy package is provided for a smooth transition from the previous
+ host package.  It may safely be removed after installation.
+
 Package: bind9-host
 Priority: standard
 Architecture: any
@@ -155,13 +163,14 @@ Description: Config File Handling Library used by BIND
  and clients to read and write ISC-style configuration files like named.conf
  and rndc.conf.
 
-Package: dnsutils
+Package: bind9-dnsutils
 Priority: standard
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, bind9-host | host, libdns142 (=${binary:Version}), libisccfg140 (=${binary:Version}), libisc142 (=${binary:Version}), liblwres140 (=${binary:Version}), libbind9-140 (=${binary:Version})
 Suggests: rblcheck
-Conflicts: netstd (<< 2.00)
-Replaces: bind, bind9 (<< 1:9.1.0-3)
+Conflicts: netstd (<< 2.00), dnsutils (<< 1:9.10.0)
+Replaces: bind, bind9 (<< 1:9.1.0-3), dnsutils (<< 1:9.10.0)
+Provides: dnsutils
 Description: Clients provided with BIND
  ${Description}
  .
diff --git a/debian/dnsutils.dirs b/debian/dnsutils.dirs
deleted file mode 100644
index b8d2de1..0000000
--- a/debian/dnsutils.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/doc/dnsutils
-usr/share/man/man1
diff --git a/debian/dnsutils.install b/debian/dnsutils.install
deleted file mode 100644
index b2515fb..0000000
--- a/debian/dnsutils.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/dig
-usr/bin/nslookup
-usr/bin/nsupdate
-usr/share/man/man1/dig.1*
-usr/share/man/man1/nslookup.1*
-usr/share/man/man1/nsupdate.1*
diff --git a/debian/dnsutils.postinst b/debian/dnsutils.postinst
deleted file mode 100644
index c1fc8b9..0000000
--- a/debian/dnsutils.postinst
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 28c251d..60244fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -130,6 +130,14 @@ install: build
 	install debian/ip-down.d debian/bind9/etc/network/if-down.d/bind9
 	install -m644 debian/bind9.ufw.profile debian/bind9/etc/ufw/applications.d/bind9
 
+	# Install dig, nslookup, nsupdate & host with bind9- prefix
+	for i in dig nsupdate host nslookup; do \
+		mv $(CURDIR)/debian/bind9/usr/bin/$$i \
+		   $(CURDIR)/debian/bind9/usr/bin/bind9-$$i; \
+		mv $(CURDIR)/debian/bind9/usr/share/man/man1/$$i.1 \
+		   $(CURDIR)/debian/bind9/usr/share/man/man1/bind9-$$i.1; \
+	done
+
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -i
-- 
1.7.10.4

Reply via email to