From 6756a54bda978fadccc376f5853f3aced7136b91 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Wed, 7 May 2014 14:11:39 +0200
Subject: [PATCH] Use StandardError=null instead of log_perror.patch

[ISC-Bugs #28049] has been closed upstream without applying the patch.
---
 dhcp-log_perror.patch | 11 -----------
 dhcp.spec             | 10 ++++------
 dhcpd.service         |  1 +
 dhcpd6.service        |  1 +
 dhcrelay.service      |  1 +
 5 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 dhcp-log_perror.patch

diff --git a/dhcp-log_perror.patch b/dhcp-log_perror.patch
deleted file mode 100644
index 5acec8b..0000000
--- a/dhcp-log_perror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up dhcp-4.3.0a1/server/dhcpd.c.log_perror dhcp-4.3.0a1/server/dhcpd.c
---- dhcp-4.3.0a1/server/dhcpd.c.log_perror	2013-12-20 13:38:15.904106904 +0100
-+++ dhcp-4.3.0a1/server/dhcpd.c	2013-12-20 13:38:15.918106709 +0100
-@@ -241,6 +241,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 77a8013..d738548 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.3.0
-Release:  9%{?dist}
+Release:  10%{?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.
@@ -68,7 +68,6 @@ Patch28:  dhcp-gpxe-cid.patch
 Patch29:  dhcp-duidv4.patch
 Patch30:  dhcp-systemtap.patch
 Patch31:  dhcp-dhclient-decline-onetry.patch
-Patch32:  dhcp-log_perror.patch
 Patch33:  dhcp-getifaddrs.patch
 Patch34:  dhcp-omapi-leak.patch
 Patch35:  dhcp-failOverPeer.patch
@@ -310,10 +309,6 @@ rm -rf includes/isc-dhcp
 # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #26735])
 %patch31 -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])
-%patch32 -p1 -b .log_perror
-
 # Use getifaddrs() to scan for interfaces on Linux (#449946)
 # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #28761])
 %patch33 -p1 -b .getifaddrs
@@ -627,6 +622,9 @@ done
 %doc doc/html/
 
 %changelog
+* Wed May 07 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.0-10
+- use StandardError=null instead of log_perror.patch
+
 * Tue Mar 18 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.0-9
 - support for sending startup notifications to systemd (#1077666)
 
diff --git a/dhcpd.service b/dhcpd.service
index 746011b..b0f20dd 100644
--- a/dhcpd.service
+++ b/dhcpd.service
@@ -7,6 +7,7 @@ After=time-sync.target
 [Service]
 Type=notify
 ExecStart=/usr/sbin/dhcpd -f -cf /etc/dhcp/dhcpd.conf -user dhcpd -group dhcpd --no-pid
+StandardError=null
 
 [Install]
 WantedBy=multi-user.target
diff --git a/dhcpd6.service b/dhcpd6.service
index 32d3eda..d1d9f4d 100644
--- a/dhcpd6.service
+++ b/dhcpd6.service
@@ -7,6 +7,7 @@ After=time-sync.target
 [Service]
 Type=notify
 ExecStart=/usr/sbin/dhcpd -f -6 -cf /etc/dhcp/dhcpd6.conf -user dhcpd -group dhcpd --no-pid
+StandardError=null
 
 [Install]
 WantedBy=multi-user.target
diff --git a/dhcrelay.service b/dhcrelay.service
index b84c4ff..34f3d3f 100644
--- a/dhcrelay.service
+++ b/dhcrelay.service
@@ -6,6 +6,7 @@ After=network.target
 [Service]
 Type=notify
 ExecStart=/usr/sbin/dhcrelay -d --no-pid
+StandardError=null
 
 [Install]
 WantedBy=multi-user.target