From 8534827143741b1ed587897fc4cf224335b4bedc Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 15 2018 12:17:14 +0000 Subject: debrand dhcp-4.2.5-68.el7_5.1 --- 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 04924c8..14da097 100644 --- a/SPECS/dhcp.spec +++ b/SPECS/dhcp.spec @@ -108,6 +108,7 @@ Patch68: dhcp-4.2.5-reap_orphan_sockets.patch Patch69: dhcp-4.2.5-options_overflow.patch # CVE-2018-5733 Patch70: dhcp-4.2.5-reference_count_overflow.patch +Patch71: dhcp-4.2.5-centos-branding.patch BuildRequires: autoconf @@ -436,6 +437,7 @@ rm -rf includes/isc-dhcp %patch69 -p1 -b .options_overflow %patch70 -p1 -b .reference_overflow +%patch71 -p1 # Update paths in all man pages for page in client/dhclient.conf.5 client/dhclient.leases.5 \ @@ -717,6 +719,9 @@ done %changelog +* Tue May 15 2018 CentOS Sources - 4.2.5-68.el7.centos.1 +- Roll in CentOS Branding + * Tue Apr 24 2018 Pavel Zhukov - 12:4.2.5-68.1 - Resolves: #1570898 - Fix CVE-2018-1111: Do not parse backslash as escape character