Tomasz Mrugalski via RT, le Fri 11 May 2012 17:14:32 +0000, a écrit : > On Fri May 11 02:28:09 2012, sthiba...@debian.org wrote: > > Any news on this? We really need to get some patch integrated in > > Debian, either the one we proposed, as an interim, or something from > > upstream, or something else? > I'm sorry, but due to resource limitations, we were unable to include fix for > realpath and use-sockets in upcoming 4.2.4. However, we were able to update > the > patch to a version that is almost ready for merge.
Cool! That's what we really need actually. > Please find our internal patch attached. That is *not* an official ISC patch. > It did not go through our normal testing process. Feel free to use it, though. Ok. There is however just one remaining glitch: GNU/Hurd has neither linux/filter.h nor net/bpf.h, so neither HAVE_LPF nor HAVE_BPF are defined, but GNU/Hurd does have the SIOCGIFHWADDR ioctl. I don't know how you prefer how to handle that. In the attached conservative patch, we simply enable USE_LPF_HWADDR when __GNU__ is defined (i.e. GNU/Hurd). Perhaps you'd prefer to replace that with an autoconf test for SIOCGIFHWADDR. I however hope that the attached thus-fixed use-sockets-realpath.patch is OK for Debian, so we can at last get isc-dhcp to build. For the record, the other patches that are needed for the Debian package: - patch-config enables the use of the socket API on GNU/Hurd, as explained by upstream in an earlier review mail. - patch-bind has to be applied to the unpacked bind package (from bug #651001, now applied in the bind9 package). I don't know how you'd prefer to achive that patching. - dhclient-script.hurd, dhclient-script.hurd.udeb, rfc3442-classless-routes.hurd are to be put in debian/ to provide hurdish scripts. You be they applied to the Debian package? Thanks! Samuel
Index: client/dhclient.c =================================================================== RCS file: /proj/cvs/prod/DHCP/client/dhclient.c,v retrieving revision 1.185 retrieving revision 1.185.4.1 diff -u -r1.185 -r1.185.4.1 --- a/client/dhclient.c 3 Feb 2012 22:47:42 -0000 1.185 +++ b/client/dhclient.c 28 Feb 2012 15:44:01 -0000 1.185.4.1 @@ -374,21 +374,17 @@ * to be reopened after chdir() has been called */ if (path_dhclient_db[0] != '/') { - char *path = dmalloc(PATH_MAX, MDL); - if (path == NULL) - log_fatal("No memory for filename\n"); - path_dhclient_db = realpath(path_dhclient_db, path); + const char *old_path = path_dhclient_db; + path_dhclient_db = realpath(path_dhclient_db, NULL); if (path_dhclient_db == NULL) - log_fatal("%s: %s", path, strerror(errno)); + log_fatal("Failed to get realpath for %s: %s", old_path, strerror(errno)); } if (path_dhclient_script[0] != '/') { - char *path = dmalloc(PATH_MAX, MDL); - if (path == NULL) - log_fatal("No memory for filename\n"); - path_dhclient_script = realpath(path_dhclient_script, path); + const char *old_path = path_dhclient_script; + path_dhclient_script = realpath(path_dhclient_script, NULL); if (path_dhclient_script == NULL) - log_fatal("%s: %s", path, strerror(errno)); + log_fatal("Failed to get realpath for %s: %s", old_path, strerror(errno)); } /* Index: common/bpf.c =================================================================== RCS file: /proj/cvs/prod/DHCP/common/bpf.c,v retrieving revision 1.62 retrieving revision 1.62.202.1 diff -u -r1.62 -r1.62.202.1 --- a/common/bpf.c 24 Nov 2009 02:06:56 -0000 1.62 +++ b/common/bpf.c 28 Feb 2012 15:15:18 -0000 1.62.202.1 @@ -550,7 +550,9 @@ interface_dereference (&fbi, MDL); } } +#endif +#if defined(USE_BPF_RECEIVE) || defined(USE_BPF_HWADDR) void get_hw_addr(const char *name, struct hardware *hw) { struct ifaddrs *ifa; Index: common/lpf.c =================================================================== RCS file: /proj/cvs/prod/DHCP/common/lpf.c,v retrieving revision 1.41 retrieving revision 1.41.64.1 diff -u -r1.41 -r1.41.64.1 --- a/common/lpf.c 10 May 2011 14:27:56 -0000 1.41 +++ b/common/lpf.c 28 Feb 2012 15:15:18 -0000 1.41.64.1 @@ -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> @@ -40,8 +39,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. */ @@ -417,7 +422,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; Index: includes/osdep.h =================================================================== RCS file: /proj/cvs/prod/DHCP/includes/osdep.h,v retrieving revision 1.44 retrieving revision 1.44.122.1 diff -u -r1.44 -r1.44.122.1 --- a/includes/osdep.h 9 Sep 2010 22:18:02 -0000 1.44 +++ b/includes/osdep.h 28 Feb 2012 15:15:16 -0000 1.44.122.1 @@ -108,6 +108,10 @@ # define USE_SOCKET_RECEIVE # if defined(HAVE_DLPI) # define USE_DLPI_HWADDR +# elif defined(HAVE_LPF) || defined (__GNU__) +# define USE_LPF_HWADDR +# elif defined(HAVE_BPF) +# define USE_BPF_HWADDR # endif #endif Index: server/dhcpd.c =================================================================== RCS file: /proj/cvs/prod/DHCP/server/dhcpd.c,v retrieving revision 1.158 retrieving revision 1.158.76.1 diff -u -r1.158 -r1.158.76.1 --- a/server/dhcpd.c 21 Apr 2011 13:24:24 -0000 1.158 +++ b/server/dhcpd.c 28 Feb 2012 15:44:01 -0000 1.158.76.1 @@ -464,12 +464,11 @@ * to be reopened after chdir() has been called */ if (path_dhcpd_db[0] != '/') { - char *path = dmalloc(PATH_MAX, MDL); - if (path == NULL) - log_fatal("No memory for filename\n"); - path_dhcpd_db = realpath(path_dhcpd_db, path); + const char *path = path_dhcpd_db; + path_dhcpd_db = realpath(path_dhcpd_db, NULL); if (path_dhcpd_db == NULL) - log_fatal("%s: %s", path, strerror(errno)); + log_fatal("Failed to get realpath for %s: %s", path, + strerror(errno)); } if (!quiet) {
--- configure.in.orig 2011-12-04 23:21:32.000000000 +0100 +++ configure.in 2011-12-04 23:21:35.000000000 +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" ;; --- configure.orig 2011-12-04 23:25:28.000000000 +0100 +++ configure 2011-12-04 23:25:32.000000000 +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" ;; --- ./lib/isc/unix/net.c.orig 2011-12-04 23:44:51.000000000 +0100 +++ ./lib/isc/unix/net.c 2011-12-04 23:44:59.000000000 +0100 @@ -130,6 +130,9 @@ #ifdef EAFNOSUPPORT case EAFNOSUPPORT: #endif +#ifdef EPFNOSUPPORT + case EPFNOSUPPORT: +#endif #ifdef EPROTONOSUPPORT case EPROTONOSUPPORT: #endif
--- debian/rules.orig 2012-05-12 01:15:07.000000000 +0000 +++ debian/rules 2012-05-12 01:15:49.000000000 +0000 @@ -35,12 +35,19 @@ CFLAGS += -D_PATH_DHCLIENT_CONF='"/etc/dhcp/dhclient.conf"' CFLAGS += -DNOMINUM +ifeq ($(DEB_HOST_ARCH_OS), hurd) +CONFIG=--enable-use-sockets +else +CONFIG= +endif + build-ldap-stamp: dh_testdir ./configure \ --prefix=$(DESTDIR)/usr \ --sysconfdir=$(DESTDIR)/etc/dhcp \ + $(CONFIG) \ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \ --with-cli-lease-file=/var/lib/dhcp/dhclient.leases \ @@ -69,6 +76,7 @@ ./configure \ --prefix=$(DESTDIR)/usr \ --sysconfdir=$(DESTDIR)/etc/dhcp \ + $(CONFIG) \ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \ --with-cli-lease-file=/var/lib/dhcp/dhclient.leases \
#!/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 "$new_domain_search" ] || [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then new_resolv_conf=/etc/resolv.conf.dhclient-new rm -f $new_resolv_conf if [ -n "$new_domain_name" ]; then echo domain ${new_domain_name%% *} >>$new_resolv_conf fi if [ -n "$new_domain_search" ]; then if [ -n "$new_domain_name" ]; then domain_in_search_list="" for domain in $new_domain_search; do if [ "$domain" = "${new_domain_name}" ] || [ "$domain" = "${new_domain_name}." ]; then domain_in_search_list="Yes" fi done if [ -z "$domain_in_search_list" ]; then new_domain_search="$new_domain_name $new_domain_search" fi fi echo "search ${new_domain_search}" >> $new_resolv_conf elif [ -n "$new_domain_name" ]; then echo "search ${new_domain_name}" >> $new_resolv_conf fi if [ -n "$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 # DHCPv6 elif [ -n "$new_dhcp6_domain_search" ] || [ -n "$new_dhcp6_name_servers" ]; then new_resolv_conf=/etc/resolv.conf.dhclient-new rm -f $new_resolv_conf if [ -n "$new_dhcp6_domain_search" ]; then echo "search ${new_dhcp6_domain_search}" >> $new_resolv_conf fi if [ -n "$new_dhcp6_name_servers" ]; then for nameserver in $new_dhcp6_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 given script run_hook() { local script local exit_status script="$1" 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" fi return $exit_status } # run scripts in given directory run_hookdir() { local dir local exit_status dir="$1" 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. if ! run_hookdir /etc/dhcp/dhclient-exit-hooks.d "$@"; then exit_status=$? fi exit $exit_status } # set up some variables for DHCPv4 handlers below 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 "$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 [ -z "$new_interface_mtu" ] || [ "$new_interface_mtu" -lt 576 ]; then 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 ### DHCPv4 Handlers 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) # ensure interface is up # TODO: handle multiple interface case. settrans -afg /servers/socket/2 /hurd/pfinet -i ${interface} if [ -n "$alias_ip_address" ]; then # flush alias IP from interface # TODO : # ip -4 addr flush dev ${interface} label ${interface}:0 fi ;; BOUND|RENEW|REBIND|REBOOT) if [ -n "$old_host_name" ] && [ -n "$new_host_name" ] && [ "$old_host_name" != "$new_host_name" ]; then # hostname changed => set it hostname "$new_host_name" fi if [ -n "$old_ip_address" ] && [ -n "$alias_ip_address" ] && [ "$alias_ip_address" != "$old_ip_address" ]; then # alias IP may have changed => flush it # TODO : # ip -4 addr flush dev ${interface} label ${interface}:0 fi if [ -n "$old_ip_address" ] && [ "$old_ip_address" != "$new_ip_address" ]; then # leased IP has changed => flush it inetutils-ifconfig -i ${interface} -A 0.0.0.0 fi if [ -z "$old_ip_address" ] || [ "$old_ip_address" != "$new_ip_address" ] || [ "$reason" = "BOUND" ] || [ "$reason" = "REBOOT" ]; then # new IP has been leased or leased IP changed => set it inetutils-ifconfig -i ${interface} -A ${new_ip_address} \ ${new_subnet_arg} ${new_broadcast_arg} if [ -n "$new_interface_mtu" ]; then # set MTU inetutils-ifconfig -i ${interface} --mtu ${new_interface_mtu} fi for router in $new_routers; do if [ "$new_subnet_mask" = "255.255.255.255" ]; then # point-to-point connection => set explicit route # TODO : #ip -4 route add ${router} dev $interface >/dev/null 2>&1 fi # set default route fsysopts /servers/socket/2 $(fsysopts /servers/socket/2) -g ${router} done fi if [ -n "$alias_ip_address" ] && [ "$new_ip_address" != "$alias_ip_address" ]; then # separate alias IP given, which may have changed # => flush it, set it & add host route to it # TODO : #ip -4 addr flush dev ${interface} label ${interface}:0 #ip -4 addr add ${alias_ip_address}${alias_mask} \ # dev ${interface} label ${interface}:0 #ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1 fi # update /etc/resolv.conf make_resolv_conf ;; EXPIRE|FAIL|RELEASE|STOP) if [ -n "$alias_ip_address" ]; then # flush alias IP # TODO : #ip -4 addr flush dev ${interface} label ${interface}:0 fi if [ -n "$old_ip_address" ]; then # flush leased IP inetutils-ifconfig -i ${interface} -A 0.0.0.0 fi if [ -n "$alias_ip_address" ]; then # alias IP given => set it & add host route to it # TODO : #ip -4 addr add ${alias_ip_address}${alias_network_arg} \ # dev ${interface} label ${interface}:0 #ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1 fi ;; TIMEOUT) if [ -n "$alias_ip_address" ]; then # flush alias IP # TODO : #ip -4 addr flush dev ${interface} label ${interface}:0 fi # set IP from recorded lease inetutils-ifconfig -i ${interface} -A ${new_ip_address} \ ${new_subnet_arg} ${new_broadcast_arg} if [ -n "$new_interface_mtu" ]; then # set MTU inetutils-ifconfig -i ${interface} --mtu ${new_interface_mtu} fi # if there is no router recorded in the lease or the 1st router answers pings if [ -z "$new_routers" ] || ping -q -c 1 "${new_routers%% *}"; then if [ -n "$alias_ip_address" ] && [ "$new_ip_address" != "$alias_ip_address" ]; then # separate alias IP given => set up the alias IP & add host route to it # TODO : #ip -4 addr add ${alias_ip_address}${alias_mask} \ # dev ${interface} label ${interface}:0 #ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1 fi # set default route for router in $new_routers; do fsysopts /servers/socket/2 $(fsysopts /servers/socket/2) -g ${router} done # update /etc/resolv.conf make_resolv_conf else # flush all IPs from interface 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. # update /etc/resolv.conf based on received values make_resolv_conf() { local new_resolv_conf if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then 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 current_hostname=$(hostname) if [ -z "$current_hostname" ] || [ "$current_hostname" = "(none)" ]; then hostname "$new_host_name" fi } # set up some variables for DHCP handlers below 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
: