rpms/dhcp/devel dhcp-4.0.0-parser.patch, 1.1, 1.2 dhcp.spec, 1.197, 1.198
David Cantrell (dcantrel)
fedora-extras-commits at redhat.com
Thu Jan 17 22:54:52 UTC 2008
- Previous message (by thread): comps comps-el4.xml.in, 1.11, 1.12 comps-el5.xml.in, 1.12, 1.13 comps-f7.xml.in, 1.302, 1.303 comps-f8.xml.in, 1.208, 1.209 comps-f9.xml.in, 1.237, 1.238
- Next message (by thread): rpms/python-cherrypy/devel .cvsignore, 1.7, 1.8 python-cherrypy-regression-test.patch, 1.4, 1.5 python-cherrypy-tutorial-doc.patch, 1.6, 1.7 python-cherrypy.spec, 1.15, 1.16 sources, 1.7, 1.8 cherrypy-2.2.1-security-sessionfilter.patch, 1.1, NONE python-cherrypy-2.2.1-EINTR.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dcantrel
Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24455
Modified Files:
dhcp-4.0.0-parser.patch dhcp.spec
Log Message:
* Thu Jan 17 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-5
- Patch read_function() to handle size_t from read() correctly (#429207)
dhcp-4.0.0-parser.patch:
Index: dhcp-4.0.0-parser.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp-4.0.0-parser.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-4.0.0-parser.patch 17 Jan 2008 02:23:35 -0000 1.1
+++ dhcp-4.0.0-parser.patch 17 Jan 2008 22:54:44 -0000 1.2
@@ -1,18 +1,25 @@
diff -up dhcp-4.0.0/common/conflex.c.parse dhcp-4.0.0/common/conflex.c
---- dhcp-4.0.0/common/conflex.c.parse 2008-01-16 15:26:09.000000000 -1000
-+++ dhcp-4.0.0/common/conflex.c 2008-01-16 16:02:48.000000000 -1000
-@@ -182,8 +182,12 @@ static int get_char (cfile)
- c = EOF;
- }
+--- dhcp-4.0.0/common/conflex.c.parse 2008-01-17 09:05:17.000000000 -1000
++++ dhcp-4.0.0/common/conflex.c 2008-01-17 09:06:48.000000000 -1000
+@@ -1434,16 +1438,18 @@ read_function (struct parse * cfile)
+ {
+ int c;
+
+- cfile -> buflen = read (cfile -> file, cfile -> inbuf, cfile -> bufsiz);
+- if (cfile -> buflen == 0) {
++ ssize_t n = read (cfile -> file, cfile -> inbuf, cfile -> bufsiz);
++ if (n == 0) {
+ c = EOF;
+ cfile -> bufix = 0;
+- } else if (cfile -> buflen < 0) {
++ cfile -> buflen = 0;
++ } else if (n < 0) {
+ c = EOF;
+ cfile -> bufix = cfile -> buflen = 0;
} else {
-- c = cfile->inbuf [cfile->bufix];
-- cfile->bufix++;
-+ if (strlen(cfile->inbuf) >= (cfile->bufix + 1)) {
-+ c = EOF;
-+ } else {
-+ c = cfile->inbuf [cfile->bufix];
-+ cfile->bufix++;
-+ }
+ c = cfile -> inbuf [0];
+ cfile -> bufix = 1;
++ cfile -> buflen = n;
}
- if (!cfile->ugflag) {
+ return c;
Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- dhcp.spec 17 Jan 2008 02:23:35 -0000 1.197
+++ dhcp.spec 17 Jan 2008 22:54:44 -0000 1.198
@@ -4,7 +4,7 @@
Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent
Name: dhcp
Version: 4.0.0
-Release: 4%{?dist}
+Release: 5%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer made
# incorrect use of the epoch and that's why it is at 12 now. It should have
# never been used, but it was. So we are stuck with it.
@@ -404,6 +404,9 @@
%{_libdir}/libdhcp4client.so
%changelog
+* Thu Jan 17 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-5
+- Patch read_function() to handle size_t from read() correctly (#429207)
+
* Wed Jan 16 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-4
- Fix dhclient.lease file parsing problems (#428785)
- Disable IPv6 support for now as we already ship dhcpv6 (#428987)
- Previous message (by thread): comps comps-el4.xml.in, 1.11, 1.12 comps-el5.xml.in, 1.12, 1.13 comps-f7.xml.in, 1.302, 1.303 comps-f8.xml.in, 1.208, 1.209 comps-f9.xml.in, 1.237, 1.238
- Next message (by thread): rpms/python-cherrypy/devel .cvsignore, 1.7, 1.8 python-cherrypy-regression-test.patch, 1.4, 1.5 python-cherrypy-tutorial-doc.patch, 1.6, 1.7 python-cherrypy.spec, 1.15, 1.16 sources, 1.7, 1.8 cherrypy-2.2.1-security-sessionfilter.patch, 1.1, NONE python-cherrypy-2.2.1-EINTR.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list