[gentoo-commits] repo/gentoo:master commit in: net-wireless/crda/, net-wireless/crda/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Bjarke Istrup Pedersen" <gurligebis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/crda/, net-wireless/crda/files/
Date: Sat, 14 Nov 2015 13:12:19 +0000 (UTC)	[thread overview]
Message-ID: <1447506730.a00a55bf6f2cd45565484802af1ab4cd12830f2f.gurligebis@gentoo> (raw)

commit:     a00a55bf6f2cd45565484802af1ab4cd12830f2f
Author:     Bjarke Istrup Pedersen <gurligebis <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 13:09:34 2015 +0000
Commit:     Bjarke Istrup Pedersen <gurligebis <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 13:12:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a00a55bf

net-wireless/crda: Removing old versions

Package-Manager: portage-2.2.24

 net-wireless/crda/Manifest                   |  1 -
 net-wireless/crda/crda-1.1.2-r3.ebuild       | 48 ----------------------
 net-wireless/crda/crda-1.1.2-r4.ebuild       | 58 ---------------------------
 net-wireless/crda/crda-1.1.3.ebuild          | 56 --------------------------
 net-wireless/crda/files/libnl31-support.diff | 60 ----------------------------
 5 files changed, 223 deletions(-)

diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 30890a7..88cc0c2 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -1,3 +1,2 @@
-DIST crda-1.1.2.tar.bz2 21754 SHA256 e469348a5d0bb933df31995869130f68901de9be02e666437f52125698851864 SHA512 cd0997fdafc63640cbac5cff57b617177c3693a6d05e2138f23ed8273502d5f485f8f60309ed4fec97fe2cd2d51ee4b7e2d9535efc1de44c08b9cc9d6fb7ecf3 WHIRLPOOL 35ef76fcb7f3760613135caba5b9c6b0c781bc560f948a60f6b09eaeb75f3538461d90ce353decc17795995795b63c124a282903d41a8e25680fda0b6498bea4
 DIST crda-1.1.3.tar.bz2 38697 SHA256 aa8a7fe92f0765986c421a5b6768a185375ac210393df0605ee132f6754825f0 SHA512 4ec37d3d51f5988af79c2eaadc1bce344f20d4d9833533838d308533ee02cb12d5ed193391679ae1231c8afe61b21defdb368614a6238f99fdc5824f6819cfed WHIRLPOOL bbcb31277b664243f9e494c494152cf0ebcb187360ba48aa07c8e96c83dd91098bc49f1edf0b196a9bf4071565ac389b2907fcc73e348780aa890e066895c282
 DIST crda-3.18.tar.xz 61516 SHA256 43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588 WHIRLPOOL f2ee46b8e25509b6f78e508e62de3f1d0d85303b173b38d653f69f4f6e8f77ada2bc3330cd62646a1ce3819b0db834d9aecc9751cf3e7d35e2a67d3ffdfb1503

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 6c1aaf8..0000000
--- a/net-wireless/crda/crda-1.1.2-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils toolchain-funcs python
-
-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="amd64 arm ~mips ppc ppc64 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
-
-	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/crda-1.1.2-r4.ebuild b/net-wireless/crda/crda-1.1.2-r4.ebuild
deleted file mode 100644
index eb63f6d..0000000
--- a/net-wireless/crda/crda-1.1.2-r4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils toolchain-funcs python
-
-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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0
-	dev-libs/libnl:3
-	net-wireless/wireless-regdb
-	>=virtual/udev-171"
-DEPEND="${RDEPEND}
-	dev-python/m2crypto
-	=dev-lang/python-2*
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/libnl31-support.diff
-
-	python_convert_shebangs 2 utils/key2pub.py
-
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		UDEV_RULE_DIR="$($(tc-getPKG_CONFIG) --variable=udevdir udev)/rules.d" \
-		REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin \
-		USE_OPENSSL=1 \
-		CC="$(tc-getCC)" \
-		all_noverify V=1
-}
-
-src_test() {
-	emake USE_OPENSSL=1 CC="$(tc-getCC)" verify
-}
-
-src_install() {
-	emake \
-		UDEV_RULE_DIR="$($(tc-getPKG_CONFIG) --variable=udevdir 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/crda-1.1.3.ebuild b/net-wireless/crda/crda-1.1.3.ebuild
deleted file mode 100644
index ce468ed..0000000
--- a/net-wireless/crda/crda-1.1.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils toolchain-funcs python 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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0
-	dev-libs/libnl:3
-	net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
-	dev-python/m2crypto
-	=dev-lang/python-2*
-	virtual/pkgconfig"
-
-src_prepare() {
-	python_convert_shebangs 2 utils/key2pub.py
-
-	epatch "${FILESDIR}"/${P}-missing-include.patch
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		UDEV_RULE_DIR="$(get_udevdir)/rules.d" \
-		REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin \
-		USE_OPENSSL=1 \
-		CC="$(tc-getCC)" \
-		all_noverify V=1
-}
-
-src_test() {
-	emake USE_OPENSSL=1 CC="$(tc-getCC)" verify
-}
-
-src_install() {
-	emake \
-		UDEV_RULE_DIR="$(get_udevdir)/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/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

next             reply	other threads:[~2015-11-14 13:12 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-14 13:12 Bjarke Istrup Pedersen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-10-24 21:09 [gentoo-commits] repo/gentoo:master commit in: net-wireless/crda/, net-wireless/crda/files/ Lars Wendler
2019-02-16 18:28 Aaron Bauman
2019-06-05 21:19 Andreas Sturmlechner
2020-01-15 14:44 Craig Andrews
2020-09-19 12:29 Michał Górny

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:30890a7 dfblob:88cc0c2 dfblob:6c1aaf8 dfblob:eb63f6d
dfblob:ce468ed dfblob:56243ee )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: net-wireless/crda/, net-wireless/crda/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1447506730.a00a55bf6f2cd45565484802af1ab4cd12830f2f.gurligebis@gentoo \
    --to=gurligebis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox