Hello,
Svante Signell, le Wed 02 Mar 2011 09:17:09 +0100, a écrit :
> On Wed, 2011-03-02 at 02:28 +0100, Samuel Thibault wrote:
> > I forgot to comment on the udeb version: I don't think we want to create
> > an inetutils-tools udeb package, while we can simply issue settrans
> > which should be easy and fine enough, since we only handle one
> > interface, thus my changes.
>
> Ok, I'm attaching the patch, fix_ftbfs4hurd.dpatch,
Great, it basically just works! I've uploaded a built package to
debian-ports. I've reworked patches a bit to make them more acceptable
to upstream, and here is how you should now submit the bug report, see
attached files:
- "patch" is a patch against the debian/ directory, so the maintainer can
simply apply it directly.
- "fix_ftbfs4hurd.dpatch", containing only upstream changes, thus to be
added to debian/patches by the maintainer.
- the dhclient-script.hurd* files, to be added by the maintainer, filed
separately to make them more readable for review.
> I think my name should be removed from the patched scripts, you did
> most of the changes.
Nope. You did the long boring tedious work to get things working again.
You deserve the credit, even if I ended up rewriting things.
Samuel
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
no-libcrypto
+# fix ftbfs for GNU/Hurd
+# must be applied before dhcp-4.1.0-ldap-code
+fix_ftbfs4hurd.dpatch
+
#ldap backend for dhcp server (docs and code)
dhcp-4.1.0-ldap-docs
dhcp-4.1.0-ldap-code
#! /bin/sh /usr/share/dpatch/dpatch-run
# fix FTPFS for GNU/Hurd
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
'--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
isc-dhcp-4.1.1-P1~/client/dhclient.c isc-dhcp-4.1.1-P1/client/dhclient.c
--- isc-dhcp-4.1.1-P1~/client/dhclient.c 2011-03-03 01:10:28.000000000
+0000
+++ isc-dhcp-4.1.1-P1/client/dhclient.c 2011-03-03 01:11:08.000000000 +0000
@@ -342,21 +342,33 @@
* to be reopened after chdir() has been called
*/
if (path_dhclient_db[0] != '/') {
- char *path = dmalloc(PATH_MAX, MDL);
+ char *path;
+#ifdef __GLIBC__
+ path = realpath(path_dhclient_db, NULL);
+#else
+ path = dmalloc(PATH_MAX, MDL);
if (path == NULL)
log_fatal("No memory for filename\n");
- path_dhclient_db = realpath(path_dhclient_db, path);
- if (path_dhclient_db == NULL)
- log_fatal("%s: %s", path, strerror(errno));
+ path = realpath(path_dhclient_db, path);
+#endif
+ if (path == NULL)
+ log_fatal("%s: %s", path_dhclient_db, strerror(errno));
+ path_dhclient_db = path;
}
if (path_dhclient_script[0] != '/') {
- char *path = dmalloc(PATH_MAX, MDL);
+ char *path;
+#ifdef __GLIBC__
+ path = realpath(path_dhclient_script, NULL);
+#else
+ path = dmalloc(PATH_MAX, MDL);
if (path == NULL)
log_fatal("No memory for filename\n");
- path_dhclient_script = realpath(path_dhclient_script, path);
- if (path_dhclient_script == NULL)
- log_fatal("%s: %s", path, strerror(errno));
+ path = realpath(path_dhclient_script, path);
+#endif
+ if (path == NULL)
+ log_fatal("%s: %s", path_dhclient_script,
strerror(errno));
+ path_dhclient_script = path;
}
/* first kill off any currently running client */
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
'--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
isc-dhcp-4.1.1-P1~/common/lpf.c isc-dhcp-4.1.1-P1/common/lpf.c
--- isc-dhcp-4.1.1-P1~/common/lpf.c 2011-03-03 01:06:44.000000000 +0000
+++ isc-dhcp-4.1.1-P1/common/lpf.c 2011-03-03 01:11:08.000000000 +0000
@@ -28,7 +28,6 @@
#include "dhcpd.h"
#if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
-#include <sys/ioctl.h>
#include <sys/uio.h>
#include <errno.h>
@@ -39,8 +38,14 @@
#include "includes/netinet/ip.h"
#include "includes/netinet/udp.h"
#include "includes/netinet/if_ether.h"
+#endif
+
+#if defined (USE_LPF_RECEIVE) || defined (USE_LPF_HWADDR)
+#include <sys/ioctl.h>
#include <net/if.h>
+#endif
+#if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
/* Reinitializes the specified interface after an address change. This
is not required for packet-filter APIs. */
@@ -411,7 +416,9 @@
interface_dereference (&fbi, MDL);
}
}
+#endif
+#if defined (USE_LPF_RECEIVE) || defined (USE_LPF_HWADDR)
void
get_hw_addr(const char *name, struct hardware *hw) {
int sock;
@@ -442,18 +449,22 @@
memcpy(&hw->hbuf[1], sa->sa_data, 6);
break;
case ARPHRD_IEEE802:
+#ifndef __GNU__
#ifdef ARPHRD_IEEE802_TR
case ARPHRD_IEEE802_TR:
#endif /* ARPHRD_IEEE802_TR */
+#endif
hw->hlen = 7;
hw->hbuf[0] = HTYPE_IEEE802;
memcpy(&hw->hbuf[1], sa->sa_data, 6);
break;
+#ifndef __GNU__
case ARPHRD_FDDI:
hw->hlen = 17;
hw->hbuf[0] = HTYPE_FDDI;
memcpy(&hw->hbuf[1], sa->sa_data, 16);
break;
+#endif
default:
log_fatal("Unsupported device type %ld for \"%s\"",
(long int)sa->sa_family, name);
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
'--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
isc-dhcp-4.1.1-P1~/configure.ac isc-dhcp-4.1.1-P1/configure.ac
--- isc-dhcp-4.1.1-P1~/configure.ac 2011-03-03 01:10:44.000000000 +0000
+++ isc-dhcp-4.1.1-P1/configure.ac 2011-03-03 01:11:36.000000000 +0000
@@ -366,9 +366,17 @@
AC_CHECK_HEADER(net/bpf.h, DO_BPF=1)
if test -n "$DO_BPF"
then
- AC_DEFINE([HAVE_BPF], [""],
+ AC_DEFINE([HAVE_BPF], [1],
[Define to 1 to use the
Berkeley Packet Filter interface code.])
+ else
+ AC_CHECK_HEADER(sys/socket.h, DO_SOCKET=1)
+ if test -n "$DO_SOCKET"
+ then
+ AC_DEFINE([HAVE_SOCKETS], [1],
+ [Define to 1 to use the
+ standard BSD socket API.])
+ fi
fi
fi
fi
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
'--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
isc-dhcp-4.1.1-P1~/includes/osdep.h isc-dhcp-4.1.1-P1/includes/osdep.h
--- isc-dhcp-4.1.1-P1~/includes/osdep.h 2011-03-03 01:06:44.000000000 +0000
+++ isc-dhcp-4.1.1-P1/includes/osdep.h 2011-03-03 01:13:23.000000000 +0000
@@ -90,6 +90,8 @@
# define USE_LPF 1
# elif defined(HAVE_DLPI)
# define USE_DLPI 1
+# elif defined(HAVE_SOCKETS)
+# define USE_SOCKETS 1
# endif
#endif
@@ -116,6 +118,8 @@
# define USE_SOCKET_RECEIVE
# if defined(HAVE_DLPI)
# define USE_DLPI_HWADDR
+# else
+# define USE_LPF_HWADDR
# endif
#endif
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
'--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
isc-dhcp-4.1.1-P1~/server/dhcpd.c isc-dhcp-4.1.1-P1/server/dhcpd.c
--- isc-dhcp-4.1.1-P1~/server/dhcpd.c 2011-03-03 01:06:44.000000000 +0000
+++ isc-dhcp-4.1.1-P1/server/dhcpd.c 2011-03-03 01:11:08.000000000 +0000
@@ -449,12 +449,18 @@
* to be reopened after chdir() has been called
*/
if (path_dhcpd_db[0] != '/') {
- char *path = dmalloc(PATH_MAX, MDL);
+ char *path;
+#ifdef __GLIBC__
+ path = realpath(path_dhcpd_db, NULL);
+#else
+ path = dmalloc(PATH_MAX, MDL);
if (path == NULL)
log_fatal("No memory for filename\n");
- path_dhcpd_db = realpath(path_dhcpd_db, path);
- if (path_dhcpd_db == NULL)
- log_fatal("%s: %s", path, strerror(errno));
+ path = realpath(path_dhcpd_db, path);
+#endif
+ if (path == NULL)
+ log_fatal("%s: %s", path_dhcpd_db, strerror(errno));
+ path_dhcpd_db = path;
}
if (!quiet) {
#!/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
make_resolv_conf() {
if [ "$new_domain_name" -o "$new_domain_name_servers" ]; then
local new_resolv_conf=/etc/resolv.conf.dhclient-new
rm -f $new_resolv_conf
if [ "$new_domain_name" ]; then
echo domain ${new_domain_name%% *} >>$new_resolv_conf
fi
if [ "$new_domain_search" ]; then
#new_domain_search="${new_domain_search% }"
if [ "$new_domain_name" ]; then
domain_in_search_list=""
for domain in "$new_domain_search"; do
if [ "$domain" = "$new_domain_name" ]; then
domain_in_search="Yes"
fi
done
if [ ! "$domain_in_search" ]; then
new_domain_search="$new_domain_name $new_domain_search"
fi
fi
echo "search ${new_domain_search}" >> $new_resolv_conf
elif [ "$new_domain_name" ]; then
echo "search ${new_domain_name}" >> $new_resolv_conf
fi
if [ "$new_domain_name_servers" ]; then
for nameserver in $new_domain_name_servers; do
echo nameserver $nameserver >>$new_resolv_conf
done
else # keep 'old' nameservers
sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p
/etc/resolv.conf >>$new_resolv_conf
fi
chown --reference=/etc/resolv.conf $new_resolv_conf
chmod --reference=/etc/resolv.conf $new_resolv_conf
mv -f $new_resolv_conf /etc/resolv.conf
fi
}
run_hook() {
local script="$1"
local exit_status
shift # discard the first argument, then the rest are the script's
if [ -f $script ]; then
. $script "$@"
fi
if [ -n "$exit_status" ] && [ "$exit_status" -ne 0 ]; then
logger -p daemon.err "$script returned non-zero exit status
$exit_status"
save_exit_status=$exit_status
fi
return $exit_status
}
run_hookdir() {
local dir="$1"
local exit_status
shift # See run_hook
if [ -d "$dir" ]; then
for script in $(run-parts --list $dir); do
run_hook $script "$@" || true
exit_status=$?
done
fi
return $exit_status
}
# Must be used on exit. Invokes the local dhcp client exit hooks, if any.
exit_with_hooks() {
exit_status=$1
# Source the documented exit-hook script, if it exists
if ! run_hook /etc/dhcp/dhclient-exit-hooks "$@"; then
exit_status=$?
fi
# Now run scripts in the Debian-specific directory.
# FIXME: rfc3442-classless-routes should not be run on/adapted to GNU/Hurd
if ! run_hookdir /etc/dhcp/dhclient-exit-hooks.d "$@"; then
exit_status=$?
fi
exit $exit_status
}
set_hostname() {
local current_hostname=$(hostname)
if [ -z "$current_hostname" -o "$current_hostname" = "(none)" ]; then
hostname "$new_host_name"
fi
}
if [ -n "$new_broadcast_address" ]; then
new_broadcast_arg="--broadcast $new_broadcast_address"
fi
if [ -n "$old_broadcast_address" ]; then
old_broadcast_arg="--broadcast $old_broadcast_address"
fi
if [ -n "$new_subnet_mask" ]; then
new_subnet_arg="--netmask $new_subnet_mask"
fi
if [ -n "$old_subnet_mask" ]; then
old_subnet_arg="--netmask $old_subnet_mask"
fi
if [ -n "$alias_subnet_mask" ]; then
alias_subnet_arg="--netmask $alias_subnet_mask"
fi
# The 576 MTU is only used for X.25 and dialup connections
# where the admin wants low latency. Such a low MTU can cause
# problems with UDP traffic, among other things. As such,
# disallow MTUs from 576 and below by default, so that broken
# MTUs are ignored, but higher stuff is allowed (1492, 1500, etc).
if [ -n "$new_interface_mtu" ] && [ $new_interface_mtu -gt 576 ]; then
mtu_arg="--mtu $new_interface_mtu"
fi
if [ -n "$IF_METRIC" ]; then
metric_arg="--metric $IF_METRIC" # interfaces(5), "metric" option
fi
# The action starts here
# Invoke the local dhcp client enter hooks, if they exist.
run_hook /etc/dhcp/dhclient-enter-hooks
run_hookdir /etc/dhcp/dhclient-enter-hooks.d
# Execute the operation
case "$reason" in
MEDIUM|ARPCHECK|ARPSEND)
# Do nothing
;;
PREINIT)
# The DHCP client is requesting that an interface be
# configured as required in order to send packets prior to
# receiving an actual address. - dhclient-script(8)
# FIXME: handle multiple interface case.
settrans -afg /servers/socket/2 /hurd/pfinet -i $interface
;;
BOUND|RENEW|REBIND|REBOOT)
set_hostname
if [ -n "$old_ip_address" -a -n "$alias_ip_address" -a \
"$alias_ip_address" != "$old_ip_address" ]; then
# Possible new alias. Remove old alias.
# Alias not supported on GNU/Hurd
:
# FIXME: --down does not work on GNU/Hurd
#inetutils-ifconfig -i $interface:0 --down
fi
if [ -n "$old_ip_address" -a \
"$old_ip_address" != "$new_ip_address" ]; then
# IP address changed. Bringing down the interface will delete all
routes,
# and clear the ARP cache.
inetutils-ifconfig -i $interface -A 0.0.0.0
fi
if [ -z "$old_ip_address" -o "$old_ip_address" != "$new_ip_address" -o \
"$reason" = "BOUND" -o "$reason" = "REBOOT" ]; then
inetutils-ifconfig -i $interface -A $new_ip_address $new_subnet_arg
\
$new_broadcast_arg $mtu_arg
# point to point
# TODO
#if [ "$new_subnet_mask" == "255.255.255.255" ]; then
# for router in $new_routers; do
# route add -host $router dev $interface
# done
#fi
for router in $new_routers; do
fsysopts /servers/socket/2 $(fsysopts /servers/socket/2) -g
$router
done
fi
if [ "$new_ip_address" != "$alias_ip_address" -a -n "$alias_ip_address"
];
then
# Alias not supported on GNU/Hurd
:
#inetutils-ifconfig -i $interface:0 -A 0.0.0.0
#inetutils-ifconfig -i $interface:0 -A $alias_ip_address
$alias_subnet_arg
#route add -host $alias_ip_address $interface:0
fi
make_resolv_conf
;;
EXPIRE|FAIL|RELEASE|STOP)
if [ -n "$alias_ip_address" ]; then
# Turn off alias interface.
# Alias not supported on GNU/Hurd
:
# FIXME: --down does not work on GNU/Hurd
#inetutils-ifconfig -i $interface:0 -A 0.0.0.0
fi
if [ -n "$old_ip_address" ]; then
# Shut down interface, which will delete routes and clear arp cache.
inetutils-ifconfig -i $interface -A 0.0.0.0
fi
if [ -n "$alias_ip_address" ]; then
# Alias not supported on GNU/Hurd
:
#inetutils-ifconfig -i $interface:0 -A alias_ip_address
$alias_subnet_arg
#route add -host $alias_ip_address $interface:0
fi
;;
TIMEOUT)
if [ -n "$alias_ip_address" ]; then
# Alias not supported on GNU/Hurd
:
#inetutils-ifconfig -i $interface:0 -A 0.0.0.0
fi
inetutils-ifconfig -i $interface -A $new_ip_address $new_subnet_arg \
$new_broadcast_arg $mtu_arg
set -- $new_routers
first_router="$1"
if [ -z "$first_router" ] || ping -q -c 1 $first_router; then
if [ "$new_ip_address" != "$alias_ip_address" -a \
-n "$alias_ip_address" ]; then
# Alias not supported on GNU/Hurd
:
#inetutils-ifconfig -i $interface:0 -A $alias_ip_address
$alias_subnet_arg
#route add -host $alias_ip_address dev $interface:0
fi
for router in $new_routers; do
#route add default dev $interface gw $router $metric_arg
fsysopts /servers/socket/2 $(fsysopts /servers/socket/2) -g
$router
done
make_resolv_conf
else
# Changed from 'inetutils-ifconfig -i $interface inet 0 down' - see
Debian bug #144666
inetutils-ifconfig -i $interface -A 0.0.0.0
exit_with_hooks 2 "$@"
fi
;;
esac
exit_with_hooks 0
#!/bin/sh
set -e
# reduced dhclient-script for the Debian installer
# changes by Joshua Kwan <jo...@triplehelix.org>,
# Bastian Blank <wa...@debian.org>
# dhclient-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
# Adapted the GNU/Linux script to GNU/Hurd, Svante Signell and Samuel Thibault,
# February 2011.
make_resolv_conf() {
if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then
local new_resolv_conf=/etc/resolv.conf.dhclient-new
rm -f $new_resolv_conf
if [ -n "$new_domain_name" ]; then
echo "search $new_domain_name" >>$new_resolv_conf
fi
for nameserver in $new_domain_name_servers; do
echo "nameserver $nameserver" >>$new_resolv_conf
done
mv $new_resolv_conf /etc/resolv.conf
fi
}
set_hostname() {
local current_hostname=$(hostname)
if [ -z "$current_hostname" ] || [ "$current_hostname" = "(none)" ]; then
hostname "$new_host_name"
fi
}
if [ -n "$new_subnet_mask" ]; then
new_subnet_arg="-m $new_subnet_mask"
fi
# Execute the operation
case "$reason" in
MEDIUM|ARPCHECK|ARPSEND)
# Do nothing
;;
PREINIT)
settrans -afg /servers/socket/2 /hurd/pfinet -i $interface
# We need to give the kernel some time to get the interface up.
sleep 1
;;
BOUND|RENEW|REBIND|REBOOT)
set_hostname
pfinet_args="-i $interface"
if [ -n "$old_ip_address" ] && \
[ "$old_ip_address" != "$new_ip_address" ]; then
# IP address changed. Bringing down the interface will delete all
routes,
# and clear the ARP cache.
fsysopts /servers/socket/2 $pfinet_args
fi
# TODO: add MTU option to pfinet
#if [ -n "$new_interface_mtu" ]; then
# pfinet_args="$pfinet_args --mtu $new_interface_mtu"
# fsysopts /servers/socket/2 $pfinet_args
#fi
if [ -z "$old_ip_address" ] || [ "$old_ip_address" != "$new_ip_address"
] || \
[ "$reason" = "BOUND" ] || [ "$reason" = "REBOOT" ]; then
pfinet_args="$pfinet_args -a $new_ip_address $new_subnet_arg"
for router in $new_routers; do
pfinet_args="$pfinet_args -g $router"
done
fsysopts /servers/socket/2 $pfinet_args
fi
make_resolv_conf
# Get the domain name into a file suitable for netcfg to read.
printf "$new_domain_name" > /tmp/domain_name
if [ -n "$new_ntp_servers" ]; then
printf "$new_ntp_servers" > /tmp/dhcp-ntp-servers
fi
;;
EXPIRE|FAIL|RELEASE|STOP)
if [ -n "$old_ip_address" ]; then
# Shut down interface, which will delete routes and clear arp cache.
fsysopts /servers/socket/2 -i $interface
fi
;;
TIMEOUT)
fsysopts /servers/socket/2 -i $interface
;;
esac
exit 0
