rpms/dhcp/devel dhcp-4.0.0-port-validation.patch, 1.2, 1.3 dhcp.spec, 1.224, 1.225

[David Cantrell]

Author: dcantrel

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

Modified Files:
	dhcp-4.0.0-port-validation.patch dhcp.spec 
Log Message:
* Tue Sep 30 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-28
- Forgot to actually include <errno.h> (#438149)


dhcp-4.0.0-port-validation.patch:

Index: dhcp-4.0.0-port-validation.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp-4.0.0-port-validation.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dhcp-4.0.0-port-validation.patch	1 Oct 2008 01:58:39 -0000	1.2
+++ dhcp-4.0.0-port-validation.patch	1 Oct 2008 02:28:51 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up dhcp-4.0.0/client/dhclient.c.port dhcp-4.0.0/client/dhclient.c
---- dhcp-4.0.0/client/dhclient.c.port	2008-09-30 15:56:35.000000000 -1000
-+++ dhcp-4.0.0/client/dhclient.c	2008-09-30 15:56:52.000000000 -1000
+--- dhcp-4.0.0/client/dhclient.c.port	2008-09-30 16:27:28.000000000 -1000
++++ dhcp-4.0.0/client/dhclient.c	2008-09-30 16:27:28.000000000 -1000
 @@ -218,7 +218,7 @@ int main(int argc, char **argv, char **e
  		} else if (!strcmp (argv [i], "-p")) {
  			if (++i == argc)
@@ -12,7 +12,7 @@
  		} else if (!strcmp (argv [i], "-d")) {
 diff -up dhcp-4.0.0/common/inet.c.port dhcp-4.0.0/common/inet.c
 --- dhcp-4.0.0/common/inet.c.port	2007-07-12 20:43:41.000000000 -1000
-+++ dhcp-4.0.0/common/inet.c	2008-09-30 15:57:20.000000000 -1000
++++ dhcp-4.0.0/common/inet.c	2008-09-30 16:27:28.000000000 -1000
 @@ -604,3 +604,20 @@ piaddrcidr(const struct iaddr *addr, uns
  	return ret;
  }
@@ -35,19 +35,19 @@
 +	return htons(local_port);
 +}
 diff -up dhcp-4.0.0/includes/dhcpd.h.port dhcp-4.0.0/includes/dhcpd.h
---- dhcp-4.0.0/includes/dhcpd.h.port	2008-09-30 15:56:35.000000000 -1000
-+++ dhcp-4.0.0/includes/dhcpd.h	2008-09-30 15:56:52.000000000 -1000
-@@ -2432,6 +2432,7 @@ isc_result_t free_iaddrcidrnetlist(struc
- const char *piaddr PROTO ((struct iaddr));
- char *piaddrmask(struct iaddr *, struct iaddr *);
- char *piaddrcidr(const struct iaddr *, unsigned int);
-+u_int16_t validate_port(char *);
+--- dhcp-4.0.0/includes/dhcpd.h.port	2008-09-30 16:27:28.000000000 -1000
++++ dhcp-4.0.0/includes/dhcpd.h	2008-09-30 16:27:54.000000000 -1000
+@@ -64,6 +64,7 @@
+ #endif
  
- /* dhclient.c */
- extern int nowait;
+ #include <setjmp.h>
++#include <errno.h>
+ 
+ #include "cdefs.h"
+ #include "osdep.h"
 diff -up dhcp-4.0.0/relay/dhcrelay.c.port dhcp-4.0.0/relay/dhcrelay.c
 --- dhcp-4.0.0/relay/dhcrelay.c.port	2007-11-30 11:51:43.000000000 -1000
-+++ dhcp-4.0.0/relay/dhcrelay.c	2008-09-30 15:56:52.000000000 -1000
++++ dhcp-4.0.0/relay/dhcrelay.c	2008-09-30 16:27:28.000000000 -1000
 @@ -141,7 +141,7 @@ main(int argc, char **argv) {
  		if (!strcmp (argv [i], "-p")) {
  			if (++i == argc)
@@ -58,8 +58,8 @@
  			       ntohs (local_port));
  		} else if (!strcmp (argv [i], "-d")) {
 diff -up dhcp-4.0.0/server/dhcpd.c.port dhcp-4.0.0/server/dhcpd.c
---- dhcp-4.0.0/server/dhcpd.c.port	2008-09-30 15:56:34.000000000 -1000
-+++ dhcp-4.0.0/server/dhcpd.c	2008-09-30 15:56:52.000000000 -1000
+--- dhcp-4.0.0/server/dhcpd.c.port	2008-09-30 16:27:28.000000000 -1000
++++ dhcp-4.0.0/server/dhcpd.c	2008-09-30 16:27:28.000000000 -1000
 @@ -257,15 +257,7 @@ main(int argc, char **argv) {
  		if (!strcmp (argv [i], "-p")) {
  			if (++i == argc)


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- dhcp.spec	1 Oct 2008 02:19:04 -0000	1.224
+++ dhcp.spec	1 Oct 2008 02:28:51 -0000	1.225
@@ -4,7 +4,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  4.0.0
-Release:  27%{?dist}
+Release:  28%{?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.
@@ -445,6 +445,9 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Tue Sep 30 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-28
+- Forgot to actually include <errno.h> (#438149)
+
 * Tue Sep 30 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-27
 - Fix patch fuzziness and include errno.h in includes/dhcpd.h (#438149)