dhcp: update to 4.3.6.

This commit is contained in:
Enno Boland 2017-08-31 08:52:15 +02:00
parent bcf1b286c7
commit fb439cddef
3 changed files with 2 additions and 80 deletions

View File

@ -1,48 +0,0 @@
Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
Date: 2011-11-23
Initial Package Version: 4.2.2
Upstream Status: unknown
Origin: found at fedora
Description: Allow dhcp4 to work even if the kernel doesn't support ipv6.
Fixed up by hand to apply to 4.2.2 (to me, it looks identical to the 4.2.0
version, but patch failed in one hunk when I tried to apply that one).
--- common/discover.c.orig 2011-07-19 23:22:48.000000000 +0100
+++ common/discover.c 2011-09-06 01:28:15.000000000 +0100
@@ -455,7 +455,7 @@
}
#ifdef DHCPv6
- if (local_family == AF_INET6) {
+ if ((local_family == AF_INET6) && !access("/proc/net/if_inet6", R_OK)) {
ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
if (ifaces->fp6 == NULL) {
log_error("Error opening '/proc/net/if_inet6' to "
@@ -466,6 +466,8 @@
ifaces->fp = NULL;
return 0;
}
+ } else {
+ ifaces->fp6 = NULL;
}
#endif
@@ -733,7 +735,7 @@
return 1;
}
#ifdef DHCPv6
- if (!(*err)) {
+ if (!(*err) && ifaces->fp6) {
if (local_family == AF_INET6)
return next_iface6(info, err, ifaces);
}
@@ -752,7 +754,8 @@
ifaces->sock = -1;
#ifdef DHCPv6
if (local_family == AF_INET6) {
- fclose(ifaces->fp6);
+ if (ifaces->fp6)
+ fclose(ifaces->fp6);
ifaces->fp6 = NULL;
}
#endif

View File

@ -1,30 +0,0 @@
--- client/scripts/linux.orig 2015-03-28 18:39:02.213070516 +0100
+++ client/scripts/linux 2015-03-28 18:38:54.187071116 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# dhclient-script for Linux. Dan Halbert, March, 1997.
# Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
# No guarantees about this. I'm a novice at the details of Linux
@@ -49,11 +49,10 @@ make_resolv_conf() {
if [ "x${new_dhcp6_domain_search}" != x ] ; then
echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
fi
- shopt -s nocasematch
for nameserver in ${new_dhcp6_name_servers} ; do
# If the nameserver has a link-local address
# add a <zone_id> (interface name) to it.
- if [[ "$nameserver" =~ ^fe80:: ]]
+ if echo "$nameserver" | grep -i "^fe80::" > /dev/null
then
zone_id="%$interface"
else
@@ -61,7 +60,6 @@ make_resolv_conf() {
fi
echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
done
- shopt -u nocasematch
mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
fi

View File

@ -1,6 +1,6 @@
# Template file for 'dhcp'
pkgname=dhcp
version=4.3.5
version=4.3.6
revision=1
build_style=gnu-configure
disable_parallel_build=yes
@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
license="ISC"
homepage="https://www.isc.org/software/dhcp"
distfiles="http://ftp.isc.org/isc/dhcp/${version}/dhcp-${version}.tar.gz"
checksum=eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954
checksum=a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b
pre_configure() {
local _args=" --sbindir=/usr/bin --enable-paranoia