Source: isc-dhcp
Severity: important
Tags: patch d-i
User: debian-h...@lists.debian.org
Usertags: hurd
Dear Maintainer,
isc-dhcp 4.3.0a1-2.1 uploaded to experimental via NMU fixed FTBFS on
hurd-i386. See #616290.
Getting such fixes in unstable is necessary to resolve debian-installer
FTBFS in unstable and consequently to generate official installation
media.
Upstream released 4.3.0 a couple of months ago.
I see two options:
1) uploading 4.3.0a1-2.1 or 4.3.0 to unstable.
2) if you follow upstream by uploading Current-Stable releases (4.2.x)
to unstable and Current releases (4.3.x) to experimental, fixes need to
be backported to 4.2.4. Attached debdiff.
Both 1) and 2) changes are available respectively in experimental and
master branches at
http://anonscm.debian.org/gitweb/?p=users/gg0-guest/isc-dhcp.git
Thanks for considering,
--
G..e
diff -Nru isc-dhcp-4.2.4/debian/bind-patches/hurd
isc-dhcp-4.2.4/debian/bind-patches/hurd
--- isc-dhcp-4.2.4/debian/bind-patches/hurd 1970-01-01 01:00:00.0
+0100
+++ isc-dhcp-4.2.4/debian/bind-patches/hurd 2014-05-04 17:47:18.0
+0200
@@ -0,0 +1,34 @@
+--- a/configure.in 2011-12-04 23:21:32.0 +0100
b/configure.in 2011-12-04 23:21:35.0 +0100
+@@ -263,7 +263,7 @@
+ # as it breaks how the two halves (Basic and Advanced) of the IPv6
+ # Socket API were designed to be used but we have to live with it.
+ # Define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
+- *-linux* | *-kfreebsd*-gnu)
++ *-linux* | *-kfreebsd*-gnu | *-gnu*)
+ STD_CDEFINES=$STD_CDEFINES -D_GNU_SOURCE
+ CPPFLAGS=$CPPFLAGS -D_GNU_SOURCE
+ ;;
+--- a/configure2011-12-04 23:25:28.0 +0100
b/configure2011-12-04 23:25:32.0 +0100
+@@ -11807,7 +11807,7 @@
+ # as it breaks how the two halves (Basic and Advanced) of the IPv6
+ # Socket API were designed to be used but we have to live with it.
+ # Define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
+- *-linux* | *-kfreebsd*-gnu)
++ *-linux* | *-kfreebsd*-gnu | *-gnu*)
+ STD_CDEFINES=$STD_CDEFINES -D_GNU_SOURCE
+ CPPFLAGS=$CPPFLAGS -D_GNU_SOURCE
+ ;;
+--- a/lib/isc/unix/net.c 2011-12-04 23:44:51.0 +0100
b/lib/isc/unix/net.c 2011-12-04 23:44:59.0 +0100
+@@ -130,6 +130,9 @@
+ #ifdef EAFNOSUPPORT
+ case EAFNOSUPPORT:
+ #endif
++#ifdef EPFNOSUPPORT
++ case EPFNOSUPPORT:
++#endif
+ #ifdef EPROTONOSUPPORT
+ case EPROTONOSUPPORT:
+ #endif
diff -Nru isc-dhcp-4.2.4/debian/bind-patches/series
isc-dhcp-4.2.4/debian/bind-patches/series
--- isc-dhcp-4.2.4/debian/bind-patches/series 2013-05-27 22:26:49.0
+0200
+++ isc-dhcp-4.2.4/debian/bind-patches/series 2014-05-04 17:50:34.0
+0200
@@ -1 +1,2 @@
cve-2013-2494.patch
+hurd
diff -Nru isc-dhcp-4.2.4/debian/changelog isc-dhcp-4.2.4/debian/changelog
--- isc-dhcp-4.2.4/debian/changelog 2013-05-27 22:53:45.0 +0200
+++ isc-dhcp-4.2.4/debian/changelog 2014-05-04 19:38:25.0 +0200
@@ -1,3 +1,13 @@
+isc-dhcp (4.2.4-8) UNRELEASED; urgency=medium
+
+ * Fix FTBFS on Hurd.
++ Add isc-dhcp and bind patches already applied upstream.
++ Pass --enable-use-sockets and DO_LPF variable to configure.
++ Add dhclient-script.hurd, dhclient-script.hurd.udeb and
+ debian/rfc3442-classless-routes.hurd scripts.
+
+ -- Gabriele Giacone 1o5g4...@gmail.com Sun, 04 May 2014 18:22:35 +0200
+
isc-dhcp (4.2.4-7) unstable; urgency=low
* Set --with-ldapcrypto to restore openssl support (closes: #692808).
diff -Nru isc-dhcp-4.2.4/debian/dhclient-script.hurd
isc-dhcp-4.2.4/debian/dhclient-script.hurd
--- isc-dhcp-4.2.4/debian/dhclient-script.hurd 1970-01-01 01:00:00.0
+0100
+++ isc-dhcp-4.2.4/debian/dhclient-script.hurd 2014-05-04 17:36:33.0
+0200
@@ -0,0 +1,327 @@
+#!/bin/bash
+
+# dhclient-script for GNU, based on the script for Linux.
+# Dan Halbert, March, 1997.
+# Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
+# Modified for Debian. Matt Zimmerman and Eloy Paris, December 2003
+# Modified to remove useless tests for antiquated kernel versions that
+# this doesn't even work with anyway, and introduces a dependency on /usr
+# being mounted, which causes cosmetic errors on hosts that NFS mount /usr
+# Andrew Pollock, February 2005
+# Modified to work on point-to-point links. Andrew Pollock, June 2005
+# Modified to support passing the parameters called with to the hooks. Andrew
Pollock, November 2005
+# Modified to work under GNU/Hurd for isc-dhcp-4.1.1 based on the
+# patch by Samuel Thibault for dhcp3. Svante Signell, February 2011.
+
+# The alias handling in here probably still sucks. -mdz
+
+# update /etc/resolv.conf based on received values
+make_resolv_conf() {
+local new_resolv_conf
+
+# DHCPv4
+if [ -n
