[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Updating isc-dhcp udeb to dynamically link bind (was: Bug#762762: nmu fixing bind issues)

On Thu, Oct 2, 2014 at 11:05 PM, Cyril Brulebois wrote:
> AFAICT isc-dhcp is only used on non-linux archs, through that part of
> Depends:
>   isc-dhcp-client-udeb [kfreebsd-any hurd-any]
> You definitely want to get porters involved in checking the resulting
> udebs, and I've therefore added them in Cc.

Dear hurd and kfreebsd porters.  I plan to upload the attached patch,
which along with the previous upload introduces a bind udeb, which
will be dynamically linked by the dhcp udeb.  Please let me know if
this looks ok.

> Have you checked possible impact on the installed size? At least
> kfreebsd has been having regular size-related issues, so it might be
> worth checking this point (even if the ramfs tweaks introduced in the
> past few weeks should avoid further issues).

The install size for dhcp+bind linked isn't much different from the
existing size of dhcp+bind embed, which is about 1.8 MB uncompressed.

Best wishes,
diff -u bind9-9.9.5.dfsg/debian/changelog bind9-9.9.5.dfsg/debian/changelog
--- bind9-9.9.5.dfsg/debian/changelog
+++ bind9-9.9.5.dfsg/debian/changelog
@@ -1,3 +1,13 @@
+bind9 (1:9.9.5.dfsg-4.2) unstable; urgency=low
+  * Non-maintainer upload.
+  * Disable parallel build.  Closes: #762766
+  * Set -fno-delete-null-pointer-checks.  Closes: #750760
+  * Fix dependencies for libbind-export-udeb.  Closes: #762762
+  * Don't install configuration files to /usr.  Closes: #762948
+ -- Michael Gilbert <mgilbert@debian.org>  Sun, 28 Sep 2014 02:56:44 +0000
 bind9 (1:9.9.5.dfsg-4.1) unstable; urgency=low
   * Non-maintainer upload.
diff -u bind9-9.9.5.dfsg/debian/control bind9-9.9.5.dfsg/debian/control
--- bind9-9.9.5.dfsg/debian/control
+++ bind9-9.9.5.dfsg/debian/control
@@ -187,9 +187,8 @@
 Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends}
-XC-Package-Type: udeb
+Package-Type: udeb
 Description: Exported BIND libraries for debian-installer
- libbind-export-udeb is a minimal bind package used by the debian-installer.
 Package: libdns-export100
 Section: libs
diff -u bind9-9.9.5.dfsg/debian/rules bind9-9.9.5.dfsg/debian/rules
--- bind9-9.9.5.dfsg/debian/rules
+++ bind9-9.9.5.dfsg/debian/rules
@@ -23,12 +23,13 @@
 OPT = -O2
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-export MAKEFLAGS += -j$(NUMJOBS)
+# parallel build options disabled for #762766
+#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+#NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+#export MAKEFLAGS += -j$(NUMJOBS)
-export CFLAGS=-fno-strict-aliasing -DDIG_SIGCHASE $(DEBUG) $(OPT)
+export CFLAGS=-fno-strict-aliasing -fno-delete-null-pointer-checks -DDIG_SIGCHASE $(DEBUG) $(OPT)
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 EXTRA_FEATURES=--disable-linux-caps --disable-threads
@@ -126,6 +127,7 @@
 	$(MAKE) -C export install DESTDIR=`pwd`/debian/bind9
 	$(MAKE) install DESTDIR=`pwd`/debian/bind9
+	rm -rf debian/bind9/usr/etc
 	rm -f debian/bind9/usr/lib/*.la
 	install -c -o bin -g bin -m 444 debian/db.0 ${ETCBIND}/db.0
 	install -c -o bin -g bin -m 444 debian/db.0 ${ETCBIND}/db.255
@@ -201,6 +203,7 @@
 	dh_fixperms -a
 	dh_makeshlibs -a
 	dh_installdeb -a
+	sed 's/[^ ]*/libbind-export-udeb/'3 debian/*-export*/DEBIAN/shlibs > debian/libbind-export-udeb/DEBIAN/shlibs
 	dh_shlibdeps -a
 	for i in $$(sed -n '/^Package:/s/^.* //p' debian/control); do cat debian/vars.in >> debian/$$i.substvars; done
 	cat debian/vars.in >> debian/substvars

Reply to: