update debian/patches directory

15 files changed, 11 insertions, 191 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index cceeba156..056a96972 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,5 +1,5 @@
 # see git-dpm(1) from git-dpm package
-ef132243ba16cfdae31d4c44c0dce7e78afb4879
+17e45d43658cac81c8008ea4f43e04e6fd093b5a
 17e45d43658cac81c8008ea4f43e04e6fd093b5a
 48852a916934e7ebfc0033f426dd531eaaa63cc4
 48852a916934e7ebfc0033f426dd531eaaa63cc4
diff --git a/debian/patches/0010-Initial-German-translations.patch b/debian/patches/0010-Initial-German-translations.patch
index 0c7d198a5..f26440086 100644
--- a/debian/patches/0010-Initial-German-translations.patch
+++ b/debian/patches/0010-Initial-German-translations.patch
@@ -1,4 +1,4 @@
-From 7f866a47894f28f3065936d45de17e3e2df9ab18 Mon Sep 17 00:00:00 2001
+From 17e45d43658cac81c8008ea4f43e04e6fd093b5a Mon Sep 17 00:00:00 2001
 From: Sam Hartman <hartmans@debian.org>
 Date: Mon, 30 May 2016 12:51:16 -0400
 Subject: Initial German translations
diff --git a/debian/patches/debian-local/0001-Debian-HURD-compatibility.patch b/debian/patches/debian-local/0001-Debian-HURD-compatibility.patch
index bd93b7681..cfd95a9e1 100644
--- a/debian/patches/debian-local/0001-Debian-HURD-compatibility.patch
+++ b/debian/patches/debian-local/0001-Debian-HURD-compatibility.patch
@@ -1,4 +1,4 @@
-From 6314e4d963f02624c7d413560c8a6ca75bfcca0b Mon Sep 17 00:00:00 2001
+From e1872fbccd854753d0c14a1e701dbc572bfe237c Mon Sep 17 00:00:00 2001
 From: Sam Hartman <hartmans@debian.org>
 Date: Mon, 26 Dec 2011 18:05:13 -0500
 Subject: Debian: HURD compatibility
diff --git a/debian/patches/debian-local/0002-debian-suppress-multi-arch-paths-in-krb5-config.patch b/debian/patches/debian-local/0002-debian-suppress-multi-arch-paths-in-krb5-config.patch
index 271b56399..016b41862 100644
--- a/debian/patches/debian-local/0002-debian-suppress-multi-arch-paths-in-krb5-config.patch
+++ b/debian/patches/debian-local/0002-debian-suppress-multi-arch-paths-in-krb5-config.patch
@@ -1,4 +1,4 @@
-From ad0b1e5a2ce079717c054f88300749ee58dde85a Mon Sep 17 00:00:00 2001
+From 866922c78cbb2f0fe4af962cc5913cdfac6b0cdf Mon Sep 17 00:00:00 2001
 From: Sam Hartman <hartmans@debian.org>
 Date: Mon, 26 Dec 2011 18:19:53 -0500
 Subject: debian: suppress multi-arch paths in krb5-config
diff --git a/debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch b/debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch
index 4234b3e2f..a8acd202c 100644
--- a/debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch
+++ b/debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch
@@ -1,4 +1,4 @@
-From 38bd4d3391849747a0cc89bcc6182e844af38264 Mon Sep 17 00:00:00 2001
+From ced7401d79b441efb6669cd73ff74868848aa1ec Mon Sep 17 00:00:00 2001
 From: Sam Hartman <hartmans@debian.org>
 Date: Mon, 26 Dec 2011 18:20:11 -0500
 Subject: debian: osconf.hin path changes
diff --git a/debian/patches/debian-local/0004-debian-install-ldap-library-in-subdirectory.patch b/debian/patches/debian-local/0004-debian-install-ldap-library-in-subdirectory.patch
index dcc512a5a..4d0097130 100644
--- a/debian/patches/debian-local/0004-debian-install-ldap-library-in-subdirectory.patch
+++ b/debian/patches/debian-local/0004-debian-install-ldap-library-in-subdirectory.patch
@@ -1,4 +1,4 @@
-From 5575b130aff6ea77c5f3cb544c76a66e9abbcd6e Mon Sep 17 00:00:00 2001
+From 8e3c9e29033f4e9881f01902875cf3f963f45364 Mon Sep 17 00:00:00 2001
 From: Sam Hartman <hartmans@debian.org>
 Date: Mon, 26 Dec 2011 18:12:39 -0500
 Subject: debian: install ldap library in subdirectory
diff --git a/debian/patches/debian-local/0005-gssapi-never-unload-mechanisms.patch b/debian/patches/debian-local/0005-gssapi-never-unload-mechanisms.patch
index 0b1bb8f7b..8b37c9558 100644
--- a/debian/patches/debian-local/0005-gssapi-never-unload-mechanisms.patch
+++ b/debian/patches/debian-local/0005-gssapi-never-unload-mechanisms.patch
@@ -1,4 +1,4 @@
-From eb891f5577ef4a926a53ed9f8e855f1aded857bd Mon Sep 17 00:00:00 2001
+From 64a3030f041580e399042fbc8c52bc58d5bc72a8 Mon Sep 17 00:00:00 2001
 From: Benjamin Kaduk <kaduk@mit.edu>
 Date: Fri, 29 Mar 2013 17:18:40 -0400
 Subject: gssapi: never unload mechanisms
diff --git a/debian/patches/debian-local/0006-Add-substpdf-target.patch b/debian/patches/debian-local/0006-Add-substpdf-target.patch
index 2f89ed74c..fab7b264d 100644
--- a/debian/patches/debian-local/0006-Add-substpdf-target.patch
+++ b/debian/patches/debian-local/0006-Add-substpdf-target.patch
@@ -1,4 +1,4 @@
-From 57ca06990b44b57f7dedf306a7f06fd876770cca Mon Sep 17 00:00:00 2001
+From 6a5a2169ae36b0ab41eda2a0e576ba8db3875e02 Mon Sep 17 00:00:00 2001
 From: Ben Kaduk <kaduk@mit.edu>
 Date: Fri, 29 Mar 2013 20:53:37 -0400
 Subject: Add substpdf target
diff --git a/debian/patches/debian-local/0007-Fix-pkg-config-library-include-paths.patch b/debian/patches/debian-local/0007-Fix-pkg-config-library-include-paths.patch
index 60aa69498..137bccf80 100644
--- a/debian/patches/debian-local/0007-Fix-pkg-config-library-include-paths.patch
+++ b/debian/patches/debian-local/0007-Fix-pkg-config-library-include-paths.patch
@@ -1,4 +1,4 @@
-From 0aba055f646db233fa38641a27849468fb3e7f5f Mon Sep 17 00:00:00 2001
+From 468112efc2505c3b8b579388756e67a59e7450b0 Mon Sep 17 00:00:00 2001
 From: Jelmer Vernooij <jelmer@debian.org>
 Date: Wed, 27 Aug 2014 16:40:29 -0400
 Subject: Fix pkg-config library/include paths
diff --git a/debian/patches/debian-local/0008-Use-isystem-for-include-paths.patch b/debian/patches/debian-local/0008-Use-isystem-for-include-paths.patch
index f7416bf36..6183991c4 100644
--- a/debian/patches/debian-local/0008-Use-isystem-for-include-paths.patch
+++ b/debian/patches/debian-local/0008-Use-isystem-for-include-paths.patch
@@ -1,4 +1,4 @@
-From 94654c3868e1f60bcce02ef8ee4019bf05260817 Mon Sep 17 00:00:00 2001
+From 5c83f6015e0fc30f600f3450c46f8d0a19da1e5e Mon Sep 17 00:00:00 2001
 From: Jelmer Vernooij <jelmer@debian.org>
 Date: Wed, 3 Sep 2014 22:41:55 -0400
 Subject: Use -isystem for include paths
diff --git a/debian/patches/debian-local/0009-Fix-krb5-config-paths.patch b/debian/patches/debian-local/0009-Fix-krb5-config-paths.patch
index 8c1c584b3..19f16c101 100644
--- a/debian/patches/debian-local/0009-Fix-krb5-config-paths.patch
+++ b/debian/patches/debian-local/0009-Fix-krb5-config-paths.patch
@@ -1,4 +1,4 @@
-From b513e731f2ac081fba65ad819e828bd815fac5af Mon Sep 17 00:00:00 2001
+From e15f75720ff81b48f636e0317e125d14d766bb97 Mon Sep 17 00:00:00 2001
 From: Jelmer Vernooij <jelmer@debian.org>
 Date: Sun, 20 Apr 2014 15:59:08 +0200
 Subject: Fix krb5-config paths
diff --git a/debian/patches/series b/debian/patches/series
index b85fc85c7..b849ed1b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,3 @@ debian-local/0007-Fix-pkg-config-library-include-paths.patch
 debian-local/0008-Use-isystem-for-include-paths.patch
 debian-local/0009-Fix-krb5-config-paths.patch
 0010-Initial-German-translations.patch
-upstream/0011-Fix-KDC-kadmind-startup-on-some-IPv4-only-systems.patch
-upstream/0012-Use-pktinfo-for-explicit-UDP-wildcard-listeners.patch
-upstream/0013-Fix-udp_preference_limit-with-SRV-records.patch
diff --git a/debian/patches/upstream/0011-Fix-KDC-kadmind-startup-on-some-IPv4-only-systems.patch b/debian/patches/upstream/0011-Fix-KDC-kadmind-startup-on-some-IPv4-only-systems.patch
deleted file mode 100644
index a57c7ab88..000000000
--- a/debian/patches/upstream/0011-Fix-KDC-kadmind-startup-on-some-IPv4-only-systems.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From b4eac5addfcaa5a73484de551ba8c32535ad7679 Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Mon, 26 Dec 2016 15:09:24 -0500
-Subject: Fix KDC/kadmind startup on some IPv4-only systems
-
-getaddrinfo(NULL, ...) may yield an IPv6 wildcard address on IPv4-only
-systems, and creating a socket for that address may result in an
-EAFNOSUPPORT error.  Tolerate that error as long as we can bind at
-least one socket for the address.
-
-(cherry picked from commit 04c2bb56f5203b296b24314810eca02f5dc7e491)
-
-ticket: 8531
-version_fixed: 1.15.1
-
-(cherry picked from commit 552a129fb857e7f6fa734011d69785ad912b3fc5)
-Patch-Category: upstream
----
- src/lib/apputils/net-server.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c
-index 171ecc4047..d64ffddd68 100644
---- a/src/lib/apputils/net-server.c
-+++ b/src/lib/apputils/net-server.c
-@@ -834,7 +834,7 @@ setup_addresses(struct socksetup *data)
-     };
-     krb5_error_code ret = 0;
-     size_t i;
--    int err;
-+    int err, bound_any;
-     struct bind_address addr;
-     struct addrinfo hints, *ai_list = NULL, *ai = NULL;
-     verto_callback vcb;
-@@ -871,8 +871,12 @@ setup_addresses(struct socksetup *data)
-          * Loop through all the sockets that getaddrinfo could find to match
-          * the requested address.  For wildcard listeners, this should usually
-          * have two results, one for each of IPv4 and IPv6, or one or the
--         * other, depending on the system.
-+         * other, depending on the system.  On IPv4-only systems, getaddrinfo()
-+         * may return both IPv4 and IPv6 addresses, but creating an IPv6 socket
-+         * may give an EAFNOSUPPORT error, so tolerate that error as long as we
-+         * can bind at least one socket.
-          */
-+        bound_any = 0;
-         for (ai = ai_list; ai != NULL; ai = ai->ai_next) {
-             /* Make sure getaddrinfo returned a socket with the same type that
-              * was requested. */
-@@ -889,9 +893,15 @@ setup_addresses(struct socksetup *data)
-                                  _("Failed setting up a %s socket (for %s)"),
-                                  bind_type_names[addr.type],
-                                  paddr(ai->ai_addr));
--                goto cleanup;
-+                if (ret != EAFNOSUPPORT)
-+                    goto cleanup;
-+            } else {
-+                bound_any = 1;
-             }
-         }
-+        if (!bound_any)
-+            goto cleanup;
-+        ret = 0;
- 
-         if (ai_list != NULL)
-             freeaddrinfo(ai_list);
diff --git a/debian/patches/upstream/0012-Use-pktinfo-for-explicit-UDP-wildcard-listeners.patch b/debian/patches/upstream/0012-Use-pktinfo-for-explicit-UDP-wildcard-listeners.patch
deleted file mode 100644
index 834cd2428..000000000
--- a/debian/patches/upstream/0012-Use-pktinfo-for-explicit-UDP-wildcard-listeners.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 989711330dbf4b0b527538d547e35eb4c1146a47 Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Mon, 26 Dec 2016 15:18:05 -0500
-Subject: Use pktinfo for explicit UDP wildcard listeners
-
-In net-server.c, use pktinfo on UDP server sockets if they are bound
-to wildcard addresses, whether that is explicit or implicit in the
-address specification.
-
-(cherry picked from commit d005beaa72c70bc28b2b0b49b9d83eff160ca8f1)
-
-ticket: 8530
-version_fixed: 1.15.1
-
-(cherry picked from commit e23d062471bf9071072aaf2df39054508fe74cc1)
-
-Patch-Category: upstream
----
- src/lib/apputils/net-server.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c
-index d64ffddd68..29ec84a15b 100644
---- a/src/lib/apputils/net-server.c
-+++ b/src/lib/apputils/net-server.c
-@@ -105,6 +105,17 @@ paddr(struct sockaddr *sa)
-     return buf;
- }
- 
-+/* Return true if sa is an IPv4 or IPv6 wildcard address. */
-+static int
-+is_wildcard(struct sockaddr *sa)
-+{
-+    if (sa->sa_family == AF_INET6)
-+        return IN6_IS_ADDR_UNSPECIFIED(&sa2sin6(sa)->sin6_addr);
-+    else if (sa->sa_family == AF_INET)
-+        return sa2sin(sa)->sin_addr.s_addr == INADDR_ANY;
-+    return 0;
-+}
-+
- /* KDC data.  */
- 
- enum conn_type {
-@@ -753,7 +764,7 @@ setup_socket(struct socksetup *data, struct bind_address *ba,
-     }
- 
-     /* Try to turn on pktinfo for UDP wildcard sockets. */
--    if (ba->type == UDP && ba->address == NULL) {
-+    if (ba->type == UDP && is_wildcard(sock_address)) {
-         krb5_klog_syslog(LOG_DEBUG, _("Setting pktinfo on socket %s"),
-                          paddr(sock_address));
-         ret = set_pktinfo(sock, sock_address->sa_family);
diff --git a/debian/patches/upstream/0013-Fix-udp_preference_limit-with-SRV-records.patch b/debian/patches/upstream/0013-Fix-udp_preference_limit-with-SRV-records.patch
deleted file mode 100644
index 86348bb70..000000000
--- a/debian/patches/upstream/0013-Fix-udp_preference_limit-with-SRV-records.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From ef132243ba16cfdae31d4c44c0dce7e78afb4879 Mon Sep 17 00:00:00 2001
-From: Greg Hudson <ghudson@mit.edu>
-Date: Mon, 27 Feb 2017 22:35:07 -0500
-Subject: Fix udp_preference_limit with SRV records
-
-In sendto_kdc:resolve_server() when resolving a server entry with a
-specified transport, defer the resulting addresses if the strategy
-dictates that the specified transport is not preferred.  Reported by
-Jochen Hein.
-
-(cherry picked from commit bc7594058011c2f9711f24af4fa15a421a8d5b62)
-
-ticket: 8554
-version_fixed: 1.15.1
-
-(cherry picked from commit 59a3449f13c63048b44f56cad2d528c0805d3627)
-
-Patch-Category: upstream
----
- src/lib/krb5/os/sendto_kdc.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
-index ef80991c1d..fffe0262f6 100644
---- a/src/lib/krb5/os/sendto_kdc.c
-+++ b/src/lib/krb5/os/sendto_kdc.c
-@@ -791,7 +791,7 @@ resolve_server(krb5_context context, const krb5_data *realm,
-     struct server_entry *entry = &servers->servers[ind];
-     k5_transport transport;
-     struct addrinfo *addrs, *a, hint, ai;
--    krb5_boolean defer;
-+    krb5_boolean defer = FALSE;
-     int err, result;
-     char portbuf[PORT_LENGTH];
- 
-@@ -811,9 +811,13 @@ resolve_server(krb5_context context, const krb5_data *realm,
-                               NULL, NULL, entry->uri_path, udpbufp);
-     }
- 
--    /* If the entry has a specified transport, use it. */
--    if (entry->transport != TCP_OR_UDP)
-+    /* If the entry has a specified transport, use it, but possibly defer the
-+     * addresses we add based on the strategy. */
-+    if (entry->transport != TCP_OR_UDP) {
-         transport = entry->transport;
-+        defer = (entry->transport == TCP && strategy == UDP_FIRST) ||
-+            (entry->transport == UDP && strategy == UDP_LAST);
-+    }
- 
-     memset(&hint, 0, sizeof(hint));
-     hint.ai_family = entry->family;
-@@ -833,7 +837,7 @@ resolve_server(krb5_context context, const krb5_data *realm,
-     /* Add each address with the specified or preferred transport. */
-     retval = 0;
-     for (a = addrs; a != 0 && retval == 0; a = a->ai_next) {
--        retval = add_connection(conns, transport, FALSE, a, ind, realm,
-+        retval = add_connection(conns, transport, defer, a, ind, realm,
-                                 entry->hostname, portbuf, entry->uri_path,
-                                 udpbufp);
-     }