From 02f3e7d9a641e215b9118b7726f3560b7d6ba49c Mon Sep 17 00:00:00 2001 From: renmingshuai Date: Wed, 12 Jan 2022 19:53:32 +0800 Subject: [PATCH] rename upstream patches and add reference --- ...atch => backport-0001-change-bug-url.patch | 1 + ...ort-0002-additional-dhclient-options.patch | 1 + ...ng-interfaces-requested-by-sbin-ifup.patch | 1 + ...BOOTP-for-IBM-pSeries-systems-and-ma.patch | 1 + ...005-Change-default-requested-options.patch | 1 + ...ort-0006-Various-man-page-only-fixes.patch | 1 + ...ge-paths-to-conform-to-our-standards.patch | 1 + ...en-file-descriptors-are-closed-on-ex.patch | 1 + ...9-Fix-garbage-in-format-string-error.patch | 1 + ...=> backport-0010-Handle-null-timeout.patch | 1 + ...t-0011-Drop-unnecessary-capabilities.patch | 1 + ...ss-Static-Route-Option-for-DHCPv4-51.patch | 1 + ...-0013-DHCPv6-over-PPP-support-626514.patch | 1 + ...> backport-0014-IPoIB-support-660681.patch | 1 + ...-Add-GUID-DUID-to-dhcpd-logs-1064416.patch | 1 + ...016-Turn-on-creating-sending-of-DUID.patch | 1 + ...equest-release-via-correct-interface.patch | 1 + ...ation-for-iface-should-be-info-not-e.patch | 1 + ...UID_LLT-even-in-stateless-mode-11563.patch | 1 + ...ver-all-hwaddress-for-xid-uniqueness.patch | 1 + ...ad-leases-DB-in-non-replay-mode-only.patch | 1 + ...re-link-local-address-is-ready-in-st.patch | 1 + ...ackport-0023-option-97-pxe-client-id.patch | 1 + ...port-0024-Detect-system-time-changes.patch | 1 + ...0025-bind-Detect-system-time-changes.patch | 1 + ...-Add-dhclient-5-B-option-description.patch | 1 + ...tify-patch-to-manage-dhcpd-with-syst.patch | 1 + ...217.patch => backport-CVE-2021-25217.patch | 1 + dhcp.spec | 68 ++++++++++--------- ...ix-multiple-definition-with-gcc-10-1.patch | 0 ...ix-multiple-definition-with-gcc-10-2.patch | 0 31 files changed, 65 insertions(+), 31 deletions(-) rename 0001-change-bug-url.patch => backport-0001-change-bug-url.patch (96%) rename 0002-additional-dhclient-options.patch => backport-0002-additional-dhclient-options.patch (99%) rename 0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch => backport-0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch (95%) rename 0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch => backport-0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch (96%) rename 0005-Change-default-requested-options.patch => backport-0005-Change-default-requested-options.patch (94%) rename 0006-Various-man-page-only-fixes.patch => backport-0006-Various-man-page-only-fixes.patch (98%) rename 0007-Change-paths-to-conform-to-our-standards.patch => backport-0007-Change-paths-to-conform-to-our-standards.patch (93%) rename 0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch => backport-0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch (98%) rename 0009-Fix-garbage-in-format-string-error.patch => backport-0009-Fix-garbage-in-format-string-error.patch (88%) rename 0010-Handle-null-timeout.patch => backport-0010-Handle-null-timeout.patch (89%) rename 0011-Drop-unnecessary-capabilities.patch => backport-0011-Drop-unnecessary-capabilities.patch (98%) rename 0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch => backport-0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch (99%) rename 0013-DHCPv6-over-PPP-support-626514.patch => backport-0013-DHCPv6-over-PPP-support-626514.patch (98%) rename 0014-IPoIB-support-660681.patch => backport-0014-IPoIB-support-660681.patch (99%) rename 0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch => backport-0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch (99%) rename 0016-Turn-on-creating-sending-of-DUID.patch => backport-0016-Turn-on-creating-sending-of-DUID.patch (96%) rename 0017-Send-unicast-request-release-via-correct-interface.patch => backport-0017-Send-unicast-request-release-via-correct-interface.patch (95%) rename 0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch => backport-0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch (94%) rename 0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch => backport-0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch (86%) rename 0020-Discover-all-hwaddress-for-xid-uniqueness.patch => backport-0020-Discover-all-hwaddress-for-xid-uniqueness.patch (95%) rename 0021-Load-leases-DB-in-non-replay-mode-only.patch => backport-0021-Load-leases-DB-in-non-replay-mode-only.patch (93%) rename 0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch => backport-0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch (94%) rename 0023-option-97-pxe-client-id.patch => backport-0023-option-97-pxe-client-id.patch (98%) rename 0024-Detect-system-time-changes.patch => backport-0024-Detect-system-time-changes.patch (96%) rename 0025-bind-Detect-system-time-changes.patch => backport-0025-bind-Detect-system-time-changes.patch (98%) rename 0026-Add-dhclient-5-B-option-description.patch => backport-0026-Add-dhclient-5-B-option-description.patch (88%) rename 0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch => backport-0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch (95%) rename CVE-2021-25217.patch => backport-CVE-2021-25217.patch (91%) rename 0001-fix-multiple-definition-with-gcc-10.patch => fix-multiple-definition-with-gcc-10-1.patch (100%) rename 0002-fix-multiple-definition-with-gcc-10.patch => fix-multiple-definition-with-gcc-10-2.patch (100%) diff --git a/0001-change-bug-url.patch b/backport-0001-change-bug-url.patch similarity index 96% rename from 0001-change-bug-url.patch rename to backport-0001-change-bug-url.patch index b6afa57..ef22421 100644 --- a/0001-change-bug-url.patch +++ b/backport-0001-change-bug-url.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0001-change-bug-url.patch From 23dfbc560028bf7429196db1a3826f8b80c19d3e Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:09:57 +0100 diff --git a/0002-additional-dhclient-options.patch b/backport-0002-additional-dhclient-options.patch similarity index 99% rename from 0002-additional-dhclient-options.patch rename to backport-0002-additional-dhclient-options.patch index d700c00..3808b32 100644 --- a/0002-additional-dhclient-options.patch +++ b/backport-0002-additional-dhclient-options.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0002-additional-dhclient-options.patch From a26161b0fd45cdbeed3038ac63ff04e3b727248f Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:19:47 +0100 diff --git a/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch b/backport-0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch similarity index 95% rename from 0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch rename to backport-0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch index 2953c0f..f9e0707 100644 --- a/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch +++ b/backport-0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch From af504e99abde04b881768d18eaa0054b36b16303 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:21:14 +0100 diff --git a/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch b/backport-0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch similarity index 96% rename from 0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch rename to backport-0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch index 7f414a3..79d2078 100644 --- a/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch +++ b/backport-0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch From 7e8cc8388ac31c5c2b1a423c6b2da0491b19f6f9 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:22:41 +0100 diff --git a/0005-Change-default-requested-options.patch b/backport-0005-Change-default-requested-options.patch similarity index 94% rename from 0005-Change-default-requested-options.patch rename to backport-0005-Change-default-requested-options.patch index 34ff7b5..06fee03 100644 --- a/0005-Change-default-requested-options.patch +++ b/backport-0005-Change-default-requested-options.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0005-Change-default-requested-options.patch From a2a3554ff9e05d1a8e2c8aa843f1b6a33fce87e3 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:24:24 +0100 diff --git a/0006-Various-man-page-only-fixes.patch b/backport-0006-Various-man-page-only-fixes.patch similarity index 98% rename from 0006-Various-man-page-only-fixes.patch rename to backport-0006-Various-man-page-only-fixes.patch index a98783c..128b5e3 100644 --- a/0006-Various-man-page-only-fixes.patch +++ b/backport-0006-Various-man-page-only-fixes.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0006-Various-man-page-only-fixes.patch From 846779467f7393b19e8d206405116e1e26e16efc Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:25:53 +0100 diff --git a/0007-Change-paths-to-conform-to-our-standards.patch b/backport-0007-Change-paths-to-conform-to-our-standards.patch similarity index 93% rename from 0007-Change-paths-to-conform-to-our-standards.patch rename to backport-0007-Change-paths-to-conform-to-our-standards.patch index 87c4f8c..1ff878a 100644 --- a/0007-Change-paths-to-conform-to-our-standards.patch +++ b/backport-0007-Change-paths-to-conform-to-our-standards.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0007-Change-paths-to-conform-to-our-standards.patch From ac65289663532db0bc1de449ca2a0eb4c8c2ca6f Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:26:34 +0100 diff --git a/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch b/backport-0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch similarity index 98% rename from 0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch rename to backport-0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch index 8294563..91a7cc0 100644 --- a/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch +++ b/backport-0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch From d2da34706f140101c34f6a9806c258411806a939 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:27:18 +0100 diff --git a/0009-Fix-garbage-in-format-string-error.patch b/backport-0009-Fix-garbage-in-format-string-error.patch similarity index 88% rename from 0009-Fix-garbage-in-format-string-error.patch rename to backport-0009-Fix-garbage-in-format-string-error.patch index f9d81ab..9710c18 100644 --- a/0009-Fix-garbage-in-format-string-error.patch +++ b/backport-0009-Fix-garbage-in-format-string-error.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0009-Fix-garbage-in-format-string-error.patch From a0a2186ce52a31357d4eb3c32d7d6887e4603814 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:28:13 +0100 diff --git a/0010-Handle-null-timeout.patch b/backport-0010-Handle-null-timeout.patch similarity index 89% rename from 0010-Handle-null-timeout.patch rename to backport-0010-Handle-null-timeout.patch index 2b6e49b..a3d0ef9 100644 --- a/0010-Handle-null-timeout.patch +++ b/backport-0010-Handle-null-timeout.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0010-Handle-null-timeout.patch From ed7610cdb2e8ebdbaee618e477879e7e008d4f29 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:29:08 +0100 diff --git a/0011-Drop-unnecessary-capabilities.patch b/backport-0011-Drop-unnecessary-capabilities.patch similarity index 98% rename from 0011-Drop-unnecessary-capabilities.patch rename to backport-0011-Drop-unnecessary-capabilities.patch index 36ac7bf..f5d5e17 100644 --- a/0011-Drop-unnecessary-capabilities.patch +++ b/backport-0011-Drop-unnecessary-capabilities.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0011-Drop-unnecessary-capabilities.patch From 3b37f4b7bb3a17f8bd655be919915a1912062ea6 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:30:28 +0100 diff --git a/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch b/backport-0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch similarity index 99% rename from 0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch rename to backport-0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch index 866527c..3ddb5d7 100644 --- a/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch +++ b/backport-0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch From 01b1dcfef129a4eccfaf0f63a216774019f82dca Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:32:35 +0100 diff --git a/0013-DHCPv6-over-PPP-support-626514.patch b/backport-0013-DHCPv6-over-PPP-support-626514.patch similarity index 98% rename from 0013-DHCPv6-over-PPP-support-626514.patch rename to backport-0013-DHCPv6-over-PPP-support-626514.patch index 5e0a6ba..4784dd0 100644 --- a/0013-DHCPv6-over-PPP-support-626514.patch +++ b/backport-0013-DHCPv6-over-PPP-support-626514.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0013-DHCPv6-over-PPP-support-626514.patch From 234747fbfd6c6429619ba843713d5b39fb4a513d Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:33:06 +0100 diff --git a/0014-IPoIB-support-660681.patch b/backport-0014-IPoIB-support-660681.patch similarity index 99% rename from 0014-IPoIB-support-660681.patch rename to backport-0014-IPoIB-support-660681.patch index a792e4f..ad4766e 100644 --- a/0014-IPoIB-support-660681.patch +++ b/backport-0014-IPoIB-support-660681.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0014-IPoIB-support-660681.patch From 6d74c2d0ceadef2eb1c43c2da47f1d5b732adf8c Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:34:21 +0100 diff --git a/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch b/backport-0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch similarity index 99% rename from 0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch rename to backport-0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch index 1f88d7d..407a2ba 100644 --- a/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch +++ b/backport-0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch From 3d3e442ed1316930a5360e4d5a56b46a42a29419 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:35:47 +0100 diff --git a/0016-Turn-on-creating-sending-of-DUID.patch b/backport-0016-Turn-on-creating-sending-of-DUID.patch similarity index 96% rename from 0016-Turn-on-creating-sending-of-DUID.patch rename to backport-0016-Turn-on-creating-sending-of-DUID.patch index bafffb5..d8f1888 100644 --- a/0016-Turn-on-creating-sending-of-DUID.patch +++ b/backport-0016-Turn-on-creating-sending-of-DUID.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0016-Turn-on-creating-sending-of-DUID.patch From 2f6b827e89305adcff45288c632785ac054adb8e Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:36:30 +0100 diff --git a/0017-Send-unicast-request-release-via-correct-interface.patch b/backport-0017-Send-unicast-request-release-via-correct-interface.patch similarity index 95% rename from 0017-Send-unicast-request-release-via-correct-interface.patch rename to backport-0017-Send-unicast-request-release-via-correct-interface.patch index 26c8b96..0c023f4 100644 --- a/0017-Send-unicast-request-release-via-correct-interface.patch +++ b/backport-0017-Send-unicast-request-release-via-correct-interface.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0017-Send-unicast-request-release-via-correct-interface.patch From 193c4d7631fd623efa601f52fdab6018bf8be771 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:39:36 +0100 diff --git a/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch b/backport-0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch similarity index 94% rename from 0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch rename to backport-0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch index 2ff4030..e2b30eb 100644 --- a/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch +++ b/backport-0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch From 2277d041692b8ebdf6b86d41e3a0bc0381cd1e47 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:40:51 +0100 diff --git a/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch b/backport-0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch similarity index 86% rename from 0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch rename to backport-0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch index 3405ea1..82073ef 100644 --- a/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch +++ b/backport-0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch From 6ea56e988df1da51f7d0bdd8984b38e40102c17b Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:41:14 +0100 diff --git a/0020-Discover-all-hwaddress-for-xid-uniqueness.patch b/backport-0020-Discover-all-hwaddress-for-xid-uniqueness.patch similarity index 95% rename from 0020-Discover-all-hwaddress-for-xid-uniqueness.patch rename to backport-0020-Discover-all-hwaddress-for-xid-uniqueness.patch index c838d7a..da7d3aa 100644 --- a/0020-Discover-all-hwaddress-for-xid-uniqueness.patch +++ b/backport-0020-Discover-all-hwaddress-for-xid-uniqueness.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0020-Discover-all-hwaddress-for-xid-uniqueness.patch From 01ce61b8a0331a2f068ca2191bfb897b505c1b9d Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:42:50 +0100 diff --git a/0021-Load-leases-DB-in-non-replay-mode-only.patch b/backport-0021-Load-leases-DB-in-non-replay-mode-only.patch similarity index 93% rename from 0021-Load-leases-DB-in-non-replay-mode-only.patch rename to backport-0021-Load-leases-DB-in-non-replay-mode-only.patch index d398918..03c78cb 100644 --- a/0021-Load-leases-DB-in-non-replay-mode-only.patch +++ b/backport-0021-Load-leases-DB-in-non-replay-mode-only.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0021-Load-leases-DB-in-non-replay-mode-only.patch commit 50c2b3ba8ce030a47b55dd707bb8a6ab20444a05 Author: Pavel Zhukov Date: Thu Feb 21 10:44:06 2019 +0100 diff --git a/0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch b/backport-0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch similarity index 94% rename from 0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch rename to backport-0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch index 85ea650..6ad2466 100644 --- a/0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch +++ b/backport-0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch From 9975d198a2c02e32c31c3e0f43d2aa79dfa7f508 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 28 Feb 2019 15:30:21 +0100 diff --git a/0023-option-97-pxe-client-id.patch b/backport-0023-option-97-pxe-client-id.patch similarity index 98% rename from 0023-option-97-pxe-client-id.patch rename to backport-0023-option-97-pxe-client-id.patch index 6cc4328..9d3d6fc 100644 --- a/0023-option-97-pxe-client-id.patch +++ b/backport-0023-option-97-pxe-client-id.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0023-option-97-pxe-client-id.patch From 6fd7894ea57791c8eee16c21d19da34b909e016e Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 28 Feb 2019 16:40:38 +0100 diff --git a/0024-Detect-system-time-changes.patch b/backport-0024-Detect-system-time-changes.patch similarity index 96% rename from 0024-Detect-system-time-changes.patch rename to backport-0024-Detect-system-time-changes.patch index cf38d0d..8929866 100644 --- a/0024-Detect-system-time-changes.patch +++ b/backport-0024-Detect-system-time-changes.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0024-Detect-system-time-changes.patch From 41c6032ace65119e6a400365f7e90283c930afd4 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 22 Oct 2019 16:23:01 +0200 diff --git a/0025-bind-Detect-system-time-changes.patch b/backport-0025-bind-Detect-system-time-changes.patch similarity index 98% rename from 0025-bind-Detect-system-time-changes.patch rename to backport-0025-bind-Detect-system-time-changes.patch index 80191b2..4ce1334 100644 --- a/0025-bind-Detect-system-time-changes.patch +++ b/backport-0025-bind-Detect-system-time-changes.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0025-bind-Detect-system-time-changes.patch From ef4f5e80d8a1ea1507829ea6f5214f276478f475 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 22 Oct 2019 16:23:24 +0200 diff --git a/0026-Add-dhclient-5-B-option-description.patch b/backport-0026-Add-dhclient-5-B-option-description.patch similarity index 88% rename from 0026-Add-dhclient-5-B-option-description.patch rename to backport-0026-Add-dhclient-5-B-option-description.patch index 7ddfacf..16ea89a 100644 --- a/0026-Add-dhclient-5-B-option-description.patch +++ b/backport-0026-Add-dhclient-5-B-option-description.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0026-Add-dhclient-5-B-option-description.patch commit 6acfd3125546a0e5db8fae8a9964cd2f88bf68c0 Author: Pavel Zhukov Date: Tue Oct 22 16:28:04 2019 +0200 diff --git a/0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch b/backport-0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch similarity index 95% rename from 0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch rename to backport-0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch index cde51de..b2f02c6 100644 --- a/0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch +++ b/backport-0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch @@ -1,3 +1,4 @@ +Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch From 8d974fd1f667e1b957ad4092fe66a8bb94f5f8fd Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 7 Nov 2019 14:47:45 +0100 diff --git a/CVE-2021-25217.patch b/backport-CVE-2021-25217.patch similarity index 91% rename from CVE-2021-25217.patch rename to backport-CVE-2021-25217.patch index 680a9ea..422b49d 100644 --- a/CVE-2021-25217.patch +++ b/backport-CVE-2021-25217.patch @@ -1,3 +1,4 @@ +Reference: https://downloads.isc.org/isc/dhcp/4.4.2-P1/patches/4.4.2.CVE-2021-25217.patch diff --git a/common/parse.c b/common/parse.c index 3329657..8772540 100644 --- a/common/parse.c diff --git a/dhcp.spec b/dhcp.spec index 1028198..6ff59cd 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -3,7 +3,7 @@ Name: dhcp Version: 4.4.2 -Release: 8 +Release: 9 Summary: Dynamic host configuration protocol software #Please don't change the epoch on this package Epoch: 12 @@ -18,33 +18,33 @@ Source6: dhcpd.service Source7: dhcpd6.service Source8: dhcrelay.service -Patch1: 0001-change-bug-url.patch -Patch2: 0002-additional-dhclient-options.patch -Patch3: 0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch -Patch4: 0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch -Patch5: 0005-Change-default-requested-options.patch -Patch6: 0006-Various-man-page-only-fixes.patch -Patch7: 0007-Change-paths-to-conform-to-our-standards.patch -Patch8: 0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch -Patch9: 0009-Fix-garbage-in-format-string-error.patch -Patch10: 0010-Handle-null-timeout.patch -Patch11: 0011-Drop-unnecessary-capabilities.patch -Patch12: 0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch -Patch13: 0013-DHCPv6-over-PPP-support-626514.patch -Patch14: 0014-IPoIB-support-660681.patch -Patch15: 0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch -Patch16: 0016-Turn-on-creating-sending-of-DUID.patch -Patch17: 0017-Send-unicast-request-release-via-correct-interface.patch -Patch18: 0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch -Patch19: 0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch -Patch20: 0020-Discover-all-hwaddress-for-xid-uniqueness.patch -Patch21: 0021-Load-leases-DB-in-non-replay-mode-only.patch -Patch22: 0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch -Patch23: 0023-option-97-pxe-client-id.patch -Patch24: 0024-Detect-system-time-changes.patch -Patch25: 0025-bind-Detect-system-time-changes.patch -Patch26: 0026-Add-dhclient-5-B-option-description.patch -Patch27: 0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch +Patch1: backport-0001-change-bug-url.patch +Patch2: backport-0002-additional-dhclient-options.patch +Patch3: backport-0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch +Patch4: backport-0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch +Patch5: backport-0005-Change-default-requested-options.patch +Patch6: backport-0006-Various-man-page-only-fixes.patch +Patch7: backport-0007-Change-paths-to-conform-to-our-standards.patch +Patch8: backport-0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch +Patch9: backport-0009-Fix-garbage-in-format-string-error.patch +Patch10: backport-0010-Handle-null-timeout.patch +Patch11: backport-0011-Drop-unnecessary-capabilities.patch +Patch12: backport-0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch +Patch13: backport-0013-DHCPv6-over-PPP-support-626514.patch +Patch14: backport-0014-IPoIB-support-660681.patch +Patch15: backport-0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch +Patch16: backport-0016-Turn-on-creating-sending-of-DUID.patch +Patch17: backport-0017-Send-unicast-request-release-via-correct-interface.patch +Patch18: backport-0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch +Patch19: backport-0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch +Patch20: backport-0020-Discover-all-hwaddress-for-xid-uniqueness.patch +Patch21: backport-0021-Load-leases-DB-in-non-replay-mode-only.patch +Patch22: backport-0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch +Patch23: backport-0023-option-97-pxe-client-id.patch +Patch24: backport-0024-Detect-system-time-changes.patch +Patch25: backport-0025-bind-Detect-system-time-changes.patch +Patch26: backport-0026-Add-dhclient-5-B-option-description.patch +Patch27: backport-0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch Patch28: bugfix-dhcp-4.2.5-check-dhclient-pid.patch Patch29: bugfix-reduce-getifaddr-calls.patch @@ -53,9 +53,9 @@ Patch30: bugfix-dhcpd-2038-problem.patch Patch31: dhcpd-coredump-infiniband.patch Patch32: bugfix-dhclient-check-if-pid-was-held.patch Patch33: bugfix-dhcp-64-bit-lease-parse.patch -Patch35: CVE-2021-25217.patch -Patch36: 0001-fix-multiple-definition-with-gcc-10.patch -Patch37: 0002-fix-multiple-definition-with-gcc-10.patch +Patch35: backport-CVE-2021-25217.patch +Patch36: fix-multiple-definition-with-gcc-10-1.patch +Patch37: fix-multiple-definition-with-gcc-10-2.patch BuildRequires: gcc autoconf automake libtool openldap-devel krb5-devel libcap-ng-devel BuildRequires: systemd systemd-devel @@ -294,6 +294,12 @@ exit 0 %{_mandir}/man3/omapi.3.gz %changelog +* Wed Jan 12 2022 renmingshuai - 4.4.2-9 +- Type:bugfix +- ID:NA +- SUG:restart +- DESC:modofy upstream patches name and add reference + * Wed Jan 05 2022 renmingshuai - 4.4.2-8 - Type:bugfix - ID:NA diff --git a/0001-fix-multiple-definition-with-gcc-10.patch b/fix-multiple-definition-with-gcc-10-1.patch similarity index 100% rename from 0001-fix-multiple-definition-with-gcc-10.patch rename to fix-multiple-definition-with-gcc-10-1.patch diff --git a/0002-fix-multiple-definition-with-gcc-10.patch b/fix-multiple-definition-with-gcc-10-2.patch similarity index 100% rename from 0002-fix-multiple-definition-with-gcc-10.patch rename to fix-multiple-definition-with-gcc-10-2.patch -- Gitee