Date: Sunday, July 18, 2010 @ 22:41:06 Author: kevin Revision: 85736 upgpkg: dhcp 4.2.0-1 Updated to 4.2.0
Modified: dhcp/trunk/ChangeLog dhcp/trunk/PKGBUILD dhcp/trunk/dhcp.install Deleted: dhcp/trunk/dhcp-4.1.0-missing-ipv6-not-fatal.patch -----------------------------------------+ ChangeLog | 5 ++ PKGBUILD | 6 +-- dhcp-4.1.0-missing-ipv6-not-fatal.patch | 54 ------------------------------ dhcp.install | 2 - 4 files changed, 8 insertions(+), 59 deletions(-) Modified: ChangeLog =================================================================== --- ChangeLog 2010-07-19 02:30:07 UTC (rev 85735) +++ ChangeLog 2010-07-19 02:41:06 UTC (rev 85736) @@ -1,5 +1,8 @@ -2009-07-19 K. Piche <[email protected]> +2010-07-16 kevin <[email protected]> + * dhcp 4.2.0-1 + +2009-07-19 kevin <[email protected]> * dhcp 4.1.0.p1-1 * Adopted RedHat patch to fix bug where dhcpd won't start if ipv6 module is not loaded. Fixes FS#12792. Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-07-19 02:30:07 UTC (rev 85735) +++ PKGBUILD 2010-07-19 02:41:06 UTC (rev 85736) @@ -4,15 +4,15 @@ pkgname=('dhcp' 'dhclient') # separate patch levels with a period to maintain proper versioning. -pkgver=4.1.1.p1 -_pkgver=4.1.1-P1 +pkgver=4.2.0 +_pkgver=4.2.0 pkgrel=1 arch=('i686' 'x86_64') license=('custom:isc-dhcp') url="https://www.isc.org/software/dhcp"; source=(http://ftp.isc.org/isc/${pkgname}/${pkgname}-${_pkgver}.tar.gz dhcpd dhcp.conf.d dhcp-4.1.1-missing-ipv6-not-fatal.patch dhclient-script-pathFixes.patch) -md5sums=('ee390a35687dd75dbfc32c856c0938d1' +md5sums=('83abd7c4f9c24d8dd024ca5a71380c0a' 'df22cffa7d7415ece7bb025b7bf774dd' '49da3192e5c885e3c7d02f447c2dea5e' 'fd64aeb4f399dcc41ea43089a3811094' Deleted: dhcp-4.1.0-missing-ipv6-not-fatal.patch =================================================================== --- dhcp-4.1.0-missing-ipv6-not-fatal.patch 2010-07-19 02:30:07 UTC (rev 85735) +++ dhcp-4.1.0-missing-ipv6-not-fatal.patch 2010-07-19 02:41:06 UTC (rev 85736) @@ -1,54 +0,0 @@ -Based on patch from redhat: http://cvs.fedoraproject.org/viewvc/devel/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch?revision=1.2 - ---- common/discover.c.orig 2008-08-29 13:48:57.000000000 -0400 -+++ common/discover.c 2009-09-08 23:32:45.000000000 -0400 -@@ -443,16 +443,20 @@ - } - - #ifdef DHCPv6 -- ifaces->fp6 = fopen("/proc/net/if_inet6", "r"); -- if (ifaces->fp6 == NULL) { -- log_error("Error opening '/proc/net/if_inet6' to " -- "list IPv6 interfaces; %m"); -- close(ifaces->sock); -- ifaces->sock = -1; -- fclose(ifaces->fp); -- ifaces->fp = NULL; -- return 0; -- } -+ if (!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 " -+ "list IPv6 interfaces; %m"); -+ close(ifaces->sock); -+ ifaces->sock = -1; -+ fclose(ifaces->fp); -+ ifaces->fp = NULL; -+ return 0; -+ } -+ } else { -+ ifaces->fp6 = NULL; -+ } - #endif - - return 1; -@@ -719,7 +723,7 @@ - return 1; - } - #ifdef DHCPv6 -- if (!(*err)) { -+ if (!(*err) && ifaces->fp6) { - return next_iface6(info, err, ifaces); - } - #endif -@@ -736,7 +740,8 @@ - close(ifaces->sock); - ifaces->sock = -1; - #ifdef DHCPv6 -- fclose(ifaces->fp6); -+ if (ifaces->fp6) -+ fclose(ifaces->fp6); - ifaces->fp6 = NULL; - #endif - } Modified: dhcp.install =================================================================== --- dhcp.install 2010-07-19 02:30:07 UTC (rev 85735) +++ dhcp.install 2010-07-19 02:41:06 UTC (rev 85736) @@ -1,7 +1,7 @@ # arg 1: the new package version post_install() { [ -f var/state/dhcp/dhcpd.leases ] || : >var/state/dhcp/dhcpd.leases - echo "If dhcpd doesn't start, ensure the ipv6 kernel module is loaded." + #echo "If dhcpd doesn't start, ensure the ipv6 kernel module is loaded." } # arg 1: the new package version
