commit: 3bdefdcebf3138f51f7b325ebcf36c19b43d52ae Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Sat Jul 18 22:07:28 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sat Jul 18 22:07:28 2015 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3bdefdce
net-wireless/crda: version 3.18 in the gentoo tree works. net-wireless/crda/Manifest | 5 -- net-wireless/crda/crda-1.1.2-r3.ebuild | 49 ------------------ .../crda/files/crda-1.1.2-missing-include.patch | 10 ---- net-wireless/crda/files/libnl31-support.diff | 60 ---------------------- net-wireless/crda/metadata.xml | 16 ------ 5 files changed, 140 deletions(-) diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest deleted file mode 100644 index f091cb9..0000000 --- a/net-wireless/crda/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX crda-1.1.2-missing-include.patch 219 SHA256 e5dfc0dee3fe5d663430da50f53bd6f7f42cef9b5a7d248f997ea99899e7182f SHA512 ecb1f6c5e02a7e4564c8fd72d4fd3d2378095d8c9f42d635b70eb73400852a6714d3bc88ea7abf19781b875d343cb0bccb655aae4ee6ce4895be9d11ce59b609 WHIRLPOOL 2c481603a3a5d6f372aae26d667979897ede03de96e5fd4d9cfb7014fd623964a589646b704b41a295d941c8df11bd92f6dededece50127e7b99f91eeb1af84c -AUX libnl31-support.diff 1963 SHA256 5a2fce22089b49733cd2315840d2812e4590e12d987086a04dcb69d6d9fcbac7 SHA512 849c3f866723f163579f55be7f6eda13020299394fd6599bfff80028da73cbe78f049d963fbf91eb3de6fca1e16ce26ae48e84534ad383caade4112ca448ca89 WHIRLPOOL d7fb6fbf7ea3d2fee7342e4878110ed9305259818cb353dd7cac321fecd87e5cd23986a6ee5a266f6ca06fade05e1d016531c38d6d1404a80c0963451e67604f -DIST crda-1.1.2.tar.bz2 21754 SHA256 e469348a5d0bb933df31995869130f68901de9be02e666437f52125698851864 SHA512 cd0997fdafc63640cbac5cff57b617177c3693a6d05e2138f23ed8273502d5f485f8f60309ed4fec97fe2cd2d51ee4b7e2d9535efc1de44c08b9cc9d6fb7ecf3 WHIRLPOOL 35ef76fcb7f3760613135caba5b9c6b0c781bc560f948a60f6b09eaeb75f3538461d90ce353decc17795995795b63c124a282903d41a8e25680fda0b6498bea4 -EBUILD crda-1.1.2-r3.ebuild 1344 SHA256 839ca201462dbb74247bda0384150354e541ae24aa89c18ec0348fccce38a4ae SHA512 0fe5dbf6bcad6c2ea5ef998911544edb5b3699a47300a818725d3db3b09782d0380c155b4904660458d1072c4056c066d513d2b45be5fafe62cb5749204b340a WHIRLPOOL 63448bff7fe1d95d0d6cd6bd1733b32c584b1b655128e8c1d36abea9766bc9173cbdcc2bf2a1f45f2025c339deb77e1935d0fca9c187f3e85f8e74c442503a4e -MISC metadata.xml 423 SHA256 a2bf4db1a40a535e8239fceeb01e7433b04ab0be4046a4f358303fc7e057cc87 SHA512 cedd6c72d6e7af630a04cac09a9ffd41e48d01ecfc2bb5e3c0a7af05de31f41d5b88f675b8204bb7fca2ea4ffada0b454c6f47337ce1dc13aeb87875861819c6 WHIRLPOOL 1301cb831507d985158de92f230e60e528e91529ba659508e34d4846c78e9c80963271356164e087098396624ccbd564d4055be07beb32848d9d088680272b67 diff --git a/net-wireless/crda/crda-1.1.2-r3.ebuild b/net-wireless/crda/crda-1.1.2-r3.ebuild deleted file mode 100644 index 93306ac..0000000 --- a/net-wireless/crda/crda-1.1.2-r3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.2-r3.ebuild,v 1.11 2013/01/01 08:27:28 ago Exp $ - -EAPI=4 -inherit eutils toolchain-funcs python - -DESCRIPTION="Central Regulatory Domain Agent for wireless networks." -HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"; -SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.bz2"; - -LICENSE="ISC" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="" - -RDEPEND="dev-libs/openssl - dev-libs/libnl - net-wireless/wireless-regdb" -DEPEND="${RDEPEND} - dev-python/m2crypto - =dev-lang/python-2* - virtual/pkgconfig" -RDEPEND="${RDEPEND} - >=virtual/udev-171" - -src_prepare() { - epatch "${FILESDIR}"/libnl31-support.diff - epatch "${FILESDIR}"/${P}-missing-include.patch - - python_convert_shebangs 2 utils/key2pub.py - - sed -i \ - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ - Makefile || die -} - -src_compile() { - emake UDEV_RULE_DIR=/lib/udev/rules.d/ REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin USE_OPENSSL=1 CC="$(tc-getCC)" all_noverify -} - -src_test() { - emake USE_OPENSSL=1 CC="$(tc-getCC)" verify -} - -src_install() { - emake UDEV_RULE_DIR=/lib/udev/rules.d/ REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin USE_OPENSSL=1 DESTDIR="${D}" install - keepdir /etc/wireless-regdb/pubkeys -} diff --git a/net-wireless/crda/files/crda-1.1.2-missing-include.patch b/net-wireless/crda/files/crda-1.1.2-missing-include.patch deleted file mode 100644 index 7d28a77..0000000 --- a/net-wireless/crda/files/crda-1.1.2-missing-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/crda-1.1.2/reglib.c -+++ b/crda-1.1.2/reglib.c -@@ -1,6 +1,7 @@ - #include <errno.h> - #include <stdio.h> - #include <arpa/inet.h> -+#include <limits.h> - #include <sys/types.h> - #include <dirent.h> - #include "reglib.h" diff --git a/net-wireless/crda/files/libnl31-support.diff b/net-wireless/crda/files/libnl31-support.diff deleted file mode 100644 index 56243ee..0000000 --- a/net-wireless/crda/files/libnl31-support.diff +++ /dev/null @@ -1,60 +0,0 @@ -diff -aurp a/crda-1.1.2/crda.c b/crda-1.1.2/crda.c ---- a/crda-1.1.2/crda.c 2011-11-07 19:52:28.884873650 +0000 -+++ b/crda-1.1.2/crda.c 2011-11-07 19:53:30.501874372 +0000 -@@ -21,7 +21,7 @@ - #include "regdb.h" - #include "reglib.h" - --#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30) -+#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30) && !defined(CONFIG_LIBNL31) - /* libnl 2.0 compatibility code */ - static inline struct nl_handle *nl_socket_alloc(void) - { -@@ -44,7 +44,7 @@ static inline int __genl_ctrl_alloc_cach - - #define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache - #define nl_sock nl_handle --#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 */ -+#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 && CONFIG_LIBNL31 */ - - struct nl80211_state { - struct nl_sock *nl_sock; -diff -aurp a/crda-1.1.2/Makefile b/crda-1.1.2/Makefile ---- a/crda-1.1.2/Makefile 2011-11-07 19:52:28.884873650 +0000 -+++ b/crda-1.1.2/Makefile 2011-11-07 19:54:25.906872386 +0000 -@@ -48,19 +48,26 @@ INSTALL ?= install - NL1FOUND := $(shell pkg-config --atleast-version=1 libnl-1 && echo Y) - NL2FOUND := $(shell pkg-config --atleast-version=2 libnl-2.0 && echo Y) - NL3FOUND := $(shell pkg-config --atleast-version=3 libnl-3.0 && echo Y) -+NL31FOUND := $(shell pkg-config --atleast-version=3 libnl-3.1 && echo Y) - --ifeq ($(NL3FOUND),Y) -+ifeq ($(NL31FOUND),Y) - CFLAGS += -DCONFIG_LIBNL30 --NLLIBS += -lnl-genl --NLLIBNAME = libnl-3.0 -+NLLIBS += $(shell pkg-config --libs libnl-genl-3.1) -+NLLIBNAME = libnl-3.1 - else -- ifeq ($(NL2FOUND),Y) -- CFLAGS += -DCONFIG_LIBNL20 -- NLLIBS += -lnl-genl -- NLLIBNAME = libnl-2.0 -+ ifeq ($(NL3FOUND),Y) -+ CFLAGS += -DCONFIG_LIBNL30 -+ NLLIBS += $(shell pkg-config --libs libnl-genl-3.0) -+ NLLIBNAME = libnl-3.0 - else -- ifeq ($(NL1FOUND),Y) -- NLLIBNAME = libnl-1 -+ ifeq ($(NL2FOUND),Y) -+ CFLAGS += -DCONFIG_LIBNL20 -+ NLLIBS += -lnl-genl -+ NLLIBNAME = libnl-2.0 -+ else -+ ifeq ($(NL1FOUND),Y) -+ NLLIBNAME = libnl-1 -+ endif - endif - endif - endif diff --git a/net-wireless/crda/metadata.xml b/net-wireless/crda/metadata.xml deleted file mode 100644 index e6745d7..0000000 --- a/net-wireless/crda/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer> - <email>[email protected]</email> - <name>Bjarke Istrup Pedersen</name> - </maintainer> - <maintainer> - <email>[email protected]</email> - <name>Rick Farina</name> - </maintainer> - <longdescription lang="en"> - Central Regulatory Domain Agent - </longdescription> -</pkgmetadata> -
