From b75b3a433d2fcea4208c2b3ec1ceae0c9a8df0b4 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 10 2024 07:10:47 +0000
Subject: import dhcp-4.2.5-83.el7_9.2


---

diff --git a/SOURCES/dhcp-4.2.5-centos-branding.patch b/SOURCES/dhcp-4.2.5-centos-branding.patch
deleted file mode 100644
index f3e7113..0000000
--- a/SOURCES/dhcp-4.2.5-centos-branding.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNrp dhcp-4.1.1-P1.orig/omapip/errwarn.c dhcp-4.1.1-P1/omapip/errwarn.c
---- dhcp-4.1.1-P1.orig/omapip/errwarn.c 2012-08-15 14:04:33.149141000 +0000
-+++ dhcp-4.1.1-P1/omapip/errwarn.c      2012-08-15 14:13:05.582416057 +0000
-@@ -81,8 +81,8 @@ void log_fatal (const char * fmt, ... )
-   log_error ("have been made to the base software release in order to make");
-   log_error ("it work better with this distribution.");
-   log_error ("%s", "");
--  log_error ("Please report for this software via the Red Hat Bugzilla site:");
--  log_error ("    http://bugzilla.redhat.com");
-+  log_error ("Please report for this software via the CentOS Bugs Database:");
-+  log_error ("    http://bugs.centos.org/");
-   log_error ("%s", "");
-   log_error ("exiting.");
- #endif
diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec
index 99b750a..b905019 100644
--- a/SPECS/dhcp.spec
+++ b/SPECS/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.5
-Release:  83%{?dist}.1
+Release:  83%{?dist}.2
 # 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.
@@ -121,7 +121,6 @@ Patch78:  dhcp-system_time_changed.patch
 Patch79:  dhcp-close_file_in_noreplay.patch
 Patch80:  dhcp-resize_ldap_buffer.patch
 Patch81:  dhcp-statement_parser.patch
-Patch82:  dhcp-4.2.5-centos-branding.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -474,7 +473,6 @@ rm -rf includes/isc-dhcp
 %patch80 -p1 -b .ldap-resize
 
 %patch81 -p1
-%patch82 -p1
 
 
 # Update paths in all man pages
@@ -757,8 +755,8 @@ done
 
 
 %changelog
-* Wed Jun 09 2021 CentOS Sources <bugs@centos.org> - 4.2.5-83.el7.centos.1
-- Roll in CentOS Branding
+* Wed May 22 2024 Stepan Broz <sbroz@redhat.com> - 12:4.2.5-83.2
+- Rebuild because of bind ABI changes related to CVE-2023-50387
 
 * Thu May 27 2021 Pavel Zhukov <pzhukov@redhat.com> - 12:4.2.5-83.1
 - Fix for CVE-2021-25217