From ba123988a1e53a47beb1e454bd6517f5486914a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Thu, 1 Aug 2024 17:04:27 +0200
Subject: [PATCH] fixup! Fixes of CVE-2023-50387 and CVE-2023-50868 caused ABI
 change #2

dhcp package has unfortunately epoch, without which version enforcing
does not help. Add epoch to conflict with older packages.

; Related: CVE-2023-50387 CVE-2023-50868
Related: RHEL-25681 RHEL-25649
---
 bind.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bind.spec b/bind.spec
index ea7f82e..f0e2f10 100644
--- a/bind.spec
+++ b/bind.spec
@@ -225,9 +225,9 @@ Provides:       dnssec-conf = 1.27-2
 # Fixes of CVE-2023-50387 and CVE-2023-50868 caused ABI change
 # Enforce updated rebuild is accepted only
 Conflicts:      bind-dyndb-ldap < 11.6-5
-Conflicts:      dhcp-client < 4.3.6-50
-Conflicts:      dhcp-server < 4.3.6-50
-Conflicts:      dhcp-relay < 4.3.6-50
+Conflicts:      dhcp-client < 12:4.3.6-50
+Conflicts:      dhcp-server < 12:4.3.6-50
+Conflicts:      dhcp-relay  < 12:4.3.6-50
 BuildRequires:  gcc, make
 BuildRequires:  openssl-devel, libtool, autoconf, pkgconfig, libcap-devel
 BuildRequires:  libidn2-devel, libxml2-devel