summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjarke Istrup Pedersen <gurligebis@gentoo.org>2011-09-10 07:24:04 +0000
committerBjarke Istrup Pedersen <gurligebis@gentoo.org>2011-09-10 07:24:04 +0000
commitf306aafd9532283ce892bdbf951a78a6b2795119 (patch)
treeb7d2b3940ea720f153f991efe1d761901215f740 /net-wireless/crda
parentInstall icon and desktop file. Bug 198680 by Sebastian. (diff)
downloadhistorical-f306aafd9532283ce892bdbf951a78a6b2795119.tar.gz
historical-f306aafd9532283ce892bdbf951a78a6b2795119.tar.bz2
historical-f306aafd9532283ce892bdbf951a78a6b2795119.zip
Added support for libnl-3.1
Package-Manager: portage-2.2.0_alpha54/cvs/Linux i686
Diffstat (limited to 'net-wireless/crda')
-rw-r--r--net-wireless/crda/ChangeLog7
-rw-r--r--net-wireless/crda/Manifest19
-rw-r--r--net-wireless/crda/crda-1.1.0.ebuild35
-rw-r--r--net-wireless/crda/crda-1.1.1.ebuild35
-rw-r--r--net-wireless/crda/crda-1.1.2.ebuild12
-rw-r--r--net-wireless/crda/files/libnl31-support.diff58
-rw-r--r--net-wireless/crda/metadata.xml4
7 files changed, 85 insertions, 85 deletions
diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog
index 9a344589fea9..dbb2425ab43f 100644
--- a/net-wireless/crda/ChangeLog
+++ b/net-wireless/crda/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-wireless/crda
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.22 2011/09/06 18:32:29 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.23 2011/09/10 07:24:04 gurligebis Exp $
+
+ 10 Sep 2011; <gurligebis@gentoo.org> +files/libnl31-support.diff,
+ -crda-1.1.0.ebuild, -crda-1.1.1.ebuild, crda-1.1.2.ebuild, metadata.xml:
+ Adding myself to maintainers, removing old versions and adding
+ support for libnl-3.1 .
06 Sep 2011; Matt Turner <mattst88@gentoo.org> crda-1.1.2.ebuild:
Added ~mips, bug 374735
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 54dbe98d9cef..0bc14b039f06 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -1,22 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX libnl31-support.diff 1768 RMD160 8b01e71c0d7cedd3aaa3fc437924eee6788c6e4e SHA1 c678c7f0cfabad2ea5e57e46c3010f6450702182 SHA256 efb386f47f88a35b0537591619f96bd94bb1f8d832021be1f2ce0f6dc805c3db
DIST crda-1.0.1.tar.bz2 21013 RMD160 9fd99a0cac4e09926b9a97ded4f3f6e3f27298b2 SHA1 5574374fed2de53a0bee49702d6e7448c0c1bf5c SHA256 6b0cfb4d0340b6e239488a46ce92c8d26cec84fe0da06d4c7b7327bf0e932f1f
DIST crda-1.0.2.tar.bz2 21270 RMD160 1724426caa3903fedd6727ccfd624d87290f391b SHA1 77d403d97fd7e7647778f8c121a1cb46dc47bb77 SHA256 b26f7af080925bc03a5782578291b614fbcb47563bc2f9d9363cf12825772459
-DIST crda-1.1.0.tar.bz2 21418 RMD160 56107c11c898d94db3b7d39e17ea9f53afc64ffb SHA1 1ab73f7df83aab511d484b6f8b959a96bd6ab1da SHA256 82695b11263e6b329b4789fbc6b43b7a2d91de667904767bd5d3e4a49556bfc1
-DIST crda-1.1.1.tar.bz2 21666 RMD160 035e381f6276dacd06afc05fbfefdbbf7e768091 SHA1 73643b3f49b34c4150df4abb793a36792cc68fb7 SHA256 59b4760da44a8f803caeaaa7fb97e0c6bd3f35f40445b28258e7f14c2fbe13b5
DIST crda-1.1.2.tar.bz2 21754 RMD160 b36254bead7c1561646430f945ca484d301c082c SHA1 a180b8cd2b3f37a157ca27da3fc603795e618906 SHA256 e469348a5d0bb933df31995869130f68901de9be02e666437f52125698851864
EBUILD crda-1.0.1-r1.ebuild 970 RMD160 95eaf57b13c85c3f7e9970090cb91b79313eaf6c SHA1 d7969ec371926b1c5848fbc0623a8ba82617daf9 SHA256 fe7fe45c36682165f3fe980e006f8151fcc41ea6e2377456b658fc630892ebd7
EBUILD crda-1.0.2.ebuild 971 RMD160 cdf9b621e8a778c2393efbdd593019ccc57cc9fc SHA1 46a5fcfba740fd4c2aa5c3408d471a72c8c79558 SHA256 4658e95cc55882acd5b3d5245e26e6e6929ee4094d8c14ddd75b4b0886c31eff
-EBUILD crda-1.1.0.ebuild 971 RMD160 597471c1282d28e8befa2cd7af003e54ab7e72d6 SHA1 e290ea8778e9ea875d56b93b90c87f226006adb3 SHA256 7aa6c20d845500cd32910056059375a08e21c688d4f5fb2d29be563d8f154d97
-EBUILD crda-1.1.1.ebuild 971 RMD160 fa58311f4a7ef02c281f4bf604ca60137c8dfbe8 SHA1 919010879ef24112a6497dd1936c941f8ef1eeb6 SHA256 f4a24a5c7bc23dd6bfa8b830b8ac02f91dc4f6dbc26ea70ec571374584e210f1
-EBUILD crda-1.1.2.ebuild 919 RMD160 471863df4fbdf34815f391264f5e057c7ec592dc SHA1 f1d5523c7994d31a03d6784587fcd860afc8a409 SHA256 62c447490e14ca4aa576d1122cf3f2c531d5b921d3f1c8e46f14e1859ddd1ea9
-MISC ChangeLog 3980 RMD160 b6444f4468eea7e826a78d6ecaed39c2e9d04fce SHA1 a51cbd87ffa4aeecf41391aeb0d4c116b2495a63 SHA256 4e0730199ea16608d9b6bf59fd583d119c4395088e7f7844b53296c439030d21
-MISC metadata.xml 336 RMD160 5387d69e2ba5c7a8060b0f9bcdf7bfc37e5fd8f2 SHA1 34ec6dc7cb06c173cbba3ce497251270854c4d77 SHA256 07f98714b59da38fd6421dff80c36347116f7913f306397f327f24fb3292f02a
+EBUILD crda-1.1.2.ebuild 998 RMD160 42b8db9a7b2ca35d26a6a4465827d02256cdbd71 SHA1 a0c606f48efd641961c275180fa4e7096bbc4019 SHA256 bb5230b32d693013c22780bf2eb8fb52d1e3aab8b8ef5659ee1ff2c8681de2de
+MISC ChangeLog 4217 RMD160 0119071b9255d69fa19b0ec68defde7fa09b45e1 SHA1 2840c00dc809f8f994a6150e20ad50d64636dac9 SHA256 3c5184a7a981b669cf978828c0b4bcd0484f3972b3d7561e012073984a903aa3
+MISC metadata.xml 442 RMD160 f6daaa1cd4a5be54866b9e2fad36001809413e52 SHA1 758dcebcb6312c67f689b366282da3d6c25c2246 SHA256 27b397c28222f181af8b9dc5cef91881615b1904085e46db71052064cee84f18
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk5mZ0EACgkQTVUdg23rv52OvACff7CoGNARIUbhGkNNbL66zNuJ
-i04An2dGfmdhdUfXRyEIW1TvZAomyatV
-=tK+5
+iEYEARECAAYFAk5rEJ0ACgkQsR7PQhRXYEl89wCgghwNGw+Q3cWg85BDzBbVDgKP
+2usAn3wJPDbbbuowLBd8RLGHQPe6m8+q
+=XVZV
-----END PGP SIGNATURE-----
diff --git a/net-wireless/crda/crda-1.1.0.ebuild b/net-wireless/crda/crda-1.1.0.ebuild
deleted file mode 100644
index b24e8243da7a..000000000000
--- a/net-wireless/crda/crda-1.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.0.ebuild,v 1.1 2009/05/13 13:23:37 chainsaw Exp $
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND="dev-libs/libgcrypt
- dev-libs/libnl
- net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
- dev-python/m2crypto"
-
-src_unpack() {
- unpack ${A}
-
- ##Make sure we install the rules where udev rules go...
- sed -i -e "/^UDEV_RULE_DIR/s:lib:$(get_libdir):" "${S}"/Makefile || die \
- "Makefile sed failed"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" || die "Compilation failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-wireless/crda/crda-1.1.1.ebuild b/net-wireless/crda/crda-1.1.1.ebuild
deleted file mode 100644
index 5f0f9fea05f3..000000000000
--- a/net-wireless/crda/crda-1.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.1.ebuild,v 1.1 2010/01/26 17:02:57 chainsaw Exp $
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND="dev-libs/libgcrypt
- dev-libs/libnl
- net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
- dev-python/m2crypto"
-
-src_unpack() {
- unpack ${A}
-
- ##Make sure we install the rules where udev rules go...
- sed -i -e "/^UDEV_RULE_DIR/s:lib:$(get_libdir):" "${S}"/Makefile || die \
- "Makefile sed failed"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" || die "Compilation failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-wireless/crda/crda-1.1.2.ebuild b/net-wireless/crda/crda-1.1.2.ebuild
index c6b9c6a36425..22d4d603668c 100644
--- a/net-wireless/crda/crda-1.1.2.ebuild
+++ b/net-wireless/crda/crda-1.1.2.ebuild
@@ -1,12 +1,14 @@
# Copyright 1999-2011 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.ebuild,v 1.3 2011/09/06 18:32:29 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.2.ebuild,v 1.4 2011/09/10 07:24:04 gurligebis Exp $
-inherit toolchain-funcs multilib
+EAPI="2"
+
+inherit toolchain-funcs multilib eutils
DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2"
+SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.bz2"
LICENSE="as-is"
SLOT="0"
@@ -20,6 +22,10 @@ DEPEND="${RDEPEND}
RDEPEND="${RDEPEND}
>=sys-fs/udev-152"
+src_prepare() {
+ epatch "${FILESDIR}/libnl31-support.diff"
+}
+
src_compile() {
emake CC="$(tc-getCC)" all_noverify || die "Compilation failed"
}
diff --git a/net-wireless/crda/files/libnl31-support.diff b/net-wireless/crda/files/libnl31-support.diff
new file mode 100644
index 000000000000..caa28997096f
--- /dev/null
+++ b/net-wireless/crda/files/libnl31-support.diff
@@ -0,0 +1,58 @@
+diff -aurp a/crda.c b/crda.c
+--- a/crda.c 2011-09-09 23:36:23.742094512 +0000
++++ b/crda.c 2011-09-09 23:36:02.109096391 +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/Makefile b/Makefile
+--- a/Makefile 2011-09-09 23:36:23.743094561 +0000
++++ b/Makefile 2011-09-09 23:36:02.109096391 +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
++NLLIBNAME = libnl-3.1
+ else
+- ifeq ($(NL2FOUND),Y)
+- CFLAGS += -DCONFIG_LIBNL20
++ ifeq ($(NL3FOUND),Y)
++ CFLAGS += -DCONFIG_LIBNL30
+ NLLIBS += -lnl-genl
+- NLLIBNAME = libnl-2.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
index 38462a3ac7d3..eab5dd556fc2 100644
--- a/net-wireless/crda/metadata.xml
+++ b/net-wireless/crda/metadata.xml
@@ -2,6 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
+ <email>gurligebis@gentoo.org</email>
+ <name>Bjarke Istrup Pedersen</name>
+ </maintainer>
+ <maintainer>
<email>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>