rpms/dhcp/devel dhcp-4.1.0-64_bit_lease_parse.patch, NONE, 1.1 dhcp.spec, 1.261, 1.262 sources, 1.28, 1.29

[David Cantrell]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15318

Modified Files:
	dhcp.spec sources 
Added Files:
	dhcp-4.1.0-64_bit_lease_parse.patch 
Log Message:
* Thu Jul 09 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-24
- Ensure 64-bit platforms parse lease file dates & times correctly (#448615)


dhcp-4.1.0-64_bit_lease_parse.patch:

--- NEW FILE dhcp-4.1.0-64_bit_lease_parse.patch ---
diff -up dhcp-4.1.0/common/parse.c.64-bit_lease_parse dhcp-4.1.0/common/parse.c
--- dhcp-4.1.0/common/parse.c.64-bit_lease_parse	2008-10-08 06:26:42.000000000 -1000
+++ dhcp-4.1.0/common/parse.c	2009-07-09 16:22:05.000000000 -1000
@@ -905,8 +905,8 @@ TIME 
 parse_date_core(cfile)
 	struct parse *cfile;
 {
-	int guess;
-	int tzoff, wday, year, mon, mday, hour, min, sec;
+	TIME guess;
+	long int tzoff, wday, year, mon, mday, hour, min, sec;
 	const char *val;
 	enum dhcp_token token;
 	static int months [11] = { 31, 59, 90, 120, 151, 181,


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -p -r1.261 -r1.262
--- dhcp.spec	9 Jul 2009 20:08:40 -0000	1.261
+++ dhcp.spec	10 Jul 2009 02:29:08 -0000	1.262
@@ -10,7 +10,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  23%{?dist}
+Release:  24%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -47,6 +47,7 @@ Patch17:  %{name}-4.1.0-invalid-dhclient
 Patch18:  %{name}-4.1.0-missing-ipv6-not-fatal.patch
 Patch19:  %{name}-4.1.0-IFNAMSIZ.patch
 Patch20:  %{name}-4.1.0-add_timeout_when_NULL.patch
+Patch21:  %{name}-4.1.0-64_bit_lease_parse.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -198,6 +199,9 @@ libdhcpctl and libomapi static libraries
 # (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19867])
 %patch20 -p1
 
+# Ensure 64-bit platforms parse lease file dates & times correctly (#448615)
+%patch21 -p1
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
@@ -445,6 +449,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Jul 09 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-24
+- Ensure 64-bit platforms parse lease file dates & times correctly (#448615)
+
 * Thu Jul 09 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-23
 - Upgrade to ldap-for-dhcp-4.1.0-4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	9 Jul 2009 20:08:40 -0000	1.28
+++ sources	10 Jul 2009 02:29:08 -0000	1.29
@@ -1,3 +1,2 @@
 1fffed2e8c3d67b111316d6a9b33db7a  dhcp-4.1.0.tar.gz
-fe56e35db8b78e6b9e0b377e4eccd232  ldap-for-dhcp-4.1.0-3.tar.gz
 39b4ff6ce0fcf84c69c12f221b0b6eb4  ldap-for-dhcp-4.1.0-4.tar.gz