[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/dhcp/devel dhcp.spec, 1.59, 1.60 dhcpd.init, 1.11, 1.12 sources, 1.12, 1.13 .cvsignore, 1.11, 1.12



Author: jvdias

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

Modified Files:
	dhcp.spec dhcpd.init sources .cvsignore 
Log Message:
Upgrade to upstream version 3.0.3rc1; fix bug 163203: silence ISC blurb on configtest;


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- dhcp.spec	8 Jul 2005 23:22:20 -0000	1.59
+++ dhcp.spec	14 Jul 2005 16:54:21 -0000	1.60
@@ -1,8 +1,8 @@
 %{?!DHCLIENT_EXTENDED_OPTION_ENVIRONMENT:%define DHCLIENT_EXTENDED_OPTION_ENVIRONMENT 1}
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
-Version: 3.0.2
-Release: 14.FC5
+Version: 3.0.3rc1
+Release: 1
 Epoch:   10
 License: distributable
 Group: System Environment/Daemons
@@ -53,7 +53,7 @@
 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.2-glibc-headers-2.3.5-11.patch
+Patch150: dhcp-3.0.3rc1-no-__u16.patch
 URL: http://isc.org/products/DHCP/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig
@@ -117,21 +117,19 @@
 %patch120 -p1 -b .noconfig
 %patch121 -p1 -b .change_resolv_conf
 %patch122 -p1 -b .default_gateway
-# Patch123 is now upstream in dhcp-3.0.2
+# patches now upstream:
 # %patch123 -p1 -b .preserve-sent-options
-# Patch124 is now upstream in dhcp-3.0.2
 # %patch124 -p1 -b .mis-host 
-# Patch125 is now upstream in dhcp-3.0.2
 # %patch125 -p1 -b .new-host
-# Patch126 is now upstream in dhcp-3.0.2
 # %patch126 -p1 -b .host-dereference
-%patch127 -p1 -b .restrict-unconfigured-IF
+# %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 .fix-hex
-%patch133 -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
@@ -148,9 +146,10 @@
 %patch145 -p1 -b .dhclient-script-dbus-fix-interface
 %patch146 -p1 -b .dhclient_no_delay
 %patch147 -p1 -b .dhclient_decline_backoff
-%patch148 -p1 -b .uint8_binding_state
+# patch now upstream:
+# %patch148 -p1 -b .uint8_binding_state
 %patch149 -p1 -b .dhclient_script_fast+arping
-%patch150 -p1 -b .glibc-headers-2.3.5-11
+%patch150 -p1 -b .no-__u16
 cp %SOURCE1 .
 cat <<EOF >site.conf
 VARDB=%{_localstatedir}/lib/dhcp
@@ -278,6 +277,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jul 14 2004 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 
+
 * 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)
 


Index: dhcpd.init
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcpd.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dhcpd.init	16 Feb 2005 00:51:18 -0000	1.11
+++ dhcpd.init	14 Jul 2005 16:54:21 -0000	1.12
@@ -35,7 +35,7 @@
         if [[ "$DHCPDARGS" = *-cf* ]]; then
 	    CFA=`echo $DHCPDARGS | sed 's/^.*-cf[\ \	]*/-cf/;s/[\ \	].*$//;s/-cf/-cf /'`;
         fi;
-	/usr/sbin/dhcpd -t $CFA	
+	/usr/sbin/dhcpd -q -t $CFA	
 	return $?
 }
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	5 Apr 2005 00:45:46 -0000	1.12
+++ sources	14 Jul 2005 16:54:21 -0000	1.13
@@ -1 +1 @@
-04800a111521e7442749b2ce883f962b  dhcp-3.0.2.tar.gz
+bf14236e6ec222a5d63efcd3be82f809  dhcp-3.0.3rc1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Feb 2005 15:46:32 -0000	1.11
+++ .cvsignore	14 Jul 2005 16:54:21 -0000	1.12
@@ -1,3 +1,4 @@
 dhcp-3.0.1.tar.gz
 dhcp-3.0.2rc3.tar.gz
 dhcp-3.0.2.tar.gz
+dhcp-3.0.3rc1.tar.gz


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]