From e768f3a02b1e035bb9dffd89df86a403e0ef69e0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 15 2018 12:17:09 +0000 Subject: import dhcp-4.2.5-68.el7_5.1 --- diff --git a/SOURCES/11-dhclient b/SOURCES/11-dhclient index b931c1d..eb79d52 100644 --- a/SOURCES/11-dhclient +++ b/SOURCES/11-dhclient @@ -7,7 +7,7 @@ ETCDIR=/etc/dhcp interface=$1 eval "$( -declare | LC_ALL=C grep '^DHCP4_[A-Z_]*=' | while read opt; do +declare | LC_ALL=C grep '^DHCP4_[A-Z_]*=' | while read -r opt; do optname=${opt%%=*} optname=${optname,,} optname=new_${optname#dhcp4_} 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 754a31a..04924c8 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: 68%{?dist} +Release: 68%{?dist}.1 # 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. @@ -108,7 +108,6 @@ 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 @@ -437,7 +436,6 @@ 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 \ @@ -719,8 +717,8 @@ done %changelog -* Tue Apr 10 2018 CentOS Sources - 4.2.5-68.el7.centos -- 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 * Wed Feb 28 2018 Pavel Zhukov - 12:4.2.5-68 - Resolves: #1549999 - CVE-2018-5733 Avoid buffer overflow reference counter