Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: bind9

bind9 (1:9.11.5.P1+dfsg-1ubuntu1) disco; urgency=medium * Merge with Debian unstable. Remaining changes: - Build without lmdb support as that package is in Universe - Don't build dnstap as it depends on universe packages: + d/control: drop build-depends on libfstrm-dev, libprotobuf-c-dev and protobuf-c-compiler (universe packages) + d/dnsutils.install: don't install dnstap + d/libdns1104.symbols: don't include dnstap symbols + d/rules: don't build dnstap nor install dnstap.proto - d/p/enable-udp-in-host-command.diff: fix parsing of the -U command line option (LP #1804648) - d/p/fix-shutdown-race.diff: dig/host/nslookup could crash when interrupted close to a query timeout (LP #1797926) - d/t/simpletest: drop the internetsociety.org test as it requires network egress access that is not available in the Ubuntu autopkgtest farm. -- Andreas Hasenack <andreas@canonical.com> Thu, 17 Jan 2019 18:59:25 -0200

Modifications :
  1. Download patch debian/patches/fix-shutdown-race.diff

    --- 1:9.11.5.P1+dfsg-1/debian/patches/fix-shutdown-race.diff 1970-01-01 00:00:00.000000000 +0000 +++ 1:9.11.5.P1+dfsg-1ubuntu1/debian/patches/fix-shutdown-race.diff 2019-01-17 20:59:25.000000000 +0000 @@ -0,0 +1,41 @@ +From f2ca287330110993609fa0443d3bdb17629bd979 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org> +Date: Tue, 13 Nov 2018 13:50:47 +0100 +Subject: [PATCH 1/2] Fix a shutdown race in bin/dig/dighost.c + +If a tool using the routines defined in bin/dig/dighost.c is sent an +interruption signal around the time a connection timeout is scheduled to +fire, connect_timeout() may be executed after destroy_libs() detaches +from the global task (setting 'global_task' to NULL), which results in a +crash upon a UDP retry due to bringup_timer() attempting to create a +timer with 'task' set to NULL. Fix by preventing connect_timeout() from +attempting a retry when shutdown is in progress. + +(cherry picked from commit 462175659674a10c0d39c7c328f1a5324ce2e38b) + +Origin: https://gitlab.isc.org/isc-projects/bind9/merge_requests/1040/diffs +Bug: https://gitlab.isc.org/isc-projects/bind9/issues/599 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bind9/+bug/1797926 +Last-Update: 2018-12-06 + +--- + bin/dig/dighost.c | 5 +++++ + 1 file changed, 5 insertions(+) +diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c +index 39abb9d0fd..17e0328228 100644 +--- a/bin/dig/dighost.c ++++ b/bin/dig/dighost.c +@@ -3240,6 +3240,11 @@ connect_timeout(isc_task_t *task, isc_event_t *event) { + + INSIST(!free_now); + ++ if (cancel_now) { ++ UNLOCK_LOOKUP; ++ return; ++ } ++ + if ((query != NULL) && (query->lookup->current_query != NULL) && + ISC_LINK_LINKED(query->lookup->current_query, link) && + (ISC_LIST_NEXT(query->lookup->current_query, link) != NULL)) { +-- +2.18.1
  2. Download patch debian/patches/enable-udp-in-host-command.diff

    --- 1:9.11.5.P1+dfsg-1/debian/patches/enable-udp-in-host-command.diff 1970-01-01 00:00:00.000000000 +0000 +++ 1:9.11.5.P1+dfsg-1ubuntu1/debian/patches/enable-udp-in-host-command.diff 2019-01-17 20:59:25.000000000 +0000 @@ -0,0 +1,26 @@ +Description: Fix parsing of host(1)'s -U command line option +Author: Andreas Hasenack <andreas@canonical.com> +Bug: https://gitlab.isc.org/isc-projects/bind9/issues/769 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bind9/+bug/1804648 +Applied-Upstream: https://gitlab.isc.org/isc-projects/bind9/commit/5e2cd91321cdda1707411c4e268d364f03f63935 +Last-Update: 2018-12-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/bin/dig/host.c ++++ b/bin/dig/host.c +@@ -158,6 +158,7 @@ + " -s a SERVFAIL response should stop query\n" + " -t specifies the query type\n" + " -T enables TCP/IP mode\n" ++" -U enables UDP mode\n" + " -v enables verbose output\n" + " -V print version number and exit\n" + " -w specifies to wait forever for a reply\n" +@@ -657,6 +658,7 @@ + case 'N': break; + case 'R': break; + case 'T': break; ++ case 'U': break; + case 'W': break; + default: + show_usage();
  3. Download patch debian/rules

    --- 1:9.11.5.P1+dfsg-1/debian/rules 2018-12-18 13:59:25.000000000 +0000 +++ 1:9.11.5.P1+dfsg-1ubuntu1/debian/rules 2019-01-17 20:59:25.000000000 +0000 @@ -91,7 +91,7 @@ override_dh_auto_configure: --with-gssapi=/usr \ --with-libidn2 \ --with-libjson=/usr \ - --with-lmdb=/usr \ + --without-lmdb \ --with-gnu-ld \ --with-geoip=/usr \ --with-atf=no \ @@ -101,7 +101,6 @@ override_dh_auto_configure: --enable-native-pkcs11 \ --with-pkcs11=\$${prefix}/lib/softhsm/libsofthsm2.so \ --with-randomdev=/dev/urandom \ - --enable-dnstap \ --with-eddsa=no \ $(EXTRA_FEATURES) dh_auto_configure -B build-udeb -- \ @@ -128,8 +127,6 @@ override_dh_auto_configure: # no need to build these targets here sed -i 's/dnssec-pkcs11//;s/named-pkcs11//' build-udeb/bin/Makefile sed -i 's/dns-pkcs11//;s/isc-pkcs11//' build-udeb/lib/Makefile - cp lib/dns/dnstap.proto build/lib/dns - cp lib/dns-pkcs11/dnstap.proto build/lib/dns-pkcs11 override_dh_auto_build: dh_auto_build -B build
  4. Download patch debian/control

    --- 1:9.11.5.P1+dfsg-1/debian/control 2018-12-18 13:59:25.000000000 +0000 +++ 1:9.11.5.P1+dfsg-1ubuntu1/debian/control 2019-01-17 20:59:25.000000000 +0000 @@ -1,7 +1,8 @@ Source: bind9 Section: net Priority: optional -Maintainer: Debian DNS Team <team+dns@tracker.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian DNS Team <team+dns@tracker.debian.org> Uploaders: LaMont Jones <lamont@debian.org>, Michael Gilbert <mgilbert@debian.org>, Robie Basak <robie.basak@canonical.com>, @@ -15,18 +16,14 @@ Build-Depends: bison, dpkg-dev (>= 1.16.1~), libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdb-dev (>>4.6), - libfstrm-dev, libgeoip-dev (>= 1.4.6.dfsg-5), libidn2-dev, libjson-c-dev, libkrb5-dev, libldap2-dev, - liblmdb-dev, - libprotobuf-c-dev, libssl-dev, libtool, libxml2-dev, - protobuf-c-compiler, python3, python3-distutils, python3-ply
  5. Download patch debian/tests/simpletest

    --- 1:9.11.5.P1+dfsg-1/debian/tests/simpletest 2018-12-18 13:59:25.000000000 +0000 +++ 1:9.11.5.P1+dfsg-1ubuntu1/debian/tests/simpletest 2019-01-17 20:59:25.000000000 +0000 @@ -10,10 +10,6 @@ setup() { run() { # Make a query against a local zone dig -x 127.0.0.1 @127.0.0.1 - - # Make a query against an external nameserver and check for DNSSEC validation - echo "Checking for DNSSEC validation status of internetsociety.org" - dig -t a internetsociety.org @127.0.0.1 | egrep 'flags:.+ad; QUERY' } teardown() {
  6. Download patch debian/patches/series

    --- 1:9.11.5.P1+dfsg-1/debian/patches/series 2018-12-18 13:59:25.000000000 +0000 +++ 1:9.11.5.P1+dfsg-1ubuntu1/debian/patches/series 2019-01-17 20:59:25.000000000 +0000 @@ -8,3 +8,5 @@ 80_reproducible_build.diff Add_--install-layout=deb_to_setup.py_call.patch skip-rtld-deepbind-for-dyndb.diff +enable-udp-in-host-command.diff +fix-shutdown-race.diff
  7. Download patch debian/bind9.install

    --- 1:9.11.5.P1+dfsg-1/debian/bind9.install 2018-12-18 13:59:25.000000000 +0000 +++ 1:9.11.5.P1+dfsg-1ubuntu1/debian/bind9.install 2019-01-17 20:59:25.000000000 +0000 @@ -16,7 +16,6 @@ usr/sbin/genrandom usr/sbin/isc-hmac-fixup usr/sbin/named usr/sbin/named-journalprint -usr/sbin/named-nzd2nzf usr/sbin/named-pkcs11 usr/sbin/nsec3hash usr/sbin/tsig-keygen @@ -32,7 +31,6 @@ usr/share/man/man8/dnssec-importkey.8 usr/share/man/man8/genrandom.8 usr/share/man/man8/isc-hmac-fixup.8 usr/share/man/man8/named-journalprint.8 -usr/share/man/man8/named-nzd2nzf.8 usr/share/man/man8/named.8 usr/share/man/man8/nsec3hash.8 usr/share/man/man8/tsig-keygen.8
  8. Download patch debian/libdns1104.symbols

    --- 1:9.11.5.P1+dfsg-1/debian/libdns1104.symbols 2018-12-18 13:59:25.000000000 +0000 +++ 1:9.11.5.P1+dfsg-1ubuntu1/debian/libdns1104.symbols 2019-01-17 20:59:25.000000000 +0000 @@ -358,21 +358,6 @@ libdns-pkcs11.so.1104 libdns1104 #MINVER dns_dsdigest_format@Base 1:9.11.3+dfsg dns_dsdigest_fromtext@Base 1:9.11.3+dfsg dns_dsdigest_totext@Base 1:9.11.3+dfsg - dns_dt_attach@Base 1:9.11.4+dfsg-2 - dns_dt_close@Base 1:9.11.4+dfsg-2 - dns_dt_create@Base 1:9.11.4+dfsg-2 - dns_dt_datatotext@Base 1:9.11.4+dfsg-2 - dns_dt_detach@Base 1:9.11.4+dfsg-2 - dns_dt_getframe@Base 1:9.11.4+dfsg-2 - dns_dt_getstats@Base 1:9.11.4+dfsg-2 - dns_dt_open@Base 1:9.11.4+dfsg-2 - dns_dt_parse@Base 1:9.11.4+dfsg-2 - dns_dt_reopen@Base 1:9.11.4+dfsg-2 - dns_dt_send@Base 1:9.11.4+dfsg-2 - dns_dt_setidentity@Base 1:9.11.4+dfsg-2 - dns_dt_setversion@Base 1:9.11.4+dfsg-2 - dns_dt_shutdown@Base 1:9.11.4+dfsg-2 - dns_dtdata_free@Base 1:9.11.4+dfsg-2 dns_dumpctx_attach@Base 1:9.11.3+dfsg dns_dumpctx_cancel@Base 1:9.11.3+dfsg dns_dumpctx_db@Base 1:9.11.3+dfsg @@ -1443,24 +1428,6 @@ libdns-pkcs11.so.1104 libdns1104 #MINVER dns_zt_setviewcommit@Base 1:9.11.3+dfsg dns_zt_setviewrevert@Base 1:9.11.3+dfsg dns_zt_unmount@Base 1:9.11.3+dfsg - dnstap__dnstap__descriptor@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__free_unpacked@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__get_packed_size@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__init@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__pack@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__pack_to_buffer@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__type__descriptor@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__unpack@Base 1:9.11.4+dfsg-2 - dnstap__message__descriptor@Base 1:9.11.4+dfsg-2 - dnstap__message__free_unpacked@Base 1:9.11.4+dfsg-2 - dnstap__message__get_packed_size@Base 1:9.11.4+dfsg-2 - dnstap__message__init@Base 1:9.11.4+dfsg-2 - dnstap__message__pack@Base 1:9.11.4+dfsg-2 - dnstap__message__pack_to_buffer@Base 1:9.11.4+dfsg-2 - dnstap__message__type__descriptor@Base 1:9.11.4+dfsg-2 - dnstap__message__unpack@Base 1:9.11.4+dfsg-2 - dnstap__socket_family__descriptor@Base 1:9.11.4+dfsg-2 - dnstap__socket_protocol__descriptor@Base 1:9.11.4+dfsg-2 dst__entropy_getdata@Base 1:9.11.3+dfsg dst__entropy_status@Base 1:9.11.3+dfsg dst__gssapi_init@Base 1:9.11.3+dfsg @@ -1940,21 +1907,6 @@ libdns.so.1104 libdns1104 #MINVER# dns_dsdigest_format@Base 1:9.11.3+dfsg dns_dsdigest_fromtext@Base 1:9.11.3+dfsg dns_dsdigest_totext@Base 1:9.11.3+dfsg - dns_dt_attach@Base 1:9.11.4+dfsg-2 - dns_dt_close@Base 1:9.11.4+dfsg-2 - dns_dt_create@Base 1:9.11.4+dfsg-2 - dns_dt_datatotext@Base 1:9.11.4+dfsg-2 - dns_dt_detach@Base 1:9.11.4+dfsg-2 - dns_dt_getframe@Base 1:9.11.4+dfsg-2 - dns_dt_getstats@Base 1:9.11.4+dfsg-2 - dns_dt_open@Base 1:9.11.4+dfsg-2 - dns_dt_parse@Base 1:9.11.4+dfsg-2 - dns_dt_reopen@Base 1:9.11.4+dfsg-2 - dns_dt_send@Base 1:9.11.4+dfsg-2 - dns_dt_setidentity@Base 1:9.11.4+dfsg-2 - dns_dt_setversion@Base 1:9.11.4+dfsg-2 - dns_dt_shutdown@Base 1:9.11.4+dfsg-2 - dns_dtdata_free@Base 1:9.11.4+dfsg-2 dns_dumpctx_attach@Base 1:9.11.3+dfsg dns_dumpctx_cancel@Base 1:9.11.3+dfsg dns_dumpctx_db@Base 1:9.11.3+dfsg @@ -3032,24 +2984,6 @@ libdns.so.1104 libdns1104 #MINVER# dns_zt_setviewcommit@Base 1:9.11.3+dfsg dns_zt_setviewrevert@Base 1:9.11.3+dfsg dns_zt_unmount@Base 1:9.11.3+dfsg - dnstap__dnstap__descriptor@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__free_unpacked@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__get_packed_size@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__init@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__pack@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__pack_to_buffer@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__type__descriptor@Base 1:9.11.4+dfsg-2 - dnstap__dnstap__unpack@Base 1:9.11.4+dfsg-2 - dnstap__message__descriptor@Base 1:9.11.4+dfsg-2 - dnstap__message__free_unpacked@Base 1:9.11.4+dfsg-2 - dnstap__message__get_packed_size@Base 1:9.11.4+dfsg-2 - dnstap__message__init@Base 1:9.11.4+dfsg-2 - dnstap__message__pack@Base 1:9.11.4+dfsg-2 - dnstap__message__pack_to_buffer@Base 1:9.11.4+dfsg-2 - dnstap__message__type__descriptor@Base 1:9.11.4+dfsg-2 - dnstap__message__unpack@Base 1:9.11.4+dfsg-2 - dnstap__socket_family__descriptor@Base 1:9.11.4+dfsg-2 - dnstap__socket_protocol__descriptor@Base 1:9.11.4+dfsg-2 dst__entropy_getdata@Base 1:9.11.3+dfsg dst__entropy_status@Base 1:9.11.3+dfsg dst__gssapi_init@Base 1:9.11.3+dfsg
  9. Download patch debian/dnsutils.install

    --- 1:9.11.5.P1+dfsg-1/debian/dnsutils.install 2018-12-18 13:59:25.000000000 +0000 +++ 1:9.11.5.P1+dfsg-1ubuntu1/debian/dnsutils.install 2019-01-17 20:59:25.000000000 +0000 @@ -1,12 +1,10 @@ usr/bin/delv usr/bin/dig -usr/bin/dnstap-read usr/bin/mdig usr/bin/nslookup usr/bin/nsupdate usr/share/man/man1/delv.1 usr/share/man/man1/dig.1 -usr/share/man/man1/dnstap-read.1 usr/share/man/man1/mdig.1 usr/share/man/man1/nslookup.1 usr/share/man/man1/nsupdate.1
  1. bind9