Merge "dhcp: fix CVE-2019-6470"

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:  68%{?dist}.1
-+Release:  68.el7.centos.1%{?_tis_dist}.%{tis_patch_ver}
+-Release:  82%{?dist}
++Release:  82.el7.centos%{?_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.

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

base/dhcp/centos/srpm_path

@@ -1 +1 @@
-mirror:Source/dhcp-4.2.5-68.el7.centos.1.src.rpm
+mirror:Source/dhcp-4.2.5-82.el7.centos.src.rpm

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-68.el7.centos.1.src.rpm
+dhcp-4.2.5-82.el7.centos.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