rpms/dhcp/devel dhcp-4.1.0p1-logpid.patch, NONE, 1.1 dhcp.spec, 1.279, 1.280

[Jiří Popelka]

Author: jpopelka

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

Modified Files:
	dhcp.spec 
Added Files:
	dhcp-4.1.0p1-logpid.patch 
Log Message:
* Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-15
- dhclient logs its pid to make troubleshooting NM managed systems
  with multiple dhclients running easier (#546792)


dhcp-4.1.0p1-logpid.patch:
 dhclient.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dhcp-4.1.0p1-logpid.patch ---
diff -up dhcp-4.1.0p1/client/dhclient.c.logpid dhcp-4.1.0p1/client/dhclient.c
--- dhcp-4.1.0p1/client/dhclient.c.logpid	2009-12-14 11:39:47.000000000 +0100
+++ dhcp-4.1.0p1/client/dhclient.c	2009-12-14 11:41:17.000000000 +0100
@@ -148,7 +148,7 @@ main(int argc, char **argv) {
 	else if (fd != -1)
 		close(fd);
 
-	openlog("dhclient", LOG_NDELAY, LOG_DAEMON);
+	openlog("dhclient", LOG_NDELAY | LOG_PID, LOG_DAEMON);
 
 #if !(defined(DEBUG) || defined(__CYGWIN32__))
 	setlogmask(LOG_UPTO(LOG_INFO));


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- dhcp.spec	23 Nov 2009 09:14:24 -0000	1.279
+++ dhcp.spec	14 Dec 2009 10:56:21 -0000	1.280
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  14%{?dist}
+Release:  15%{?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.
@@ -55,6 +55,7 @@ Patch20:  %{name}-4.1.0-add_timeout_when
 Patch21:  %{name}-4.1.0-64_bit_lease_parse.patch
 Patch22:  %{name}-4.1.0-CVE-2009-1892.patch
 Patch23:  %{name}-4.1.0p1-capability.patch
+Patch24:  %{name}-4.1.0p1-logpid.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -218,6 +219,10 @@ libdhcpctl and libomapi static libraries
 # Drop unnecessary capabilities in dhclient (#517649)
 %patch23 -p1
 
+# dhclient logs its pid to make troubleshooting NM managed systems
+# with multiple dhclients running easier (#546792)
+%patch24 -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/
 
@@ -481,6 +486,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-15
+- dhclient logs its pid to make troubleshooting NM managed systems
+  with multiple dhclients running easier (#546792)
+
 * Mon Nov 23 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-14
 - Honor DEFROUTE=yes|no for all connection types (#530209)