1 |
commit: 535949b048ada95807d0faa132befd6064f3ce08 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 26 11:46:49 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 5 21:18:19 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=535949b0 |
7 |
|
8 |
net-wireless/crda: Drop 1.1.3-r1 and 3.18-r1 |
9 |
|
10 |
Package-Manager: Portage-2.3.66, Repoman-2.3.13 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
net-wireless/crda/Manifest | 1 - |
14 |
net-wireless/crda/crda-1.1.3-r1.ebuild | 66 ------------------- |
15 |
net-wireless/crda/crda-3.18-r1.ebuild | 77 ---------------------- |
16 |
.../crda/files/crda-1.1.3-missing-include.patch | 11 ---- |
17 |
net-wireless/crda/files/crda-3.18-openssl.patch | 44 ------------- |
18 |
5 files changed, 199 deletions(-) |
19 |
|
20 |
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest |
21 |
index c3914b4fa17..ff0b741ae87 100644 |
22 |
--- a/net-wireless/crda/Manifest |
23 |
+++ b/net-wireless/crda/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST crda-1.1.3.tar.bz2 38697 BLAKE2B 5ca68362a134e6f5fad1a450edc3cfc083686d45750dbfdd04821f30e18873f86870d97fd796d1ea4dfc79f74f65dc548562890dcfc21f224ac76006878aea41 SHA512 4ec37d3d51f5988af79c2eaadc1bce344f20d4d9833533838d308533ee02cb12d5ed193391679ae1231c8afe61b21defdb368614a6238f99fdc5824f6819cfed |
26 |
DIST crda-3.18.tar.xz 61516 BLAKE2B 76feac7fcf85b03b39bfe78de444515f54cd513041f81f7588cd7866e5bf072d000ad0c8df181ccacde7fc8125ed04ece00d5d9d3013df759b5f9fd05f8cfd56 SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588 |
27 |
|
28 |
diff --git a/net-wireless/crda/crda-1.1.3-r1.ebuild b/net-wireless/crda/crda-1.1.3-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index 89fd5c5fa4d..00000000000 |
31 |
--- a/net-wireless/crda/crda-1.1.3-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,66 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=5 |
38 |
- |
39 |
-PYTHON_COMPAT=( python2_7 ) |
40 |
-inherit eutils toolchain-funcs python-any-r1 udev |
41 |
- |
42 |
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks" |
43 |
-HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory" |
44 |
-SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.bz2" |
45 |
- |
46 |
-LICENSE="ISC" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86" |
49 |
-IUSE="" |
50 |
- |
51 |
-RDEPEND="dev-libs/openssl:0= |
52 |
- dev-libs/libnl:3 |
53 |
- net-wireless/wireless-regdb" |
54 |
-DEPEND="${RDEPEND} |
55 |
- ${PYTHON_DEPS} |
56 |
- $(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]') |
57 |
- virtual/pkgconfig" |
58 |
- |
59 |
-python_check_deps() { |
60 |
- has_version --host-root "dev-python/m2crypto[${PYTHON_USEDEP}]" |
61 |
-} |
62 |
- |
63 |
-src_prepare() { |
64 |
- epatch "${FILESDIR}"/${P}-missing-include.patch |
65 |
- sed -i \ |
66 |
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ |
67 |
- Makefile || die |
68 |
-} |
69 |
- |
70 |
-_emake() { |
71 |
- # The source hardcodes /usr/lib/crda/ paths (ignoring all make vars |
72 |
- # that look like it should change it). We want to use /usr/lib/ |
73 |
- # anyways as this file is not ABI specific and we want to share it |
74 |
- # among all ABIs rather than pointlessly duplicate it. |
75 |
- # |
76 |
- # The trailing slash on SBINDIR is required by the source. |
77 |
- emake \ |
78 |
- PREFIX="${EPREFIX}/usr" \ |
79 |
- SBINDIR='$(PREFIX)/sbin/' \ |
80 |
- UDEV_RULE_DIR="$(get_udevdir)/rules.d" \ |
81 |
- REG_BIN=/usr/lib/crda/regulatory.bin \ |
82 |
- USE_OPENSSL=1 \ |
83 |
- CC="$(tc-getCC)" \ |
84 |
- V=1 \ |
85 |
- "$@" |
86 |
-} |
87 |
- |
88 |
-src_compile() { |
89 |
- _emake all_noverify |
90 |
-} |
91 |
- |
92 |
-src_test() { |
93 |
- _emake verify |
94 |
-} |
95 |
- |
96 |
-src_install() { |
97 |
- _emake DESTDIR="${D}" install |
98 |
- keepdir /etc/wireless-regdb/pubkeys |
99 |
-} |
100 |
|
101 |
diff --git a/net-wireless/crda/crda-3.18-r1.ebuild b/net-wireless/crda/crda-3.18-r1.ebuild |
102 |
deleted file mode 100644 |
103 |
index b5394b975e7..00000000000 |
104 |
--- a/net-wireless/crda/crda-3.18-r1.ebuild |
105 |
+++ /dev/null |
106 |
@@ -1,77 +0,0 @@ |
107 |
-# Copyright 1999-2018 Gentoo Authors |
108 |
-# Distributed under the terms of the GNU General Public License v2 |
109 |
- |
110 |
-EAPI=5 |
111 |
- |
112 |
-PYTHON_COMPAT=( python2_7 ) |
113 |
-inherit eutils toolchain-funcs python-any-r1 udev |
114 |
- |
115 |
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks" |
116 |
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/crda" |
117 |
-SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.xz |
118 |
- mirror://kernel/software/network/crda/${P}.tar.xz" |
119 |
- |
120 |
-LICENSE="ISC" |
121 |
-SLOT="0" |
122 |
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86" |
123 |
-IUSE="gcrypt libressl" |
124 |
- |
125 |
-RDEPEND="!gcrypt? ( |
126 |
- !libressl? ( dev-libs/openssl:0= ) |
127 |
- libressl? ( dev-libs/libressl:= ) |
128 |
- ) |
129 |
- gcrypt? ( dev-libs/libgcrypt:0 ) |
130 |
- dev-libs/libnl:3 |
131 |
- net-wireless/wireless-regdb" |
132 |
-DEPEND="${RDEPEND} |
133 |
- ${PYTHON_DEPS} |
134 |
- $(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]') |
135 |
- virtual/pkgconfig" |
136 |
- |
137 |
-python_check_deps() { |
138 |
- has_version --host-root "dev-python/m2crypto[${PYTHON_USEDEP}]" |
139 |
-} |
140 |
- |
141 |
-src_prepare() { |
142 |
- epatch "${FILESDIR}"/${PN}-3.18-no-ldconfig.patch |
143 |
- epatch "${FILESDIR}"/${PN}-3.18-no-werror.patch |
144 |
- epatch "${FILESDIR}"/${PN}-3.18-openssl.patch |
145 |
- epatch "${FILESDIR}"/${PN}-3.18-cflags.patch |
146 |
- epatch "${FILESDIR}"/${PN}-3.18-libreg-link.patch #542436 |
147 |
- sed -i \ |
148 |
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ |
149 |
- Makefile || die |
150 |
-} |
151 |
- |
152 |
-_emake() { |
153 |
- # The source hardcodes /usr/lib/crda/ paths (ignoring all make vars |
154 |
- # that look like it should change it). We want to use /usr/lib/ |
155 |
- # anyways as this file is not ABI specific and we want to share it |
156 |
- # among all ABIs rather than pointlessly duplicate it. |
157 |
- # |
158 |
- # The trailing slash on SBINDIR is required by the source. |
159 |
- emake \ |
160 |
- PREFIX="${EPREFIX}/usr" \ |
161 |
- SBINDIR='$(PREFIX)/sbin/' \ |
162 |
- LIBDIR='$(PREFIX)/'"$(get_libdir)" \ |
163 |
- UDEV_RULE_DIR="$(get_udevdir)/rules.d" \ |
164 |
- REG_BIN="${SYSROOT}"/usr/lib/crda/regulatory.bin \ |
165 |
- USE_OPENSSL=$(usex gcrypt 0 1) \ |
166 |
- CC="$(tc-getCC)" \ |
167 |
- V=1 \ |
168 |
- WERROR= \ |
169 |
- "$@" |
170 |
-} |
171 |
- |
172 |
-src_compile() { |
173 |
- _emake all_noverify |
174 |
-} |
175 |
- |
176 |
-src_test() { |
177 |
- _emake verify |
178 |
-} |
179 |
- |
180 |
-src_install() { |
181 |
- _emake DESTDIR="${D}" install |
182 |
- keepdir /etc/wireless-regdb/pubkeys |
183 |
-} |
184 |
|
185 |
diff --git a/net-wireless/crda/files/crda-1.1.3-missing-include.patch b/net-wireless/crda/files/crda-1.1.3-missing-include.patch |
186 |
deleted file mode 100644 |
187 |
index a472e238f66..00000000000 |
188 |
--- a/net-wireless/crda/files/crda-1.1.3-missing-include.patch |
189 |
+++ /dev/null |
190 |
@@ -1,11 +0,0 @@ |
191 |
-diff --git a/reglib.c b/reglib.c |
192 |
-index bc81974..1fafd37 100644 |
193 |
---- a/reglib.c |
194 |
-+++ b/reglib.c |
195 |
-@@ -9,6 +9,7 @@ |
196 |
- #include <fcntl.h> |
197 |
- #include <stdbool.h> |
198 |
- #include <unistd.h> |
199 |
-+#include <string.h> |
200 |
- |
201 |
- #include <arpa/inet.h> /* ntohl */ |
202 |
|
203 |
diff --git a/net-wireless/crda/files/crda-3.18-openssl.patch b/net-wireless/crda/files/crda-3.18-openssl.patch |
204 |
deleted file mode 100644 |
205 |
index 9147e862ee5..00000000000 |
206 |
--- a/net-wireless/crda/files/crda-3.18-openssl.patch |
207 |
+++ /dev/null |
208 |
@@ -1,44 +0,0 @@ |
209 |
-From af009b7599d705a1023d7bc95c485e5a8776d2b8 Mon Sep 17 00:00:00 2001 |
210 |
-From: Mike Frysinger <vapier@××××××××.org> |
211 |
-Date: Wed, 4 Mar 2015 14:07:37 -0500 |
212 |
-Subject: [PATCH] fix openssl generation |
213 |
- |
214 |
-This file uses BN_ULONG but doesn't include the openssl headers leading |
215 |
-to build failures: |
216 |
-keys-ssl.c:2:8: error: unknown type name 'BN_ULONG' |
217 |
- static BN_ULONG e_0[1] = { |
218 |
- |
219 |
-The large unqualified constants also break building: |
220 |
-keys-ssl.c:8:2: warning: overflow in implicit constant conversion [-Woverflow] |
221 |
- 0x63a2705416a0d8e1, 0xdc9fca11c8ba757b, |
222 |
- ^ |
223 |
- |
224 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
225 |
---- |
226 |
- utils/key2pub.py | 3 ++- |
227 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
228 |
- |
229 |
-diff --git a/utils/key2pub.py b/utils/key2pub.py |
230 |
-index 3e84cd2..c504aca 100755 |
231 |
---- a/utils/key2pub.py |
232 |
-+++ b/utils/key2pub.py |
233 |
-@@ -24,7 +24,7 @@ def print_ssl_64(output, name, val): |
234 |
- for v1, v2, v3, v4, v5, v6, v7, v8 in vnew: |
235 |
- if not idx: |
236 |
- output.write('\t') |
237 |
-- output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8))) |
238 |
-+ output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2xULL, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8))) |
239 |
- idx += 1 |
240 |
- if idx == 2: |
241 |
- idx = 0 |
242 |
-@@ -60,6 +60,7 @@ def print_ssl_32(output, name, val): |
243 |
- def print_ssl(output, name, val): |
244 |
- import struct |
245 |
- output.write('#include <stdint.h>\n') |
246 |
-+ output.write('#include <openssl/bn.h>\n') |
247 |
- if len(struct.pack('@L', 0)) == 8: |
248 |
- return print_ssl_64(output, name, val) |
249 |
- else: |
250 |
--- |
251 |
-2.3.1 |
252 |
- |