From 35f156983be5842b63736e030c9c2e50dfd76547 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 04:14:53 +0000 Subject: [PATCH] auto-import changelog data from dhcp-3.0pl2-6.16.src.rpm 3.0pl2-6.16 - Fix location of ntp driftfile 3.0pl2-6.15 - Bump Release 3.0pl2-6.14 - Add div0 patch 3.0pl2-6.13 - Add SEARCH to client script 3.0pl2-6.12 - Bump Release 3.0pl2-6.11 - Add configtest 3.0pl2-6.10 - increment for base 3.0pl2-6.9 - Don't update resolv.conf on renewals 3.0pl2-6.8 - increment for base 3.0pl2-6.7 - Fix name of driftfile 3.0pl2-6.6 - increment for base 3.0pl2-6.5 - Change dhcrelay script to check DHCPSERVERS 3.0pl2-6.4 - increment for base 3.0pl2-6.3 - Fix dhclient-script to support PEERNTP and PEERNIS flags. - patch submitted by aoliva@redhat.com 3.0pl2-6.1 - add epoch to dhcp-devel versioned requires on dhcp - build for RHEL Wed Jun 04 2003 Elliot Lee - rebuilt Tue May 27 2003 Dan Walsh 3.0pl2-5 - Fix memory leak in parser. Mon May 19 2003 Dan Walsh 3.0pl2-4 - Change Rev for RHEL Mon May 19 2003 Dan Walsh 3.0pl2-3 - Change example to not give out 255 address. Tue Apr 29 2003 Dan Walsh 3.0pl2-2 - Change Rev for RHEL Mon Apr 28 2003 Dan Walsh 3.0pl2-1 - upgrade to 3.0pl2 Wed Mar 26 2003 Dan Walsh 3.0pl1-26 - add usage for dhcprelay -c - add man page for dhcprelay -c Fri Mar 07 2003 Dan Walsh 3.0pl1-25 - Fix man dhcpd.conf man page Tue Mar 04 2003 Dan Walsh 3.0pl1-24 - Fix man dhcpctl.3 page --- .cvsignore | 2 +- dhcp.spec | 89 +++++++++++++++++++++++++++++++++++++++++++++-- dhcpd.conf.sample | 2 +- dhcpd.init | 6 +++- dhcrelay.init | 2 +- sources | 2 +- 6 files changed, 95 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8bf20b9..e6938b2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dhcp-3.0pl1.tar.gz +dhcp-3.0pl2.tar.gz diff --git a/dhcp.spec b/dhcp.spec index 0192784..8e0747e 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -1,8 +1,8 @@ Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Epoch: 1 -Version: 3.0pl1 -Release: 23 +Version: 3.0pl2 +Release: 6.16 Copyright: distributable Group: System Environment/Daemons Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz @@ -20,6 +20,10 @@ Patch105: dhcp-3.0pl1-ntp.patch Patch106: dhcp-3.0pl1-minires.patch Patch107: dhcp-3.0pl1-hops.patch Patch108: dhcp-3.0pl1-ntpscript.patch +Patch109: dhcpd-manpage.patch +Patch110: dhcp-3.0pl2-memleaks.patch +Patch111: dhcp-clientscript.patch +Patch112: dhcp-3.0pl2-div0.patch URL: http://isc.org/products/DHCP/ BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -45,7 +49,7 @@ Group: System Environment/Base %package devel Summary: Development headers and libraries for interfacing to the DHCP server -Requires: dhcp = %{version} +Requires: dhcp = %{epoch}:%{version} Group: Development/Libraries %description -n dhclient @@ -76,6 +80,10 @@ Libraries for interfacing with the ISC DHCP server. %patch106 -p1 -b .minires %patch107 -p1 -b .hops %patch108 -p1 -b .ntpscript +%patch109 -p1 -b .dhcpdman +%patch110 -p1 -b .memleaks +%patch111 -p1 -b .clientscript +%patch112 -p1 -b .div0 cp %SOURCE1 . cat <site.conf @@ -190,6 +198,81 @@ fi %{_mandir}/man3/* %changelog +* Wed Oct 8 2003 Dan Walsh 1:3.0pl2-6.16 +- Fix location of ntp driftfile + +* Fri Sep 5 2003 Dan Walsh 1:3.0pl2-6.15 +- Bump Release + +* Fri Sep 5 2003 Dan Walsh 1:3.0pl2-6.14 +- Add div0 patch + +* Wed Aug 20 2003 Dan Walsh 1:3.0pl2-6.13 +- Add SEARCH to client script + +* Wed Aug 20 2003 Dan Walsh 1:3.0pl2-6.12 +- Bump Release + +* Wed Aug 20 2003 Dan Walsh 1:3.0pl2-6.11 +- Add configtest + +* Fri Aug 1 2003 Dan Walsh 1:3.0pl2-6.10 +- increment for base + +* Fri Aug 1 2003 Dan Walsh 1:3.0pl2-6.9 +- Don't update resolv.conf on renewals + +* Tue Jul 29 2003 Dan Walsh 1:3.0pl2-6.8 +- increment for base + +* Tue Jul 29 2003 Dan Walsh 1:3.0pl2-6.7 +- Fix name of driftfile + +* Tue Jul 29 2003 Dan Walsh 1:3.0pl2-6.6 +- increment for base + +* Tue Jul 29 2003 Dan Walsh 1:3.0pl2-6.5 +- Change dhcrelay script to check DHCPSERVERS + +* Mon Jul 7 2003 Dan Walsh 1:3.0pl2-6.4 +- increment for base + +* Mon Jul 7 2003 Dan Walsh 1:3.0pl2-6.3 +- Fix dhclient-script to support PEERNTP and PEERNIS flags. +- patch submitted by aoliva@redhat.com + +* Sun Jun 8 2003 Tim Powers 1:3.0pl2-6.1 +- add epoch to dhcp-devel versioned requires on dhcp +- build for RHEL + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue May 27 2003 Dan Walsh 3.0pl2-5 +- Fix memory leak in parser. + +* Mon May 19 2003 Dan Walsh 3.0pl2-4 +- Change Rev for RHEL + +* Mon May 19 2003 Dan Walsh 3.0pl2-3 +- Change example to not give out 255 address. + +* Tue Apr 29 2003 Dan Walsh 3.0pl2-2 +- Change Rev for RHEL + +* Mon Apr 28 2003 Dan Walsh 3.0pl2-1 +- upgrade to 3.0pl2 + +* Wed Mar 26 2003 Dan Walsh 3.0pl1-26 +- add usage for dhcprelay -c +- add man page for dhcprelay -c + +* Fri Mar 7 2003 Dan Walsh 3.0pl1-25 +- Fix man dhcpd.conf man page + +* Tue Mar 4 2003 Dan Walsh 3.0pl1-24 +- Fix man dhcpctl.3 page + * Mon Feb 3 2003 Dan Walsh 3.0pl1-23 - fix script to handle ntp.conf correctly diff --git a/dhcpd.conf.sample b/dhcpd.conf.sample index 5746a52..736c217 100644 --- a/dhcpd.conf.sample +++ b/dhcpd.conf.sample @@ -18,7 +18,7 @@ subnet 192.168.0.0 netmask 255.255.255.0 { # -- you understand Netbios very well # option netbios-node-type 2; - range dynamic-bootp 192.168.0.128 192.168.0.255; + range dynamic-bootp 192.168.0.128 192.168.0.254; default-lease-time 21600; max-lease-time 43200; diff --git a/dhcpd.init b/dhcpd.init index ac803fa..0035f85 100644 --- a/dhcpd.init +++ b/dhcpd.init @@ -63,12 +63,16 @@ case "$1" in RETVAL=$? fi ;; + configtest) + dhcpd -t + RETVAL=$? + ;; status) status dhcpd RETVAL=$? ;; *) - echo $"Usage: $0 {start|stop|restart|condrestart|status}" + echo $"Usage: $0 {start|stop|restart|condrestart|configtest|status}" exit 1 esac diff --git a/dhcrelay.init b/dhcrelay.init index 6eeccfd..fccb5fe 100644 --- a/dhcrelay.init +++ b/dhcrelay.init @@ -15,7 +15,7 @@ # Source dhcrelay configuration. We can't default a DHCPSERVERS entry! if [ -f /etc/sysconfig/dhcrelay ] ; then . /etc/sysconfig/dhcrelay - [ -n "$INTERFACES" ] || exit 0 + [ -n "$DHCPSERVERS" ] || exit 0 else exit 0 fi diff --git a/sources b/sources index 2ce1af8..8e736fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85164daf66b2a46b59923750c5716fd1 dhcp-3.0pl1.tar.gz +2cb5db7a0c23deaef4724b5fc3f9a869 dhcp-3.0pl2.tar.gz