From 6d265ff8fc19f79689b290810435fef0ceab517c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 12 2018 17:29:49 +0000 Subject: debrand dhcp-4.2.5-58.el7_4.3 --- diff --git a/SOURCES/dhcp-4.2.5-centos-branding.patch b/SOURCES/dhcp-4.2.5-centos-branding.patch new file mode 100644 index 0000000..f3e7113 --- /dev/null +++ b/SOURCES/dhcp-4.2.5-centos-branding.patch @@ -0,0 +1,14 @@ +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 5214dfa..de80f84 100644 --- a/SPECS/dhcp.spec +++ b/SPECS/dhcp.spec @@ -102,6 +102,7 @@ Patch64: dhcp-4.2.5-reap_orphan_sockets.patch Patch65: dhcp-4.2.5-options_overflow.patch # CVE-2018-5733 Patch66: dhcp-4.2.5-reference_count_overflow.patch +Patch67: dhcp-4.2.5-centos-branding.patch BuildRequires: autoconf BuildRequires: automake @@ -416,6 +417,7 @@ rm -rf includes/isc-dhcp %patch65 -p1 -b .options_overflow %patch66 -p1 -b .reference_overflow +%patch67 -p1 # Update paths in all man pages for page in client/dhclient.conf.5 client/dhclient.leases.5 \ @@ -697,6 +699,9 @@ done %changelog +* Mon Mar 12 2018 CentOS Sources - 4.2.5-58.el7.centos.3 +- Roll in CentOS Branding + * Wed Feb 28 2018 Pavel Zhukov - 12:4.2.5-68 - Resolves: #1550000 - CVE-2018-5733 Avoid buffer overflow reference counter