diff options
| -rw-r--r-- | abs/extra/crda/PKGBUILD | 36 | ||||
| -rw-r--r-- | abs/extra/crda/crda.conf.d | 4 | ||||
| -rw-r--r-- | abs/extra/crda/libnl32.patch | 12 |
3 files changed, 32 insertions, 20 deletions
diff --git a/abs/extra/crda/PKGBUILD b/abs/extra/crda/PKGBUILD index 4fbb201..88ad6cc 100644 --- a/abs/extra/crda/PKGBUILD +++ b/abs/extra/crda/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79865 2010-05-08 15:22:52Z thomas $ +# $Id: PKGBUILD 158615 2012-05-05 03:17:06Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=crda -pkgver=1.1.1 -pkgrel=1 -pkgdesc="Central Regulatory Domain Agent" +pkgver=1.1.2 +pkgrel=3 +pkgdesc="Central Regulatory Domain Agent for wireless networks" arch=(i686 x86_64) url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" license=('custom') @@ -12,22 +12,26 @@ depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw') makedepends=('python-m2crypto') install=crda.install source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 - crda.rc) -md5sums=('5fc77af68b3e21736b8ef2f8b061c810' - '014eef3f8655e9a130064ec6891317fc') + crda.rc libnl32.patch) +md5sums=('5226f65aebacf94baaf820f8b4e06df4' + '014eef3f8655e9a130064ec6891317fc' + 'c1f7aff29f15a0364ae6f7905a1d4ae6') build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -Np1 -i "$srcdir/libnl32.patch" + sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py + make crda regdbdump +} + +package() { # Install crda, regdbdump and udev rules - msg "Compiling and installing crda ..." - cd ${srcdir}/${pkgname}-${pkgver} - make crda regdbdump || return 1 - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ install # This rule automatically sets the regulatory domain when cfg80211 is loaded - echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> ${pkgdir}/lib/udev/rules.d/85-regulatory.rules || return 1 + echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules - msg "Installing license ..." - install -D -m644 ${srcdir}/${pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/crda/LICENSE || return 1 + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE - msg "Installing boot script ..." - install -D -m755 ${srcdir}/crda.rc ${pkgdir}/etc/rc.d/wireless-regdom || return 1 + install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom } diff --git a/abs/extra/crda/crda.conf.d b/abs/extra/crda/crda.conf.d deleted file mode 100644 index 8511238..0000000 --- a/abs/extra/crda/crda.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Wireless regulatory domain configuration -# - diff --git a/abs/extra/crda/libnl32.patch b/abs/extra/crda/libnl32.patch new file mode 100644 index 0000000..682b6c5 --- /dev/null +++ b/abs/extra/crda/libnl32.patch @@ -0,0 +1,12 @@ +diff -u -r crda-1.1.2/Makefile crda-1.1.2-libnl32/Makefile +--- crda-1.1.2/Makefile 2011-08-10 01:36:19.000000000 +0200 ++++ crda-1.1.2-libnl32/Makefile 2012-02-09 18:53:33.376430180 +0100 +@@ -51,7 +51,7 @@ + + ifeq ($(NL3FOUND),Y) + CFLAGS += -DCONFIG_LIBNL30 +-NLLIBS += -lnl-genl ++NLLIBS += $(shell pkg-config --libs libnl-genl-3.0) + NLLIBNAME = libnl-3.0 + else + ifeq ($(NL2FOUND),Y) |