import dhcp-4.3.6-48.el8_7.1

This commit is contained in:
CentOS Sources 2023-01-12 03:28:31 -05:00 committed by Stepan Oksanichenko
parent bf40d90262
commit 452a4ee472
2 changed files with 20 additions and 1 deletions

View File

@ -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;
}
/*

View File

@ -16,7 +16,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.3.6 Version: 4.3.6
Release: 48%{?dist} Release: 48%{?dist}.1
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # 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. # 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 Patch50: dhcp-key_algorithm.patch
Patch51: dhcp-statement_parser.patch Patch51: dhcp-statement_parser.patch
Patch52: dhcp-omshell-hmac-sha512-support.patch Patch52: dhcp-omshell-hmac-sha512-support.patch
Patch53: dhcp-dhcp6-vendor-opts.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -369,6 +370,9 @@ rm bind/bind.tar.gz
# https://bugzilla.redhat.com/show_bug.cgi?id=2016248 # https://bugzilla.redhat.com/show_bug.cgi?id=2016248
%patch52 -p1 %patch52 -p1
# https://bugzilla.redhat.com/show_bug.cgi?id=2142025
%patch53 -p1
# Update paths in all man pages # Update paths in all man pages
for page in client/dhclient.conf.5 client/dhclient.leases.5 \ for page in client/dhclient.conf.5 client/dhclient.leases.5 \
client/dhclient-script.8 client/dhclient.8 ; do client/dhclient-script.8 client/dhclient.8 ; do
@ -702,6 +706,9 @@ done
%endif %endif
%changelog %changelog
* Sun Nov 20 2022 Martin Osvald <mosvald@redhat.com> - 12:4.3.6-48.1
- send back dhcp6.vendor-opts again (#2142025)
* Tue May 10 2022 Martin Osvald <mosvald@redhat.com> - 12:4.3.6-48 * Tue May 10 2022 Martin Osvald <mosvald@redhat.com> - 12:4.3.6-48
- omshell: add support for hmac-sha512 algorithm (#2016248) - omshell: add support for hmac-sha512 algorithm (#2016248)