From e7779eed6e3ead62e17652f7f3b7a6fc70ffb554 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Sun, 10 Dec 2023 22:27:03 +0300 Subject: [PATCH] import hyperv-daemons-0-0.34.20180415git.el8_7 --- ..._config-Workaround-for-gateway-numbe.patch | 16 +++--- ...vd-tools-hv-Remove-an-extraneous-the.patch | 47 ---------------- ...-remove-unnecessary-void-conversions.patch | 53 ------------------- SPECS/hyperv-daemons.spec | 22 +++----- 4 files changed, 14 insertions(+), 124 deletions(-) delete mode 100644 SOURCES/hpvd-tools-hv-Remove-an-extraneous-the.patch delete mode 100644 SOURCES/hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch diff --git a/SOURCES/hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch b/SOURCES/hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch index 3af4b97..2918485 100644 --- a/SOURCES/hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch +++ b/SOURCES/hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch @@ -1,17 +1,17 @@ -From 0a6bfc42945419eba5ed92c10ae722625a2ccb05 Mon Sep 17 00:00:00 2001 +From 8acc8ecc93352bfb3d78e8d37c5ed03a4948a39d Mon Sep 17 00:00:00 2001 From: Mohammed Gamal Date: Tue, 8 Nov 2022 16:20:17 +0100 -Subject: [PATCH 1/3] redhat: hv_set_if_config: Workaround for gateway - numbering in NetworkManager +Subject: [PATCH] redhat: hv_set_if_config: Workaround for gateway numbering in + NetworkManager RH-Author: Mohamed Gamal Morsy -RH-MergeRequest: 4: redhat: hv_set_if_config: Workaround for gateway numbering in NetworkManager -RH-Bugzilla: 2142028 +RH-MergeRequest: 10: redhat: hv_set_if_config: Workaround for gateway numbering in NetworkManager +RH-Bugzilla: 2150255 RH-Acked-by: Emanuele Giuseppe Esposito -RH-Acked-by: Cathy Avery -RH-Commit: [1/1] 85b28bc13239a64b7a200ca4edb83ac5d0fe5ebd +RH-Acked-by: Jon Maloy +RH-Commit: [1/1] a52af3c2a8c4365cbe6777fe1afe4ebcf81954d6 -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2142028 +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2150255 Unlike older sysconfig scripts, NetworkManager expects GATEWAYx=ipaddr for all values of x. So the first gateway is GATEWAY0 instead of GATEWAY. Other values should remain unchanged. diff --git a/SOURCES/hpvd-tools-hv-Remove-an-extraneous-the.patch b/SOURCES/hpvd-tools-hv-Remove-an-extraneous-the.patch deleted file mode 100644 index c9f094b..0000000 --- a/SOURCES/hpvd-tools-hv-Remove-an-extraneous-the.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2171b1e58d19b8af77aecc56fa7ce2529cb0ec97 Mon Sep 17 00:00:00 2001 -From: Mohammed Gamal -Date: Thu, 17 Nov 2022 18:56:20 +0100 -Subject: [PATCH 2/3] tools: hv: Remove an extraneous "the" - -RH-Author: Mohamed Gamal Morsy -RH-MergeRequest: 5: Update hyperv-daemons for RHEL-8.8 -RH-Bugzilla: 2139456 -RH-Acked-by: Emanuele Giuseppe Esposito -RH-Acked-by: Miroslav Rezanina -RH-Commit: [1/2] 7ae4fbcb80ed5795a43cbd355b8e8fe58ab78ba0 - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2139456 - -commit f15f39fabed2248311607445ddfa6dba63abebb9 -Author: Jason Wang -Date: Thu Aug 11 21:34:33 2022 +0800 - - tools: hv: Remove an extraneous "the" - - There are two "the" in the text. Remove one. - - Signed-off-by: Jason Wang - Link: https://lore.kernel.org/r/20220811133433.10175-1-wangborong@cdjrlc.com - Signed-off-by: Wei Liu - -Signed-off-by: Mohammed Gamal ---- - hv_kvp_daemon.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c -index 1e6fd6c..c97c12e 100644 ---- a/hv_kvp_daemon.c -+++ b/hv_kvp_daemon.c -@@ -44,7 +44,7 @@ - - /* - * KVP protocol: The user mode component first registers with the -- * the kernel component. Subsequently, the kernel component requests, data -+ * kernel component. Subsequently, the kernel component requests, data - * for the specified keys. In response to this message the user mode component - * fills in the value corresponding to the specified key. We overload the - * sequence field in the cn_msg header to define our KVP message types. --- -2.37.3 - diff --git a/SOURCES/hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch b/SOURCES/hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch deleted file mode 100644 index 8c4a2e4..0000000 --- a/SOURCES/hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0452c1c7a5f5f27aebefcc2816f3781c7bbb55e2 Mon Sep 17 00:00:00 2001 -From: Mohammed Gamal -Date: Thu, 17 Nov 2022 18:58:31 +0100 -Subject: [PATCH 3/3] tools: hv: kvp: remove unnecessary (void*) conversions - -RH-Author: Mohamed Gamal Morsy -RH-MergeRequest: 5: Update hyperv-daemons for RHEL-8.8 -RH-Bugzilla: 2139456 -RH-Acked-by: Emanuele Giuseppe Esposito -RH-Acked-by: Miroslav Rezanina -RH-Commit: [2/2] 739e447d4cff82f47cb60a14d8bd87ca3601a59b - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2139456 - -commit 2258954234db7530e9d86bb32cd6ad54485ff926 -Author: Zhou jie -Date: Tue Aug 23 11:45:52 2022 +0800 - - tools: hv: kvp: remove unnecessary (void*) conversions - - Remove unnecessary void* type casting. - - Signed-off-by: Zhou jie - Reviewed-by: Michael Kelley - Link: https://lore.kernel.org/r/20220823034552.8596-1-zhoujie@nfschina.com - Signed-off-by: Wei Liu - -Signed-off-by: Mohammed Gamal ---- - hv_kvp_daemon.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c -index c97c12e..27f5e7d 100644 ---- a/hv_kvp_daemon.c -+++ b/hv_kvp_daemon.c -@@ -772,11 +772,11 @@ static int kvp_process_ip_address(void *addrp, - const char *str; - - if (family == AF_INET) { -- addr = (struct sockaddr_in *)addrp; -+ addr = addrp; - str = inet_ntop(family, &addr->sin_addr, tmp, 50); - addr_length = INET_ADDRSTRLEN; - } else { -- addr6 = (struct sockaddr_in6 *)addrp; -+ addr6 = addrp; - str = inet_ntop(family, &addr6->sin6_addr.s6_addr, tmp, 50); - addr_length = INET6_ADDRSTRLEN; - } --- -2.37.3 - diff --git a/SPECS/hyperv-daemons.spec b/SPECS/hyperv-daemons.spec index 46f1328..ab5857f 100644 --- a/SPECS/hyperv-daemons.spec +++ b/SPECS/hyperv-daemons.spec @@ -66,12 +66,8 @@ Patch7: hpvd-Use-filename-for-connection-profile.patch Patch8: hpvd-hypervkvpd.service-ordering-fixes.patch # For bz#2115761 - [Hyper-V][RHEL-8] hypervkvpd.service service ordering Patch9: hpvd-redhat-Add-ConditionalVirtualization-to-the-rest-of-.patch -# For bz#2142028 - [Hyper-V][RHEL-8] Cannot set gateway properly when set static IPADDR0,NETMASK0,GATEWAY in ifcfg-eth0 +# For bz#2150255 - [Hyper-V][RHEL-8] Cannot set gateway properly when set static IPADDR0,NETMASK0,GATEWAY in ifcfg-eth0 [rhel-8.7.0.z] Patch10: hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch -# For bz#2139456 - [Hyper-V][RHEL8.8] Update Hyper-V-Daemons -Patch11: hpvd-tools-hv-Remove-an-extraneous-the.patch -# For bz#2139456 - [Hyper-V][RHEL8.8] Update Hyper-V-Daemons -Patch12: hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch # For bz#2020141 - [Hyper-V][RHEL8.6][ARM64] No hyperv-daemons package built for aarch64 platform # Patch6: hpvd-Enable-build-on-aarch64.patch @@ -189,8 +185,6 @@ cp -pvL %{SOURCE4} hv_set_ifconfig.sh %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 -%patch12 -p1 %build # HYPERV KVP DAEMON @@ -308,17 +302,13 @@ fi %{_sbindir}/vmbus_testing %changelog -* Wed Jul 26 2023 MSVSphere Packaging Team - 0-0.34.20180415git +* Wed Jul 26 2023 MSVSphere Packaging Team - 0-0.34.20180415git.el8_7 - Rebuilt for MSVSphere 8.8 -* Fri Dec 02 2022 Jon Maloy - 0-0.34.20180415git -- hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch [bz#2142028] -- hpvd-tools-hv-Remove-an-extraneous-the.patch [bz#2139456] -- hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch [bz#2139456] -- Resolves: bz#2142028 - ([Hyper-V][RHEL-8] Cannot set gateway properly when set static IPADDR0,NETMASK0,GATEWAY in ifcfg-eth0) -- Resolves: bz#2139456 - ([Hyper-V][RHEL8.8] Update Hyper-V-Daemons) +* Mon Dec 05 2022 Jon Maloy - 0-0.34.20180415git.el8_7 +- hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch [bz#2150255] +- Resolves: bz#2150255 + ([Hyper-V][RHEL-8] Cannot set gateway properly when set static IPADDR0,NETMASK0,GATEWAY in ifcfg-eth0 [rhel-8.7.0.z]) * Tue Aug 16 2022 Miroslav Rezanina - 0-0.33.20180415git - hpvd-hypervkvpd.service-ordering-fixes.patch [bz#2115761]