From patchwork Thu Mar 4 19:00:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 83672 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o24J1JBD013079 for ; Thu, 4 Mar 2010 19:01:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756179Ab0CDTBE (ORCPT ); Thu, 4 Mar 2010 14:01:04 -0500 Received: from bombadil.infradead.org ([18.85.46.34]:57538 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756146Ab0CDTBB (ORCPT ); Thu, 4 Mar 2010 14:01:01 -0500 Received: from mcgrof by bombadil.infradead.org with local (Exim 4.69 #1 (Red Hat Linux)) id 1NnGI7-00057n-SN; Thu, 04 Mar 2010 19:00:59 +0000 Date: Thu, 4 Mar 2010 14:00:59 -0500 From: "Luis R. Rodriguez" To: Kel Modderman Cc: linux-wireless@vger.kernel.org, lrodriguez@atheros.com Subject: Re: [PATCH] crda: allow build with gcrypt support Message-ID: <20100304190059.GK8069@bombadil.infradead.org> References: <201003050011.44807.kel@otaku42.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201003050011.44807.kel@otaku42.de> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 04 Mar 2010 19:01:19 +0000 (UTC) diff --git a/Makefile b/Makefile index b8bc7d3..0ab1e2b 100644 --- a/Makefile +++ b/Makefile @@ -29,18 +29,18 @@ all: all_noverify verify all_noverify: crda intersect regdbdump -ifeq ($(USE_OPENSSL),1) -CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` -LDLIBS += `pkg-config --libs openssl` - -reglib.o: keys-ssl.c - -else +ifeq ($(USE_GCRYPT),1) CFLAGS += -DUSE_GCRYPT LDLIBS += -lgcrypt reglib.o: keys-gcrypt.c +else +CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` +LDLIBS += `pkg-config --libs openssl` + +reglib.o: keys-ssl.c + endif MKDIR ?= mkdir -p INSTALL ?= install diff --git a/crda.spec b/crda.spec index f44a3e5..9876d90 100644 --- a/crda.spec +++ b/crda.spec @@ -1,6 +1,6 @@ Summary: Linux central regulatory domain agent Name: crda -Version: 1.0.1 +Version: 1.1.1 Release: 1 License: ISC Group: System Enviroment/Base @@ -8,8 +8,8 @@ Source: http://wireless.kernel.org/download/crda/crda-%version.tar.bz2 URL: http://wireless.kernel.org/en/developers/Regulatory/ Packager: Luis R. Rodriguez BuildRoot : /var/tmp/%{name}-buildroot -Requires: libnl, libgcrypt -BuildRequires: libnl-devel, gcc, wireless-regdb, libgcrypt-devel, m2crypto +Requires: libnl, openssl +BuildRequires: libnl-devel, gcc, wireless-regdb, openssl-devel, m2crypto %description This package provides CRDA to be used by the new Linux kernel diff --git a/debian-example/changelog b/debian-example/changelog index b083b42..4d273d2 100644 --- a/debian-example/changelog +++ b/debian-example/changelog @@ -1,3 +1,10 @@ +crda (1.1.1-1) unstable; urgency=low + + * New package slightly based on Kel Modderman 's work + * Use openssl instead of gcrypt to enable dynamic reading of keys + + -- Luis R. Rodriguez Sat, 24 Jan 2009 16:00:00 +0100 + crda (1.0.1-1) unstable; urgency=low * Compiles nicely on # CPUs > 1 diff --git a/debian-example/control b/debian-example/control index eba7c0c..7e3334f 100644 --- a/debian-example/control +++ b/debian-example/control @@ -1,17 +1,30 @@ Source: crda Section: admin Priority: optional -Maintainer: Luis R. Rodriguez -Build-Depends: cdbs, debhelper (>= 5), gcc, wireless-regdb, libgcrypt11-dev, python-m2crypto, libnl1 -Standards-Version: 3.7.3 +Maintainer: Debian/Ubuntu wpasupplicant Maintainers +Uploaders: Luis R. Rodriguez +Build-Depends: cdbs, debhelper (>= 7.0.50), + gcc, + wireless-regdb, + libssl-dev, + python-m2crypto, + libnl1, + libnl-dev +Standards-Version: 3.8.1 Package: crda -Architecture: all -Depends: udev, libgcrypt11, libnl1 -Suggests: iw +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, wireless-regdb +Recommends: iw (>= 0.9.18-1) Description: Linux wireless central regulatory domain agent - This package provides CRDA to be used by the new Linux kernel wireless - subsystem to query from userspace regulatory domains. For more information + This package provides CRDA to be used by the new Linux kernel + cfg80211 wireless subsystem to query from userspace regulatory + domain settings wireless devices may operate within for a given location. + . + CRDA queries operational frequency regulations stored within the regulatory + database provided by the wireless-regdb package. + . + For more information see: . http://wireless.kernel.org/en/developers/Regulatory/ diff --git a/debian-example/copyright b/debian-example/copyright index 85d6068..3325045 100644 --- a/debian-example/copyright +++ b/debian-example/copyright @@ -1,21 +1,37 @@ -This package was debianized by Luis Rodriguez on -Thu, 22 Jan 2009 16:00:00 +0100. +Upstream-Name: crda +Upstream-Maintainer: Luis R. Rodriguez +Upstream-Source: git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git -The crda packages was downloaded from +Files: * +Copyright: Copyright (c) 2008, Luis R. Rodriguez +Copyright: Copyright (c) 2008, Johannes Berg +Copyright: Copyright (c) 2008, Michael Green +License: ISC -Copyright (c) 2008, Luis R. Rodriguez -Copyright (c) 2008, Johannes Berg -Copyright (c) 2008, Michael Green +Files: nl80211.h +Copyright: Copyright 2006, 2007, 2008 Johannes Berg +Copyright: Copyright 2008 Michael Wu +Copyright: Copyright 2008 Luis Carlos Cobo +Copyright: Copyright 2008 Michael Buesch +Copyright: Copyright 2008 Luis R. Rodriguez +Copyright: Copyright 2008 Jouni Malinen +Copyright: Copyright 2008 Colin McCabe +License: ISC -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. +Files: debian/* +Copyright: Copyright (c) 2009, Kel Modderman +Copyright: Copyright (c) 2010, Luis R. Rodriguez +License: ISC -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +License: ISC + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.