From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5F75D138335 for ; Wed, 5 Jun 2019 21:19:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AB1CE0858; Wed, 5 Jun 2019 21:19:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10BDDE0858 for ; Wed, 5 Jun 2019 21:19:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 853C8345798 for ; Wed, 5 Jun 2019 21:19:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 80326601 for ; Wed, 5 Jun 2019 21:19:51 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1559769499.535949b048ada95807d0faa132befd6064f3ce08.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/crda/, net-wireless/crda/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/crda/Manifest net-wireless/crda/crda-1.1.3-r1.ebuild net-wireless/crda/crda-3.18-r1.ebuild net-wireless/crda/files/crda-1.1.3-missing-include.patch net-wireless/crda/files/crda-3.18-openssl.patch X-VCS-Directories: net-wireless/crda/ net-wireless/crda/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 535949b048ada95807d0faa132befd6064f3ce08 X-VCS-Branch: master Date: Wed, 5 Jun 2019 21:19:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9f1bc48c-b1e4-4455-a9f7-01a9af4f2659 X-Archives-Hash: e13a44fe6c47de34471c964bdf3789a6 commit: 535949b048ada95807d0faa132befd6064f3ce08 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 26 11:46:49 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 5 21:18:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=535949b0 net-wireless/crda: Drop 1.1.3-r1 and 3.18-r1 Package-Manager: Portage-2.3.66, Repoman-2.3.13 Signed-off-by: Andreas Sturmlechner gentoo.org> net-wireless/crda/Manifest | 1 - net-wireless/crda/crda-1.1.3-r1.ebuild | 66 ------------------- net-wireless/crda/crda-3.18-r1.ebuild | 77 ---------------------- .../crda/files/crda-1.1.3-missing-include.patch | 11 ---- net-wireless/crda/files/crda-3.18-openssl.patch | 44 ------------- 5 files changed, 199 deletions(-) diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest index c3914b4fa17..ff0b741ae87 100644 --- a/net-wireless/crda/Manifest +++ b/net-wireless/crda/Manifest @@ -1,2 +1 @@ -DIST crda-1.1.3.tar.bz2 38697 BLAKE2B 5ca68362a134e6f5fad1a450edc3cfc083686d45750dbfdd04821f30e18873f86870d97fd796d1ea4dfc79f74f65dc548562890dcfc21f224ac76006878aea41 SHA512 4ec37d3d51f5988af79c2eaadc1bce344f20d4d9833533838d308533ee02cb12d5ed193391679ae1231c8afe61b21defdb368614a6238f99fdc5824f6819cfed DIST crda-3.18.tar.xz 61516 BLAKE2B 76feac7fcf85b03b39bfe78de444515f54cd513041f81f7588cd7866e5bf072d000ad0c8df181ccacde7fc8125ed04ece00d5d9d3013df759b5f9fd05f8cfd56 SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588 diff --git a/net-wireless/crda/crda-1.1.3-r1.ebuild b/net-wireless/crda/crda-1.1.3-r1.ebuild deleted file mode 100644 index 89fd5c5fa4d..00000000000 --- a/net-wireless/crda/crda-1.1.3-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils toolchain-funcs python-any-r1 udev - -DESCRIPTION="Central Regulatory Domain Agent for wireless networks" -HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory" -SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.bz2" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86" -IUSE="" - -RDEPEND="dev-libs/openssl:0= - dev-libs/libnl:3 - net-wireless/wireless-regdb" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]') - virtual/pkgconfig" - -python_check_deps() { - has_version --host-root "dev-python/m2crypto[${PYTHON_USEDEP}]" -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-missing-include.patch - sed -i \ - -e "s:\:$(tc-getPKG_CONFIG):" \ - Makefile || die -} - -_emake() { - # The source hardcodes /usr/lib/crda/ paths (ignoring all make vars - # that look like it should change it). We want to use /usr/lib/ - # anyways as this file is not ABI specific and we want to share it - # among all ABIs rather than pointlessly duplicate it. - # - # The trailing slash on SBINDIR is required by the source. - emake \ - PREFIX="${EPREFIX}/usr" \ - SBINDIR='$(PREFIX)/sbin/' \ - UDEV_RULE_DIR="$(get_udevdir)/rules.d" \ - REG_BIN=/usr/lib/crda/regulatory.bin \ - USE_OPENSSL=1 \ - CC="$(tc-getCC)" \ - V=1 \ - "$@" -} - -src_compile() { - _emake all_noverify -} - -src_test() { - _emake verify -} - -src_install() { - _emake DESTDIR="${D}" install - keepdir /etc/wireless-regdb/pubkeys -} diff --git a/net-wireless/crda/crda-3.18-r1.ebuild b/net-wireless/crda/crda-3.18-r1.ebuild deleted file mode 100644 index b5394b975e7..00000000000 --- a/net-wireless/crda/crda-3.18-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils toolchain-funcs python-any-r1 udev - -DESCRIPTION="Central Regulatory Domain Agent for wireless networks" -HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/crda" -SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.xz - mirror://kernel/software/network/crda/${P}.tar.xz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86" -IUSE="gcrypt libressl" - -RDEPEND="!gcrypt? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - gcrypt? ( dev-libs/libgcrypt:0 ) - dev-libs/libnl:3 - net-wireless/wireless-regdb" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]') - virtual/pkgconfig" - -python_check_deps() { - has_version --host-root "dev-python/m2crypto[${PYTHON_USEDEP}]" -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.18-no-ldconfig.patch - epatch "${FILESDIR}"/${PN}-3.18-no-werror.patch - epatch "${FILESDIR}"/${PN}-3.18-openssl.patch - epatch "${FILESDIR}"/${PN}-3.18-cflags.patch - epatch "${FILESDIR}"/${PN}-3.18-libreg-link.patch #542436 - sed -i \ - -e "s:\:$(tc-getPKG_CONFIG):" \ - Makefile || die -} - -_emake() { - # The source hardcodes /usr/lib/crda/ paths (ignoring all make vars - # that look like it should change it). We want to use /usr/lib/ - # anyways as this file is not ABI specific and we want to share it - # among all ABIs rather than pointlessly duplicate it. - # - # The trailing slash on SBINDIR is required by the source. - emake \ - PREFIX="${EPREFIX}/usr" \ - SBINDIR='$(PREFIX)/sbin/' \ - LIBDIR='$(PREFIX)/'"$(get_libdir)" \ - UDEV_RULE_DIR="$(get_udevdir)/rules.d" \ - REG_BIN="${SYSROOT}"/usr/lib/crda/regulatory.bin \ - USE_OPENSSL=$(usex gcrypt 0 1) \ - CC="$(tc-getCC)" \ - V=1 \ - WERROR= \ - "$@" -} - -src_compile() { - _emake all_noverify -} - -src_test() { - _emake verify -} - -src_install() { - _emake DESTDIR="${D}" install - keepdir /etc/wireless-regdb/pubkeys -} 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 deleted file mode 100644 index a472e238f66..00000000000 --- a/net-wireless/crda/files/crda-1.1.3-missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/reglib.c b/reglib.c -index bc81974..1fafd37 100644 ---- a/reglib.c -+++ b/reglib.c -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - - #include /* ntohl */ diff --git a/net-wireless/crda/files/crda-3.18-openssl.patch b/net-wireless/crda/files/crda-3.18-openssl.patch deleted file mode 100644 index 9147e862ee5..00000000000 --- a/net-wireless/crda/files/crda-3.18-openssl.patch +++ /dev/null @@ -1,44 +0,0 @@ -From af009b7599d705a1023d7bc95c485e5a8776d2b8 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Wed, 4 Mar 2015 14:07:37 -0500 -Subject: [PATCH] fix openssl generation - -This file uses BN_ULONG but doesn't include the openssl headers leading -to build failures: -keys-ssl.c:2:8: error: unknown type name 'BN_ULONG' - static BN_ULONG e_0[1] = { - -The large unqualified constants also break building: -keys-ssl.c:8:2: warning: overflow in implicit constant conversion [-Woverflow] - 0x63a2705416a0d8e1, 0xdc9fca11c8ba757b, - ^ - -Signed-off-by: Mike Frysinger ---- - utils/key2pub.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/utils/key2pub.py b/utils/key2pub.py -index 3e84cd2..c504aca 100755 ---- a/utils/key2pub.py -+++ b/utils/key2pub.py -@@ -24,7 +24,7 @@ def print_ssl_64(output, name, val): - for v1, v2, v3, v4, v5, v6, v7, v8 in vnew: - if not idx: - output.write('\t') -- 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))) -+ 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))) - idx += 1 - if idx == 2: - idx = 0 -@@ -60,6 +60,7 @@ def print_ssl_32(output, name, val): - def print_ssl(output, name, val): - import struct - output.write('#include \n') -+ output.write('#include \n') - if len(struct.pack('@L', 0)) == 8: - return print_ssl_64(output, name, val) - else: --- -2.3.1 -