Date: Thursday, February 23, 2012 @ 08:53:54 Author: allan Revision: 150888
db-move: moved crda from [testing] to [core] (x86_64) Added: crda/repos/core-x86_64/PKGBUILD (from rev 150886, crda/repos/testing-x86_64/PKGBUILD) crda/repos/core-x86_64/crda.install (from rev 150886, crda/repos/testing-x86_64/crda.install) crda/repos/core-x86_64/crda.rc (from rev 150886, crda/repos/testing-x86_64/crda.rc) crda/repos/core-x86_64/libnl32.patch (from rev 150886, crda/repos/testing-x86_64/libnl32.patch) Deleted: crda/repos/core-x86_64/PKGBUILD crda/repos/core-x86_64/crda.install crda/repos/core-x86_64/crda.rc crda/repos/testing-x86_64/ ---------------+ PKGBUILD | 80 ++++++++++++++++++++++++++++---------------------------- crda.install | 36 ++++++++++++------------- crda.rc | 52 ++++++++++++++++++------------------ libnl32.patch | 12 ++++++++ 4 files changed, 97 insertions(+), 83 deletions(-) Deleted: core-x86_64/PKGBUILD =================================================================== --- core-x86_64/PKGBUILD 2012-02-23 13:53:53 UTC (rev 150887) +++ core-x86_64/PKGBUILD 2012-02-23 13:53:54 UTC (rev 150888) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Thomas Bächler <tho...@archlinux.org> - -pkgname=crda -pkgver=1.1.2 -pkgrel=1 -pkgdesc="Central Regulatory Domain Agent for wireless networks" -arch=(i686 x86_64) -url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" -license=('custom') -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=('5226f65aebacf94baaf820f8b4e06df4' - '014eef3f8655e9a130064ec6891317fc') - -build() { - msg "Compiling crda ..." - cd "${srcdir}"/${pkgname}-${pkgver} - sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py - make crda regdbdump -} - -package() { - # Install crda, regdbdump and udev rules - msg "Installing crda ..." - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" 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 - - msg "Installing license ..." - 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 -} Copied: crda/repos/core-x86_64/PKGBUILD (from rev 150886, crda/repos/testing-x86_64/PKGBUILD) =================================================================== --- core-x86_64/PKGBUILD (rev 0) +++ core-x86_64/PKGBUILD 2012-02-23 13:53:54 UTC (rev 150888) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Thomas Bächler <tho...@archlinux.org> + +pkgname=crda +pkgver=1.1.2 +pkgrel=2 +pkgdesc="Central Regulatory Domain Agent for wireless networks" +arch=(i686 x86_64) +url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" +license=('custom') +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 libnl32.patch) +md5sums=('5226f65aebacf94baaf820f8b4e06df4' + '014eef3f8655e9a130064ec6891317fc' + 'c1f7aff29f15a0364ae6f7905a1d4ae6') + +build() { + msg "Compiling crda ..." + 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 "Installing crda ..." + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" 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 + + msg "Installing license ..." + 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 +} Deleted: core-x86_64/crda.install =================================================================== --- core-x86_64/crda.install 2012-02-23 13:53:53 UTC (rev 150887) +++ core-x86_64/crda.install 2012-02-23 13:53:54 UTC (rev 150888) @@ -1,18 +0,0 @@ -## arg 1: the new package version -post_install() { - echo "Uncomment the right regulatory domain in /etc/conf.d/wireless-regdom." - echo "It will automatically be set when necessary." -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package - # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one - # from wireless-regdb by the user-defined one - if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then - if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then - mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom - fi - fi -} Copied: crda/repos/core-x86_64/crda.install (from rev 150886, crda/repos/testing-x86_64/crda.install) =================================================================== --- core-x86_64/crda.install (rev 0) +++ core-x86_64/crda.install 2012-02-23 13:53:54 UTC (rev 150888) @@ -0,0 +1,18 @@ +## arg 1: the new package version +post_install() { + echo "Uncomment the right regulatory domain in /etc/conf.d/wireless-regdom." + echo "It will automatically be set when necessary." +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package + # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one + # from wireless-regdb by the user-defined one + if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then + if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then + mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom + fi + fi +} Deleted: core-x86_64/crda.rc =================================================================== --- core-x86_64/crda.rc 2012-02-23 13:53:53 UTC (rev 150887) +++ core-x86_64/crda.rc 2012-02-23 13:53:54 UTC (rev 150888) @@ -1,26 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/wireless-regdom - -case "$1" in - start) - if [ -n "${WIRELESS_REGDOM}" ]; then - stat_busy "Setting wireless regulatory domain: ${WIRELESS_REGDOM}" - if iw reg set ${WIRELESS_REGDOM}; then - stat_done - else - stat_fail - fi - fi - ;; - stop) - ;; - restart) - $0 start - ;; - *) - echo "usage: $0 start" -esac -exit 0 Copied: crda/repos/core-x86_64/crda.rc (from rev 150886, crda/repos/testing-x86_64/crda.rc) =================================================================== --- core-x86_64/crda.rc (rev 0) +++ core-x86_64/crda.rc 2012-02-23 13:53:54 UTC (rev 150888) @@ -0,0 +1,26 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/wireless-regdom + +case "$1" in + start) + if [ -n "${WIRELESS_REGDOM}" ]; then + stat_busy "Setting wireless regulatory domain: ${WIRELESS_REGDOM}" + if iw reg set ${WIRELESS_REGDOM}; then + stat_done + else + stat_fail + fi + fi + ;; + stop) + ;; + restart) + $0 start + ;; + *) + echo "usage: $0 start" +esac +exit 0 Copied: crda/repos/core-x86_64/libnl32.patch (from rev 150886, crda/repos/testing-x86_64/libnl32.patch) =================================================================== --- core-x86_64/libnl32.patch (rev 0) +++ core-x86_64/libnl32.patch 2012-02-23 13:53:54 UTC (rev 150888) @@ -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)