diff --git a/dhcp-dhcp6-vendor-opts.patch b/dhcp-dhcp6-vendor-opts.patch new file mode 100644 index 0000000000000000000000000000000000000000..4bd685eabcd8a05d2658b4ca0713f28d9eb74655 --- /dev/null +++ b/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/dhcp.spec b/dhcp.spec index 6cdf28e3360a9fa1a9bfe6abcb68d5bd52c25a17..4a842445e8cb2c39d99c1551bbf5bd482ddafb71 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -17,7 +17,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.3.6 -Release: 48%{anolis_release}%{?dist} +Release: 48%{anolis_release}%{?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. @@ -86,6 +86,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 #Add by anolis Patch1001: 0001-dhcp-anolis-rebrand.patch @@ -375,6 +376,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 @@ -710,10 +714,13 @@ done %endif %changelog -* Tue Jan 03 2023 yangxiaoxuan - 12:4.3.6-48.0.1 +* Mon Jan 30 2023 yangxiaoxuan - 12:4.3.6-48.0.1.1 - Rebrand for Anolis OS - Fix gcc10 -fno-common compile issue for compatible with gcc10 build +* 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) diff --git a/dist b/dist index 9c0e36ec42a2d9bfefacb21ac6354c9ddd910533..535c6900412d365bb0ff6de8d1f27110833b3ae3 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8 +an8_7