From 7b5b3aeabfdb47b51fce5f1591d82fd3ca5d9672 Mon Sep 17 00:00:00 2001 From: Zhixiong Chi Date: Wed, 10 Feb 2021 21:00:04 -0500 Subject: [PATCH] Revert "dhcp: fix CVE-2019-6470" This reverts commit 613fbf258f72042f912a1fde5608168b1068db36. Since this upversioned package updates the prefixlen to 128, and it will occur all hosts offline after booting off the controller-0. At the same time this issue will block the use of recent loads for both development and test activities. So we revert the patch firstly, and investigate deeply then send the new review and request of the upgraded patch with the appropriate offline fix. Closes-Bug: #1915050 Signed-off-by: Zhixiong Chi Change-Id: I02ecaa1bda463efb38d9c32a47f2221d0de7f99d --- .../0001-Update-package-versioning-for-TIS-format.patch | 4 ++-- .../centos/meta_patches/dhclient-dhcp6-set-hostname.patch | 2 +- base/dhcp/centos/srpm_path | 2 +- centos_srpms_centos.lst | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/dhcp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/dhcp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index c7aa36ca7..fd0b4941a 100644 --- a/base/dhcp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/base/dhcp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -17,8 +17,8 @@ index 42409f6..70c7a6d 100644 Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.2.5 --Release: 82%{?dist} -+Release: 82.el7.centos%{?_tis_dist}.%{tis_patch_ver} +-Release: 68%{?dist}.1 ++Release: 68.el7.centos.1%{?_tis_dist}.%{tis_patch_ver} # 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. diff --git a/base/dhcp/centos/meta_patches/dhclient-dhcp6-set-hostname.patch b/base/dhcp/centos/meta_patches/dhclient-dhcp6-set-hostname.patch index 5f043d0c9..5e7bf259a 100644 --- a/base/dhcp/centos/meta_patches/dhclient-dhcp6-set-hostname.patch +++ b/base/dhcp/centos/meta_patches/dhclient-dhcp6-set-hostname.patch @@ -12,9 +12,9 @@ index 87bad65..fb51eb5 100644 --- a/SOURCES/dhclient-script +++ b/SOURCES/dhclient-script @@ -653,6 +653,10 @@ dh6config() { - add_ipv6_addr_with_DAD + make_resolv_conf + + if [ -n "${new_fqdn_hostname}" ] && need_hostname; then + hostname ${new_fqdn_hostname} || echo "See -nc option in dhclient(8) man page." diff --git a/base/dhcp/centos/srpm_path b/base/dhcp/centos/srpm_path index 1a1fad91e..d40f94d20 100644 --- a/base/dhcp/centos/srpm_path +++ b/base/dhcp/centos/srpm_path @@ -1 +1 @@ -mirror:Source/dhcp-4.2.5-82.el7.centos.src.rpm +mirror:Source/dhcp-4.2.5-68.el7.centos.1.src.rpm diff --git a/centos_srpms_centos.lst b/centos_srpms_centos.lst index 0dbe415c6..1b280c8b3 100644 --- a/centos_srpms_centos.lst +++ b/centos_srpms_centos.lst @@ -1,6 +1,6 @@ anaconda-21.48.22.147-1.el7.centos.src.rpm cloud-init-0.7.9-24.el7.centos.1.src.rpm -dhcp-4.2.5-82.el7.centos.src.rpm +dhcp-4.2.5-68.el7.centos.1.src.rpm dnsmasq-2.76-7.el7.src.rpm facter-2.4.4-4.el7.src.rpm grub2-2.02-0.76.el7.centos.src.rpm