Update the net/isc-dhcp3-* ports to version 3.0.5rc1. This version contains an official fix for the 8 byte lease time offer we've seen with 64bit ARCH's in version 3.0.4. I've verified the correct operation using FreeBSD-6.1 on i386 and amd64 using Windows-XP, Linux and FreeBSD as client. Other changes in net/isc-dhcpd3-server: - Makefile * correct usage of USE_RC_SUBR (script-name instead of "yes") * removed hardcoded RC_DIR * removed RCSCRIPTS_SUB, use SUB_LIST to substitute inside rc scripts * removed patch-rc-scripts and install-startup-files targets this is handled by USE_RC_SUBR now * added an explicit call for the install-rc-script target in POST-INSTALL, without this the rc scripts are installed to late and pkg-install is not running correctly - distinfo * chase new version and checksums - pkg-install * respect and work with all possible rc script filenames necessary as USE_RC_SUBR magic will install it either with or without the ".sh" extension - pkg-plist * removed the hardcoded rc script, USE_RC_SUBR will add it on the fly * stop running processes when deinstalling - files/isc-dhcpd.in (NEW) * copy over of files/isc-dhcpd.sh.sample * changed rcvar to rcvar=${name}_enable (PH compliance) - files/isc-dhcpd.sh.sample (DEAD) * USE_RC_SUBR requires ".in" extension - files/isc-dhcrelay.in (NEW) * copy over of files/isc-dhcrelay.sh.sample * changed rcvar to rcvar=${name}_enable (PH compliance) - files/isc-dhcrelay.sh.sample (DEAD) * USE_RC_SUBR requires ".in" extension - files/patch-server::dhcp.c (DEAD) * no longer necessary, fixed in the main codebase Other changes in net/isc-dhcpd3-relay: - pkg-plist * removed the hardcoded rc script, USE_RC_SUBR will add it on the fly * stop running processes when deinstalling - UPDATING * add some notes about stopping the services when deinstalling * add a note about the possible rc script name change due to the use of USE_RC_SUBR Successful tinderbox tested on: i386 RELENG_[456] and CURRENT amd64 RELENG_6 and CURRENT Fix: - apply the attached net_isc-dhcp3-server.diff to net/isc-dhcp3-server and net_isc-dhcp3-relay.diff to net/isc-dhcp3-relay - remove the following files from CVS ( in net/isc-dhcp3-server) * files/isc-dhcpd.sh.sample * files/isc-dhcrelay.sh.sample * files/patch-server::dhcp.c - add the following files to CVS ( in net/isc-dhcp3-server) * files/isc-dhcpd.in * files/isc-dhcrelay.in Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3-relay/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- pkg-plist 26 Jun 2004 08:46:05 -0000 1.4 +++ pkg-plist 24 Aug 2006 17:48:33 -0000 @@ -1,3 +1,4 @@ @comment $FreeBSD: ports/net/isc-dhcp3-relay/pkg-plist,v 1.4 2004/06/26 08:46:05 eik Exp $ -etc/rc.d/isc-dhcrelay.sh +@unexec %D/etc/rc.d/isc-dhcrelay.sh forcestop 2>/dev/null || true +@unexec %D/etc/rc.d/isc-dhcrelay forcestop 2>/dev/null || true sbin/dhcrelay --- net_isc-dhcp3-relay.diff ends here ---
Responsible Changed From-To: freebsd-ports-bugs->sem Take it.
State Changed From-To: open->closed Committed. Thanks!