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

[Fwd: Bug#616290: Patches solving FTBFS of isc-dhcp for GNU/Hurd]

-------- Forwarded Message --------
From: Svante Signell <svante.signell@telia.com>
Reply-to: Svante Signell <svante.signell@telia.com>,
To: Debian bug reporting <submit@bugs.debian.org>
Subject: Bug#616290: Patches solving FTBFS of isc-dhcp for GNU/Hurd
Date: Thu, 3 Mar 2011 09:42:10 +0100

Package: isc-dhcp
Version: 4.1.1-P1-16
Severity: important
Tags: patch, upstream
User: debian-hurd@lists.debian.org
Usertags: hurd

Attached are four patches to the isc-dhcp package to enable a successful
build for GNU/Hurd. This patch has been developed together with Samuel
Thibault, who improved my initial patches.

For a successful build from source, the one-line patch by Colin Watson
in bug #602312, has to be applied to the  dhcp-4.1.0-ldap-code.dpatch in
debian/patches. This is needed to cope with the new behavior of the
linker: --no-add-needed since gcc-4.4.5-11

The patches are:

1) "patch" is a patch against the debian/ directory to update package
dependencies and the patch order in 00list.

2) "fix_ftbfs4hurd.dpatch", containing only upstream changes, to be
added to debian/patches.

The following two files for debian/ are attached separately, to make
them more readable for review:

3) dhclient-script.hurd
4) dhclient-script.hurd.udeb

Svante Signell

diff -urN isc-dhcp-4.1.1-P1.original/debian/control isc-dhcp-4.1.1-P1/debian/control
--- isc-dhcp-4.1.1-P1.original/debian/control	2011-03-02 23:35:17.000000000 +0000
+++ isc-dhcp-4.1.1-P1/debian/control	2011-03-02 23:16:48.000000000 +0000
@@ -89,7 +89,7 @@
 Package: isc-dhcp-client
 Architecture: any
-Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), iproute [linux-any], ${shlibs:Depends}, ${misc:Depends}
+Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), iproute [linux-any] | inetutils-tools [hurd-any], ${shlibs:Depends}, ${misc:Depends}
 Suggests: resolvconf, avahi-autoipd
 Provides: dhcp3-client
 Conflicts: dhcp-client (<< 3.0), samba-common (<< 3.0.0beta1-2), resolvconf (<= 1.45), ifupdown (<< 0.6.8+nmu3)
diff -urN isc-dhcp-4.1.1-P1.original/debian/patches/00list isc-dhcp-4.1.1-P1/debian/patches/00list
--- isc-dhcp-4.1.1-P1.original/debian/patches/00list	2011-03-02 23:35:17.000000000 +0000
+++ isc-dhcp-4.1.1-P1/debian/patches/00list	2011-03-02 23:17:48.000000000 +0000
@@ -17,6 +17,10 @@
 # must be applied before the LDAP stuff
+# fix ftbfs for GNU/Hurd
+# must be applied before dhcp-4.1.0-ldap-code
 #ldap backend for dhcp server (docs and code)

Attachment: fix_ftbfs4hurd.dpatch
Description: application/shellscript

Attachment: dhclient-script.hurd
Description: application/shellscript

Attachment: dhclient-script.hurd.udeb
Description: application/shellscript

Reply to: