From 452a4ee472d125245301dc2e81c38d87fa5e2618 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 12 Jan 2023 03:28:31 -0500 Subject: [PATCH] import dhcp-4.3.6-48.el8_7.1 --- SOURCES/dhcp-dhcp6-vendor-opts.patch | 12 ++++++++++++ SPECS/dhcp.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 SOURCES/dhcp-dhcp6-vendor-opts.patch diff --git a/SOURCES/dhcp-dhcp6-vendor-opts.patch b/SOURCES/dhcp-dhcp6-vendor-opts.patch new file mode 100644 index 0000000..4bd685e --- /dev/null +++ b/SOURCES/dhcp-dhcp6-vendor-opts.patch @@ -0,0 +1,12 @@ +diff --git a/common/options.c b/common/options.c +index 3e6383a..9216ae4 100644 +--- a/common/options.c ++++ b/common/options.c +@@ -1122,7 +1122,6 @@ store_options6(char *buf, int buflen, + */ + if (code == vsio_option_code) { + vsio_wanted = 1; +- continue; + } + + /* diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec index 710225b..7b9ceb9 100644 --- a/SPECS/dhcp.spec +++ b/SPECS/dhcp.spec @@ -16,7 +16,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.3.6 -Release: 48%{?dist} +Release: 48%{?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. @@ -85,6 +85,7 @@ Patch49: dhcp-detect-system-time-jumps.patch Patch50: dhcp-key_algorithm.patch Patch51: dhcp-statement_parser.patch Patch52: dhcp-omshell-hmac-sha512-support.patch +Patch53: dhcp-dhcp6-vendor-opts.patch BuildRequires: autoconf BuildRequires: automake @@ -369,6 +370,9 @@ rm bind/bind.tar.gz # https://bugzilla.redhat.com/show_bug.cgi?id=2016248 %patch52 -p1 +# https://bugzilla.redhat.com/show_bug.cgi?id=2142025 +%patch53 -p1 + # Update paths in all man pages for page in client/dhclient.conf.5 client/dhclient.leases.5 \ client/dhclient-script.8 client/dhclient.8 ; do @@ -702,6 +706,9 @@ done %endif %changelog +* Sun Nov 20 2022 Martin Osvald - 12:4.3.6-48.1 +- send back dhcp6.vendor-opts again (#2142025) + * Tue May 10 2022 Martin Osvald - 12:4.3.6-48 - omshell: add support for hmac-sha512 algorithm (#2016248)