From 05f34fe733027ad814910e8bb98d1d2ab91e1098 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Thu, 26 Nov 2020 14:10:22 +0000
Subject: [PATCH] import dhcp-4.3.6-43.el8

---
 SOURCES/12-dhcpd | 19 -------------------
 SPECS/dhcp.spec  |  9 ++++-----
 2 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 SOURCES/12-dhcpd

diff --git a/SOURCES/12-dhcpd b/SOURCES/12-dhcpd
deleted file mode 100644
index e75aa93..0000000
--- a/SOURCES/12-dhcpd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-INTERFACE=$1 # The interface which is brought up or down
-STATUS=$2 # The new state of the interface
-
-# whenever interface is brought up by NM (rhbz #565921)
-if [ "$STATUS" = "up" ]; then
-    # wait a few seconds to allow interface startup to complete
-    # (important at boot time without this the service still fails
-    # time-out for dispatcher script is 3s (rhbz#1003695#8)
-    sleep 2
-    # restart the services
-    # In case this dispatcher script is called several times in a short period of time, it might happen that
-    # systemd refuses to further restart the units. Therefore we use reset-failed command to prevent it.
-    systemctl -q is-enabled dhcpd.service && systemctl restart dhcpd.service && systemctl reset-failed dhcpd.service
-    systemctl -q is-enabled dhcpd6.service && systemctl restart dhcpd6.service && systemctl reset-failed dhcpd6.service
-fi
-
-exit 0
diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec
index d844b1d..4a64e5d 100644
--- a/SPECS/dhcp.spec
+++ b/SPECS/dhcp.spec
@@ -16,7 +16,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.3.6
-Release:  42%{?dist}
+Release:  43%{?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.
@@ -28,7 +28,6 @@ Source0:  ftp://ftp.isc.org/isc/dhcp/%{DHCPVERSION}/dhcp-%{DHCPVERSION}.tar.gz
 Source1:  dhclient-script
 Source2:  README.dhclient.d
 Source3:  11-dhclient
-Source4:  12-dhcpd
 Source5:  56dhclient
 Source6:  dhcpd.service
 Source7:  dhcpd6.service
@@ -434,8 +433,6 @@ mkdir -p %{buildroot}%{dhcpconfdir}/dhclient.d
 # NetworkManager dispatcher script
 mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d
 install -p -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d
-## https://bugzilla.redhat.com/show_bug.cgi?id=1685560
-install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d
 
 # pm-utils script to handle suspend/resume and dhclient leases
 install -D -p -m 0755 %{SOURCE5} %{buildroot}%{_libdir}/pm-utils/sleep.d/56dhclient
@@ -635,7 +632,6 @@ done
 %config(noreplace) %{_sysconfdir}/openldap/schema/dhcp.schema
 %dir %{_sysconfdir}/NetworkManager
 %dir %{_sysconfdir}/NetworkManager/dispatcher.d
-%{_sysconfdir}/NetworkManager/dispatcher.d/12-dhcpd
 %attr(0644,root,root)   %{_unitdir}/dhcpd.service
 %attr(0644,root,root)   %{_unitdir}/dhcpd6.service
 %{_sbindir}/dhcpd
@@ -698,6 +694,9 @@ done
 %endif
 
 %changelog
+* Wed Nov 25 2020 Pavel Zhukov <pzhukov@redhat.com> - 12:4.3.6-43
+- Drop 12-dhcp NM dispatchers script (#1898423)
+
 * Tue Oct 20 2020 Pavel Zhukov <pzhukov@redhat.com> - 12:4.3.6-42
 - Add key-algorithm support.
 - Resolves: rhbz#1883999