summaryrefslogtreecommitdiff
path: root/net-wireless/crda
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
commit40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree758c221bad35c9288d0bd6df9c7dfc226728e52c /net-wireless/crda
parent8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
gentoo resync : 28.04.2021
Diffstat (limited to 'net-wireless/crda')
-rw-r--r--net-wireless/crda/Manifest2
-rw-r--r--net-wireless/crda/files/crda-4.14-openssl-1.1.0-compatibility.patch6
2 files changed, 1 insertions, 7 deletions
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index f32c64f4c2b9..4488bbd370c4 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -1,5 +1,5 @@
AUX crda-4.14-do-not-compress-doc.patch 1367 BLAKE2B 021a25a898dc225e52bee293ba94152e5f7e8229c5c0a813a126f239819fd727edfa34c9b85f25e31d7630c13598f797dfcd855d31fd28beec5443866f3841fb SHA512 d3545fff1f6c6ae9ae1ae9c833bb137f84783a32dfb9e2f50075079268f67ee1b001fc904d99c68ff0aad97d674fabd591c1ca2ba378e14551759e56bc3f2e45
-AUX crda-4.14-openssl-1.1.0-compatibility.patch 8821 BLAKE2B 3f679378829d2d39fcac69a111d1caa551cb1b5ee51c34aab48fa3a84847fcb98771126856bc95b6af4462539fed1987682a4528cbc47a17ab03a14b23a3b8fe SHA512 9203965c228bfc7f694380e727ceee0654b18b8da81d49c5d9d379d94087d8f6e972894034c2245086366832d181b7d69180bada5199baff1c90b2012248fc15
+AUX crda-4.14-openssl-1.1.0-compatibility.patch 8616 BLAKE2B c6c34a7575e79f67e3efca21c25aad489c1adb3c612d886b68c49c06b7c516bdfcf0f94a0838ca83c4e082ee9b3a4ffc382ff5de4c724febca5b59d21268f415 SHA512 ce8430b03a7315eb339d4d7b845cb28ea970010e47eba9a6a9199c67bb370fa7811ea1dcc2431790b2954d72fafbbb31bdcc691228e6e88b9dd066c51c2f06ef
AUX crda-4.14-python-3.patch 3022 BLAKE2B b6d78c1a09ec0f848654139e0ba778f5d65d814b9d7c84df3013aec43baf55f9c23367b15454218e39d3a0959355b4fd030dd4584b7420f6835a8ef421dd72c9 SHA512 b953be9da2ed770d89c905257c2e3f04451ce9ee2a61ee9cc18285b3d8209f8665f5f0a2a4ffb8a5211445cb45fe66dc4e3d302e90c4c0030c293c978dd443c6
AUX crda-cflags.patch 895 BLAKE2B 0a8d8acb268ff58656a5b66a77744c14fd9f92fd6a660132f2a86a88a3cd5bde4bf39709c38f2705fe999bca312a991304b673d4d12a540cecffd1fcc4ec5cc1 SHA512 c4914cd0d4b0d3f0d16aaf4ff3cd91f961870bc0376f90998b1ec149f145dd347ff79763e8da12b5865a1c6e507a0ee8d306886ffe96fa80426c3bd914a5889d
AUX crda-ldflags.patch 388 BLAKE2B 57d3ce3fccba1db8ad8bbfae2ba8e8dcd03bdd94c424761902bc2ea552c006c3e4ef1d8b913f095ba3601895bc29917d01c1e8f046a159b2b006b174bed7bf62 SHA512 3a53d3567fa9b3ff85d4e443124ea2637e5eb489ade4f160d8f1de92553a3a33c3eb9f9d80005ceac03b50e5c4aa7f0990bca3547c145644ab66985548c32e9f
diff --git a/net-wireless/crda/files/crda-4.14-openssl-1.1.0-compatibility.patch b/net-wireless/crda/files/crda-4.14-openssl-1.1.0-compatibility.patch
index a9999da239fd..41b567af384f 100644
--- a/net-wireless/crda/files/crda-4.14-openssl-1.1.0-compatibility.patch
+++ b/net-wireless/crda/files/crda-4.14-openssl-1.1.0-compatibility.patch
@@ -23,8 +23,6 @@ Signed-off-by: Quentin Minster <quentin@minster.io>
utils/key2pub.py | 107 ++++++-------------------------------------------------
3 files changed, 49 insertions(+), 114 deletions(-)
-diff --git a/Makefile b/Makefile
-index a3ead30..a4e7373 100644
--- a/Makefile
+++ b/Makefile
@@ -38,18 +38,16 @@ all: all_noverify verify
@@ -68,8 +66,6 @@ index a3ead30..a4e7373 100644
- *.o *~ *.pyc keys-*.c *.gz \
+ *.o *~ *.pyc keys.c *.gz \
udev/$(UDEV_LEVEL)regulatory.rules udev/regulatory.rules.parsed
-diff --git a/reglib.c b/reglib.c
-index e00e9b8..00f7f56 100644
--- a/reglib.c
+++ b/reglib.c
@@ -22,6 +22,7 @@
@@ -163,8 +159,6 @@ index e00e9b8..00f7f56 100644
return ok;
}
#endif /* USE_OPENSSL */
-diff --git a/utils/key2pub.py b/utils/key2pub.py
-index 9bb04cd..1919270 100755
--- a/utils/key2pub.py
+++ b/utils/key2pub.py
@@ -9,84 +9,7 @@ except ImportError as e: