commit:     0ebdd88d52ec81fa8e16b8f9ea69edc7c2298dba
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Jan 23 15:29:16 2022 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 19:43:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebdd88d

net-wireless/iwd: remove unused patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/23926
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 net-wireless/iwd/files/iwd-1.17-fix-tests.patch    | 35 ----------------------
 .../iwd/files/iwd-1.18-musl-backport.patch         | 30 -------------------
 2 files changed, 65 deletions(-)

diff --git a/net-wireless/iwd/files/iwd-1.17-fix-tests.patch 
b/net-wireless/iwd/files/iwd-1.17-fix-tests.patch
deleted file mode 100644
index cf3de4c1d38f..000000000000
--- a/net-wireless/iwd/files/iwd-1.17-fix-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ed10b00afa3f4c087b46d7ba0b60a47bd05d8b39 Mon Sep 17 00:00:00 2001
-From: Denis Kenzior <denk...@gmail.com>
-Date: Mon, 23 Aug 2021 08:51:35 -0500
-Subject: unit: Fix eapol IP Allocation test failure
-
-This test was failing due to a change introduced in commit
-5c9de0cf23f9 which changed handshake state storage of IPs from host
-order to network byte order.  Update the test to set IPs in network
-byte-order.
-
-Fixes: 5c9de0cf23f9 ("eapol: Store IP address in network byte order")
----
- unit/test-eapol.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/unit/test-eapol.c b/unit/test-eapol.c
-index b6a6adcb..470e0e9f 100644
---- a/unit/test-eapol.c
-+++ b/unit/test-eapol.c
-@@ -3802,9 +3802,9 @@ static void 
eapol_ap_sta_handshake_ip_alloc_ok_test(const void *data)
-       handshake_state_set_ssid(s.ap_hs, (void *) ssid, strlen(ssid));
-       handshake_state_set_pmk(s.ap_hs, psk, 32);
-       s.ap_hs->support_ip_allocation = true;
--      s.ap_hs->client_ip_addr = 0x01020304;
--      s.ap_hs->subnet_mask = 0xffff0000;
--      s.ap_hs->go_ip_addr = 0x01020305;
-+      s.ap_hs->client_ip_addr = L_CPU_TO_BE32(0x01020304);
-+      s.ap_hs->subnet_mask = L_CPU_TO_BE32(0xffff0000);
-+      s.ap_hs->go_ip_addr = L_CPU_TO_BE32(0x01020305);
- 
-       handshake_state_set_authenticator(s.sta_hs, false);
-       handshake_state_set_event_func(s.sta_hs, test_ap_sta_hs_event, &s);
--- 
-cgit 1.2.3-1.el7
-

diff --git a/net-wireless/iwd/files/iwd-1.18-musl-backport.patch 
b/net-wireless/iwd/files/iwd-1.18-musl-backport.patch
deleted file mode 100644
index 99371ca3bb4e..000000000000
--- a/net-wireless/iwd/files/iwd-1.18-musl-backport.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7 Mon Sep 17 00:00:00 2001
-From: Andrew Zaborowski <andrew.zaborow...@intel.com>
-Date: Thu, 16 Sep 2021 01:58:29 +0200
-Subject: netconfig: Remove usage of in6_addr.__in6_u
-
-in6_addr.__in6_u.__u6_addr8 is glibc-specific and named differently in
-the headers shipped with musl libc for example.  The POSIX compliant and
-universal way of accessing it is in6_addr.s6_addr.
----
- src/netconfig.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/netconfig.c')
-
-diff --git a/src/netconfig.c b/src/netconfig.c
-index ce95db0b..421270c9 100644
---- a/src/netconfig.c
-+++ b/src/netconfig.c
-@@ -171,7 +171,7 @@ static inline char *netconfig_ipv6_to_string(const uint8_t 
*addr)
-       struct in6_addr in6_addr;
-       char *addr_str = l_malloc(INET6_ADDRSTRLEN);
- 
--      memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16);
-+      memcpy(in6_addr.s6_addr, addr, 16);
- 
-       if (L_WARN_ON(unlikely(!inet_ntop(AF_INET6, &in6_addr, addr_str,
-                                               INET6_ADDRSTRLEN)))) {
--- 
-cgit 1.2.3-1.el7
-

Reply via email to