rpms/dhcp/FC-3 dhcp.spec,1.43,1.43.2.1

[fedora-cvs-commits redhat com]

Author: jvdias

Update of /cvs/dist/rpms/dhcp/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv23806

Modified Files:
      Tag: dhcp-3_0_3-4_FC3
	dhcp.spec 
Log Message:



Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/FC-3/dhcp.spec,v
retrieving revision 1.43
retrieving revision 1.43.2.1
diff -u -r1.43 -r1.43.2.1
--- dhcp.spec	7 Jul 2005 23:22:53 -0000	1.43
+++ dhcp.spec	29 Aug 2005 23:45:49 -0000	1.43.2.1
@@ -1,14 +1,16 @@
+%{?!DHCLIENT_EXTENDED_OPTION_ENVIRONMENT:%define DHCLIENT_EXTENDED_OPTION_ENVIRONMENT 1}
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
-Name: dhcp
-Epoch: 7
-Version: 3.0.1
-Release: 44_FC3
+Name:    dhcp
+Version: 3.0.3
+Release: 4_FC3
+Epoch:   11
 License: distributable
 Group: System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
 Source1: dhcpd.conf.sample
 Source2: dhcpd.init
 Source3: dhcrelay.init
+Source4: dhcpd.conf
 Patch: dhcp-3.0-alignment.patch
 Patch100: dhcp-3.0-jbuild.patch
 Patch102: dhcp-3.0.1rc13-dhcpctlman.patch
@@ -34,25 +36,37 @@
 Patch129: dhcp-3.0.1-fix-ntp.patch
 Patch130: dhcp-3.0.1-release-mode-ifup.patch
 Patch131: dhcp-3.0.1-dhclient-script-big-fix.patch
-Patch132: dhcp-3.0.1-router-not-on-subnet.patch
-Patch133: dhcp-3.0.1-fix-hex.patch
-Patch134: dhcp-3.0.1-mem.patch
+Patch132: dhcp-3.0.2rc3-fix-hex.patch
+Patch133: dhcp-3.0.2rc3-mem.patch
+Patch134: dhcp-3.0.2rc3-dhclient_routes.patch
 Patch135: dhcp-3.0.1-z-relro-now.patch
-Patch136: dhcp-3.0.1-dhclient-restorecon.patch
+Patch136: dhcp-3.0.2rc3-dhclient-restorecon.patch
 Patch137: dhcp-3.0.1-dhclient-config.patch
-Patch138: dhcp-3.0.1-pid_file_excl.patch
-Patch139: dhcp-3.0.1-dhclient-script-DHCLIENT_USE_GATEWAY.patch
-Patch140: dhcp-3.0.1-decline_backoff.patch
-Patch141: dhcp-3.0.1-fast.patch
-Patch142: dhcp-3.0.1-dhclient-no_isc_blurb.patch
-Patch143: dhcp-3.0.1-uint8_binding_state.patch
-Patch144: dhcp-3.0.1-dhclient-script-update.patch
-
+Patch138: dhcp-3.0.2-pid_file_excl.patch
+Patch139: dhcp-3.0.2-dhclient-no-restorecon-or-route.patch
+Patch140: dhcp-3.0.2-extended_option_environment.patch
+Patch141: dhcp-3.0.2-dhclient-no_isc_blurb.patch
+Patch142: dhcp-3.0.2-dhclient-script-restorecon.patch
+Patch143: dhcp-3.0.2-dhclient-script-dhcdbd.patch
+Patch144: dhcp-3.0.2-dhclient-script-fix-init-state-1.patch
+Patch145: dhcp-3.0.2-dhclient-script-dbus-fix-interface.patch
+Patch146: dhcp-3.0.2-dhclient_nodelay.patch
+Patch147: dhcp-3.0.2-dhclient_decline_backoff.patch
+Patch148: dhcp-3.0.2-uint8_binding_state.patch
+Patch149: dhcp-3.0.2-dhclient_script_fast+arping.patch
+Patch150: dhcp-3.0.3rc1-no-__u16.patch
+Patch151: dhcp-3.0.3rc1-boot-file-server.patch
+Patch152: dhcp-3.0.3-fast_dhclient.patch
+Patch153: dhcp-3.0.3-dhclient-script-ypbind-hup-ok.patch
+Patch154: dhcp-3.0.3-trailing_nul_options.patch
+Patch155: dhcp-3.0.3-gcc4_warnings.patch
+Patch156: dhcp-3.0.3-version.patch
+Patch157: dhcp-3.0.3-dhclient-script-up-down-hooks.patch
 URL: http://isc.org/products/DHCP/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig
-Requires: kernel >= 2.2.18
-BuildRequires: compat-gcc >= 8-3.3.4.2   groff
+BuildRequires:  groff
+#BuildRequires: compat-gcc >= 8-3.3.4.2   groff
 
 %description
 DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
@@ -110,29 +124,48 @@
 %patch120 -p1 -b .noconfig
 %patch121 -p1 -b .change_resolv_conf
 %patch122 -p1 -b .default_gateway
-%patch123 -p1 -b .preserve-sent-options
-%patch124 -p1 -b .mis-host 
-%patch125 -p1 -b .new-host
-%patch126 -p1 -b .host-dereference
-%patch127 -p1 -b .restrict-unconfigured-IF
+# patches now upstream:
+# %patch123 -p1 -b .preserve-sent-options
+# %patch124 -p1 -b .mis-host 
+# %patch125 -p1 -b .new-host
+# %patch126 -p1 -b .host-dereference
+# %patch127 -p1 -b .restrict-unconfigured-IF
 %patch128 -p1 -b .check-empty-new-routers
 %patch129 -p1 -b .fix-ntp
 %patch130 -p1 -b .release-mode-ifup
 %patch131 -p1 -b .dhclient-script-big-fix
-%patch132 -p1 -b .router-not-on-subnet
-%patch133 -p1 -b .fix-hex
-%patch134 -p1 -b .mem
+# patches now upstream:
+# %patch132 -p1 -b .fix-hex
+# %patch133 -p1 -b .mem
+%patch134 -p1 -b .dhclient_routes
 %patch135 -p1 -b .-z-relro-now
 %patch136 -p1 -b .dhclient-restorecon
-%patch137 -p1 -b .dhclient-config
+%patch137 -p1 -b .dhclient-dhconfig
 %patch138 -p1 -b .pid_file_excl
-%patch139 -p1 -b .dhclient-script-DHCLIENT_USE_GATEWAY
-%patch140 -p1 -b .decline_backoff
-%patch141 -p1 -b .fast
-%patch142 -p1 -b .dhclient-no_isc_blurb
-%patch143 -p1 -b .uint8_binding_state
-%patch144 -p1 -b .dhclient-script-update
-
+%patch139 -p1 -b .dhclient-no-restorecon-or-route
+%if %{DHCLIENT_EXTENDED_OPTION_ENVIRONMENT}
+%patch140 -p1 -b .extended_option_environment
+%endif
+%patch141 -p1 -b .no_isc_blurb
+%patch142 -p1 -b .restore_restorecon
+%patch143 -p1 -b .dhclient-script-dhcdbd
+%patch144 -p1 -b .dhclient-script-fix-init-state-1
+%patch145 -p1 -b .dhclient-script-dbus-fix-interface
+%patch146 -p1 -b .dhclient_no_delay
+%patch147 -p1 -b .dhclient_decline_backoff
+# patch now upstream:
+# %patch148 -p1 -b .uint8_binding_state
+%patch149 -p1 -b .dhclient_script_fast+arping
+%patch150 -p1 -b .no-__u16
+# %patch151 -p1 -b .boot-file-server
+# RFC2131 compliance: force users to specify either the
+# next-server or server-name options for the tftp-boot-server.
+%patch152 -p1 -b .fast_dhclient
+%patch153 -p1 -b .ypbind_hup_ok
+%patch154 -p1 -b .trailing_nul_options
+%patch155 -p1 -b .gcc4_warnings
+%patch156 -p1 -b .version
+%patch157 -p1 -b .dhclient-script-up-down-hooks
 cp %SOURCE1 .
 cat <<EOF >site.conf
 VARDB=%{_localstatedir}/lib/dhcp
@@ -153,6 +186,7 @@
 #include <stdio.h>
 int main(void) { printf("%%d\n", sizeof(void *)); return 0; }
 EOF
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Dlint -Werror"
 cc -o findptrsize findptrsize.c
 [ "`./findptrsize`" -ge 8 ] && RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPTRSIZE_64BIT"
 %ifarch s390 s390x
@@ -160,7 +194,15 @@
 %else
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fpie"
 %endif
+%if %{DHCLIENT_EXTENDED_OPTION_ENVIRONMENT}
+    RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DEXTENDED_NEW_OPTION_INFO"
+%endif
+#RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's/\ \-mtune\=[^\=\ ]*//'`
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 ./configure --copts "$RPM_OPT_FLAGS"
+# -DDEBUG_PACKET -DDEBUG_EXPRESSIONS"
+# -DDEBUG_MEMORY_LEAKAGE -DDEBUG_MALLOC_POOL -DDEBUG_REFCNT_DMALLOC_FREE -DDEBUG_RC_HISTORY -DDEBUG_MALLOC_POOL_EXHAUSTIVELY -DDEBUG_MEMORY_LEAKAGE_ON_EXIT -DRC_MALLOC=3"
+#make %{?_smp_mflags} CC="gcc33"
 make %{?_smp_mflags} CC="cc"
 
 %install
@@ -190,6 +232,11 @@
 # Copy sample dhclient.conf file into position
 cp client/dhclient.conf dhclient.conf.sample
 chmod 755 %{buildroot}/sbin/dhclient-script
+# Fix bug 163367: install default (empty) dhcpd.conf:
+cp -fp %SOURCE4 %{buildroot}/etc
+
+touch debugfiles.list
+:;
 
 %clean
 rm -rf %{buildroot}
@@ -211,6 +258,7 @@
     service dhcpd condrestart >/dev/null 2>&1
     service dhcrelay condrestart >/dev/null 2>&1
 fi
+exit 0
 
 %files
 %defattr(-,root,root)
@@ -219,6 +267,7 @@
 %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/dhcp/dhcpd.leases
 %config(noreplace) /etc/sysconfig/dhcpd
 %config(noreplace) /etc/sysconfig/dhcrelay
+%config(noreplace) /etc/dhcpd.conf
 %config /etc/rc.d/init.d/dhcpd
 %config /etc/rc.d/init.d/dhcrelay
 %{_bindir}/omshell
@@ -250,60 +299,141 @@
 %{_mandir}/man3/*
 
 %changelog
-* Thu Jul 07 2005 Jason Vas Dias <jvdias redhat com> 7:3.0.1-44_FC3
-- fix bug 162080 + 159929: prevent dhclient flooding network on repeated DHCPDECLINE
-- fix compile with default compiler: change binding_state_t to uint8_t (now upstream)
-- stop dhclient's 1-5 second wait before starting if only one interface being configured
-- make dhclient not emit ISC blurb on error exit
-- dhclient-script fixes:
-    o remove 1 second sleep on PREINIT
-    o further replacement of /sbin/route by /sbin/ip
-    o fix determination of runlevel in init state 1
-    o add class A,B,C static route support
-    o add ARPCHECK support
-- fix bug 151023: dhclient RPM description claimed 'headers and libraries'
-
-* Wed May 04 2005 Jason Vas Dias <jvdias redhat com> 7:3.0.1-42_FC3
-- fix bug 149780: require DHCLIENT_USE_GATEWAY setting for dhclient-script
-  to honor GATEWAY setting
-
-* Thu Feb 24 2005 Jason Vas Dias <jvdias redhat com> 7:3.0.1-40_FC3
-- fix bug 143640: allow only one dhclient to configure an interface
-
-* Tue Feb 15 2005 Jason Vas Dias <jvdias redhat com> 7:3.0.1-38_FC3
-- improved execshield link options; fixed dhcpd.init for -cf in DHCPDARGS
+* Mon Aug 29 2005 Jason Vas Dias <jvdias redhat com> - 11:3.0.3-4
+- fix bug 166926: make dhclient-script handle interface-mtu option
+  make dhclient-script support /etc/dhclient{,-$IF}-{up,down}-hooks scripts
+  to allow easy customization to support other non-default DHCP options -
+  documented in 'man 8 dhclient-script' .
+- handle the 'time-offset' DHCP option, requested by default.
+
+* Tue Aug 23 2005 Jason Vas Dias <jvdias redhat com> - 11:3.0.3-3
+- fix bug 160655: strip trailing '\0' bytes from text options before append
+- fix gcc4 compiler warnings ; now compiles with -Werror
+- add RPM_OPT_FLAGS to link as suggested in gcc man-page on '-pie' option
+- change ISC version string to 'V3.0.3-RedHat' at request of ISC
+
+* Tue Aug  9 2005 Jeremy Katz <katzj redhat com> - 11:3.0.3-2
+- don't explicitly require 2.2 era kernel, it's fairly overkill at this point
+
+* Fri Jul 29 2005 Jason Vas Dias <jvdias redhat com> 11:3.0.3-1
+- Upgrade to upstream version 3.0.3 
+- Don't apply the 'default boot file server' patch: legacy
+  dhcp behaviour broke RFC 2131, which requires that the siaddr
+  field only be non-zero if the next-server or tftp-server-name
+  options are specified.
+- Try removing the 1-5 second wait on dhclient startup altogether.
+- fix bug 163367: supply default configuration file for dhcpd
+ 
+* Thu Jul 14 2005 Jason Vas Dias <jvdias redhat com> 10:3.0.3rc1-1
+- Upgrade to upstream version 3.0.3rc1
+- fix bug 163203: silence ISC blurb on configtest 
+- fix default 'boot file server' value (packet->siaddr):
+  In dhcp-3.0.2(-), this was defaulted to the server address;
+  now it defaults to 0.0.0.0 (a rather silly default!) and 
+  must be specified with the 'next-server' option ( not the tftp-boot-server option ?!?)
+  which causes PXE boot clients to fail to load anything after the boot file.
+
+* Fri Jul 08 2005 Jason Vas Dias <jvdias redhat com> 10:3.0.2-14.FC5
+- Allow package to compile with glibc-headers-2.3.5-11 (tr.c's use of __u16)
+
+* Fri May 10 2005 Jason Vas Dias <jvdias redhat com> 10:3.0.2-14
+- Fix bug 159929: prevent dhclient flooding network on repeated DHCPDECLINE
+- dhclient fast startup: 
+   remove dhclient's  random 1-5 second delay on startup if only
+   configuring one interface 
+   remove dhclient_script's "sleep 1" on PREINIT
+- fix new gcc-4.0.0-11 compiler warnings for binding_state_t
+
+* Tue May 03 2005 Jason Vas Dias <jvdias redhat com> 10:3.0.2-12
+- Rebuild for new glibc
+- Fix dhcdbd set for multiple interfaces
+
+* Wed Apr 27 2005 Jason Vas Dias <jvdias redhat com> 10:3.0.2-11
+- as pointed out by Peter Jones, dhclient-script spews
+- 'chkconfig: Usage' if run in init state 1 (runlevel returns "unknown".)
+- this is now corrected.
+
+* Mon Apr 25 2005 Jason Vas Dias <jvdias redhat com> 10:3.0.2-10
+- dhclient-script dhcdbd extensions. 
+- Tested to have no effect unless dhcdbd invokes dhclient.
+ 
+* Thu Apr 21 2005 Jason Vas Dias <jvdias redhat com> 10:3.0.2-9
+- bugs 153244 & 155143 are now fixed with SELinux policy; 
+  autotrans now works for dhcpc_t, so restorecons are not required,
+  and dhclient runs OK under dhcpc_t with SELinux enforcing.
+- fix bug 155506: 'predhclien' typo (emacs!).
+ 
+* Mon Apr 18 2005 Jason Vas Dias <jvdias redhat com> 10:3.0.2-8
+- Fix bugs 153244 & 155143: 
+      o restore dhclient-script 'restorecon's
+      o give dhclient and dhclient-script an exec context of 
+        'system_u:object_r:sbin_t' that allows them to run
+        domainname / hostname and to update configuration files
+        in dhclient post script.       
+- Prevent dhclient emitting verbose ISC 'blurb' on error exit in -q mode
+
+* Mon Apr 04 2005 Jason Vas Dias <jvdias redhat com> 10:3.0.2-7
+- Add '-x' "extended option environment" dhclient argument:
+-  When -x option given to dhclient:
+-    dhclient enables arbitrary option processing by writing information
+-    about user or vendor defined option space options to environment.
+-
+- fix bug 153244: dhclient should not use restorecon
+- fix bug 151023: dhclient no 'headers & libraries' 
+- fix bug 149780: add 'DHCLIENT_IGNORE_GATEWAY' variable
+- remove all usage of /sbin/route from dhclient-script
+
+* Thu Mar 24 2005 Florian La Roche <laroche redhat com>
+- add "exit 0" to post script
+
+* Mon Mar 07 2005 Jason Vas Dias <jvdias redhat com> 10.3.0.2-3
+- rebuild for gcc4/glibc-2.3.4-14; fix bad memset
+
+* Thu Feb 24 2005 Jason Vas Dias <jvdias redhat com> 10:3.0.2-2
+- Fix bug 143640: do not allow more than one dhclient to configure an interface
+
+* Mon Feb 21 2005 Jason Vas Dias <jvdias redhat com> 10:3.0.2-1
+- Upgrade to ISC 3.0.2 Final Release (documentation change only).
+
+* Tue Feb 14 2005 Jason Vas Dias <jvdias redhat com> 8:3.0.2rc3-8
+- Add better execshield security link options
+- fix dhcpd.init when no /etc/dhcpd.conf exists and -cf in DHCPDARGS
 
-* Mon Feb 14 2005 Jason Vas Dias <jvdias redhat com> 7:3.0.1-34_FC3
+* Mon Feb 14 2005 Jason Vas Dias <jvdias redhat com> 8:3.0.2rc3-4
 - make dhclient-script TIMEOUT mode do exactly the same configuration
 - as BOUND / RENEW / REBIND / REBOOT if router ping succeeds
 
-* Mon Feb 14 2005 Jason Vas Dias <jvdias redhat com> 7:3.0.1-34_FC3
+* Mon Feb 14 2005 Jason Vas Dias <jvdias redhat com> 3.0.2rc3-4
 - fix bug 147926: dhclient-script should do restorecon for modified conf files
 - optimize execshield protection
 
-* Thu Feb 10 2005 Jason Vas Dias <jvdias redhat com> 7:3.0.1-33_FC3
+* Thu Feb 10 2005 Jason Vas Dias <jvdias redhat com> 8.3.0.4rc3-3
+- fix bug 147375: dhcpd heap corruption on 32-bit 'subnet' masks
 - fix bug 147502: dhclient should honor GATEWAYDEV and GATEWAY settings            
 - fix bug 146600: dhclient's timeout mode ping should use -I
 - fix bug 146524: dhcpd.init should discard dhcpd's initial output message
 - fix bug 147739: dhcpd.init configtest should honor -cf in DHCPDARGS
 
-* Wed Feb 08 2005 Jason Vas Dias <jvdias redhat com> 7.3.0.1-33_FC3
-- revised bug 147375 after consultation with ISC DHCP maintainer
+* Mon Jan 24 2005 Jason Vas Dias <jvdias redhat com> 8:3.0.2rc3-2
+- fix bug 145997: allow hex 32-bit integers in user specified options
 
-* Tue Feb 08 2005 Jason Vas Dias <jvdias redhat com> 7:3.0.1-32_FC3
-- Fix bug 147375: core on startup on Athlons with empty subnet declaration
+* Thu Jan 06 2005 Jason Vas Dias <jvdias redhat com> 8:3.0.2rc3-1
+- still need an epoch to get past nvre test 
 
-* Thu Jan 27 2005 Jason Vas Dias <jvdias redhat com> 7:3.0.1-31_FC3
-- Fix bug 146277: allow configuration of default gateway that is not
-- on new subnet by adding -host route in dhclient-script
+* Thu Jan 06 2005 Jason Vas Dias <jvdias redhat com> 3.0.2rc3-1
+- fix bug 144417: much improved dhclient-script 
 
-* Mon Jan 24 2005 Jason Vas Dias <jvdias redhat com> 7:3.0.1-30_FC3
-- fix bug 145997: allow hex 32-bit integers in user specified options
+* Thu Jan 06 2005 Jason Vas Dias <jvdias redhat com> 3.0.2rc3-1
+- Upgrade to latest release from ISC, which includes most of our
+- recent patches anyway.
 
 * Thu Jan 06 2005 Jason Vas Dias <jvdias redhat com> 7:3.0.1-17
-- Apply fixes for bugs 143704, 139715, 138181, 139468, 138869 and
-- 139299 (allow successful compilation of dhcp src.rpm on FC-3!)
-- to FC-3 . 
+- fix bug 144250: gcc-3.4.3-11 is broken :
+- log_error ("Lease with bogus binding state: %d size: %d",
+-			   comp -> binding_state,
+-			   sizeof(comp->binding_state));
+- prints:    'Lease with bogus binding state: 257 1'    !
+- compiling with gcc33 (compat-gcc-8-3.3.4.2 fixes for now).
 
 * Mon Jan 03 2005 Jason Vas Dias <jvdias redhat com> 7:3.0.1-16
 - fix bug 143704: dhclient -r does not work if lease held by
@@ -612,7 +742,7 @@
 * Wed Feb 14 2001 Tim Waugh <twaugh redhat com>
 - Fix initscript typo (bug #27624).
 
-* Wed Feb  7 2001 Trond Eivind Glomsrød <teg redhat com>
+* Wed Feb  7 2001 Trond Eivind Glomsrød <teg redhat com>
 - Improve spec file i18n
 
 * Mon Feb  5 2001 Bernhard Rosenkraenzer <bero redhat com>