From 006ee977ff140ca3fb91093d6f0776f54d5c69a6 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Feb 22 2012 15:17:52 +0000
Subject: don't send log messages to the standard error descriptor by default (#790387)


---

diff --git a/dhcp-4.2.3-P2-log_perror.patch b/dhcp-4.2.3-P2-log_perror.patch
new file mode 100644
index 0000000..124c8c5
--- /dev/null
+++ b/dhcp-4.2.3-P2-log_perror.patch
@@ -0,0 +1,11 @@
+diff -up dhcp-4.2.3-P2/server/dhcpd.c.log_perror dhcp-4.2.3-P2/server/dhcpd.c
+--- dhcp-4.2.3-P2/server/dhcpd.c.log_perror	2012-02-22 14:24:57.000000000 +0100
++++ dhcp-4.2.3-P2/server/dhcpd.c	2012-02-22 14:29:09.964576687 +0100
+@@ -315,6 +315,7 @@ main(int argc, char **argv) {
+ #ifndef DEBUG
+ 			daemon = 0;
+ #endif
++			log_perror = 0;
+ 		} else if (!strcmp (argv [i], "-d")) {
+ #ifndef DEBUG
+ 			daemon = 0;
diff --git a/dhcp.spec b/dhcp.spec
index 469dfb3..7eebf85 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -22,7 +22,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.3
-Release:  18.%{patchver}%{?dist}
+Release:  19.%{patchver}%{?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.
@@ -73,6 +73,7 @@ Patch34:  dhcp-4.2.2-improved-xid.patch
 Patch35:  dhcp-4.2.2-gpxe-cid.patch
 Patch36:  dhcp-4.2.2-systemtap.patch
 Patch37:  dhcp-4.2.3-dhclient-decline-onetry.patch
+Patch38:  dhcp-4.2.3-P2-log_perror.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -300,6 +301,10 @@ rm bind/bind.tar.gz
 # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #26735])
 %patch37 -p1 -b .decline-onetry
 
+# Don't send log messages to the standard error descriptor by default (#790387)
+# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #28049])
+%patch38 -p1 -b .log_perror
+
 # Copy in the Fedora/RHEL dhclient script
 %{__install} -p -m 0755 %{SOURCE1} client/scripts/linux
 %{__install} -p -m 0644 %{SOURCE2} .
@@ -607,6 +612,9 @@ fi
 
 
 %changelog
+* Wed Feb 22 2012 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.3-19.P2
+- don't send log messages to the standard error descriptor by default (#790387)
+
 * Mon Feb 13 2012 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.3-18.P2
 - -timeout option (command line) with value 3 or less was driving dhclient mad (#789719)