starlingx/integ
Code Issues Proposed changes

Revert "dhcp: fix CVE-2019-6470"

Browse Source 
This reverts commit 613fbf258f.

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 <zhixiong.chi@windriver.com>
Change-Id: I02ecaa1bda463efb38d9c32a47f2221d0de7f99d
This commit is contained in:
Zhixiong Chi 2021-02-10 21:00:04 -05:00
parent 29b856ad0d
commit 7b5b3aeabf
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/dhcp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -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.

2
base/dhcp/centos/meta_patches/dhclient-dhcp6-set-hostname.patch
View File

@ -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."

2
base/dhcp/centos/srpm_path
View File

@ -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

2
centos_srpms_centos.lst
View File

@ -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