control: tag -1 patch, pending Hi, I've uploaded an nmu to delayed/3 fixing these two issues in bind. Please let me know if I should delay longer.
Best wishes, Mike
diff -u bind9-9.9.5.dfsg/configure.in bind9-9.9.5.dfsg/configure.in --- bind9-9.9.5.dfsg/configure.in +++ bind9-9.9.5.dfsg/configure.in @@ -1655,7 +1655,6 @@ ;; *) AC_CHECK_LIB(socket, socket) - AC_CHECK_LIB(nsl, inet_addr) ;; esac 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,11 @@ +bind9 (1:9.9.5.dfsg-4.4) unstable; urgency=medium + + * Non-maintainer upload. + * Avoid libnsl dependency on non-linux architectures. Closes: #766430 + * Install export libraries to /lib instead of /usr/lib. Closes: #766544 + + -- Michael Gilbert <mgilb...@debian.org> Tue, 28 Oct 2014 03:37:48 +0000 + bind9 (1:9.9.5.dfsg-4.3) unstable; urgency=medium * 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 @@ -185,6 +185,7 @@ Package: libdns-export100 Section: libs Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Exported DNS Shared Library ${Description} @@ -201,6 +202,7 @@ Package: libisc-export95 Section: libs Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Exported ISC Shared Library ${Description} @@ -217,6 +219,7 @@ Package: libisccfg-export90 Section: libs Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Exported ISC CFG Shared Library ${Description} @@ -233,6 +236,7 @@ Package: libirs-export91 Section: libs Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Exported IRS Shared Library ${Description} diff -u bind9-9.9.5.dfsg/debian/libbind-export-dev.install bind9-9.9.5.dfsg/debian/libbind-export-dev.install --- bind9-9.9.5.dfsg/debian/libbind-export-dev.install +++ bind9-9.9.5.dfsg/debian/libbind-export-dev.install @@ -1,3 +1,3 @@ -usr/lib/*-export.a -usr/lib/*-export.so +usr/lib/*/*.a +usr/lib/*/*.so usr/include/bind-export diff -u bind9-9.9.5.dfsg/debian/libdns-export100-udeb.install bind9-9.9.5.dfsg/debian/libdns-export100-udeb.install --- bind9-9.9.5.dfsg/debian/libdns-export100-udeb.install +++ bind9-9.9.5.dfsg/debian/libdns-export100-udeb.install @@ -1 +1 @@ -usr/lib/libdns-export*.so.* +lib/*/libdns-export.so.* diff -u bind9-9.9.5.dfsg/debian/libdns-export100.install bind9-9.9.5.dfsg/debian/libdns-export100.install --- bind9-9.9.5.dfsg/debian/libdns-export100.install +++ bind9-9.9.5.dfsg/debian/libdns-export100.install @@ -1 +1 @@ -usr/lib/libdns-export.so.* +lib/*/libdns-export.so.* diff -u bind9-9.9.5.dfsg/debian/libirs-export91-udeb.install bind9-9.9.5.dfsg/debian/libirs-export91-udeb.install --- bind9-9.9.5.dfsg/debian/libirs-export91-udeb.install +++ bind9-9.9.5.dfsg/debian/libirs-export91-udeb.install @@ -1 +1 @@ -usr/lib/libirs-export*.so.* +lib/*/libirs-export.so.* diff -u bind9-9.9.5.dfsg/debian/libirs-export91.install bind9-9.9.5.dfsg/debian/libirs-export91.install --- bind9-9.9.5.dfsg/debian/libirs-export91.install +++ bind9-9.9.5.dfsg/debian/libirs-export91.install @@ -1 +1 @@ -usr/lib/libirs-export.so.* +lib/*/libirs-export.so.* diff -u bind9-9.9.5.dfsg/debian/libisc-export95-udeb.install bind9-9.9.5.dfsg/debian/libisc-export95-udeb.install --- bind9-9.9.5.dfsg/debian/libisc-export95-udeb.install +++ bind9-9.9.5.dfsg/debian/libisc-export95-udeb.install @@ -1 +1 @@ -usr/lib/libisc-export*.so.* +lib/*/libisc-export.so.* diff -u bind9-9.9.5.dfsg/debian/libisc-export95.install bind9-9.9.5.dfsg/debian/libisc-export95.install --- bind9-9.9.5.dfsg/debian/libisc-export95.install +++ bind9-9.9.5.dfsg/debian/libisc-export95.install @@ -1 +1 @@ -usr/lib/libisc-export.so.* +lib/*/libisc-export.so.* diff -u bind9-9.9.5.dfsg/debian/libisccfg-export90-udeb.install bind9-9.9.5.dfsg/debian/libisccfg-export90-udeb.install --- bind9-9.9.5.dfsg/debian/libisccfg-export90-udeb.install +++ bind9-9.9.5.dfsg/debian/libisccfg-export90-udeb.install @@ -1 +1 @@ -usr/lib/libisccfg-export*.so.* +lib/*/libisccfg-export.so.* diff -u bind9-9.9.5.dfsg/debian/libisccfg-export90.install bind9-9.9.5.dfsg/debian/libisccfg-export90.install --- bind9-9.9.5.dfsg/debian/libisccfg-export90.install +++ bind9-9.9.5.dfsg/debian/libisccfg-export90.install @@ -1 +1 @@ -usr/lib/libisccfg-export.so.* +lib/*/libisccfg-export.so.* 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 @@ -54,7 +54,7 @@ --enable-exportlib \ --with-libtool \ --with-gssapi=no \ - --with-export-libdir=\$${prefix}/lib \ + --with-export-libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --with-export-includedir=\$${prefix}/include/bind-export ./configure --prefix=/usr \ --mandir=\$${prefix}/share/man \ @@ -127,7 +127,13 @@ $(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 + find debian/bind9 -name \*.la -execdir rm -f {} \; + mkdir -p debian/bind9/lib/$(DEB_HOST_MULTIARCH) + mv debian/bind9/usr/lib/$(DEB_HOST_MULTIARCH)/*-export.so.* debian/bind9/lib/$(DEB_HOST_MULTIARCH) + cd debian/bind9/usr/lib/$(DEB_HOST_MULTIARCH) && for link in *.so; do \ + file=$$(readlink $$link); \ + ln -sf ../../../lib/$(DEB_HOST_MULTIARCH)/$$file $$link; \ + done 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 install -c -o bin -g bin -m 444 debian/db.empty ${ETCBIND}