Date: Thursday, February 9, 2012 @ 12:56:54 Author: heftig Revision: 149713
archrelease: copy trunk to staging-i686, staging-x86_64 Added: crda/repos/staging-i686/ crda/repos/staging-i686/PKGBUILD (from rev 149712, crda/trunk/PKGBUILD) crda/repos/staging-i686/crda.install (from rev 149712, crda/trunk/crda.install) crda/repos/staging-i686/crda.rc (from rev 149712, crda/trunk/crda.rc) crda/repos/staging-i686/libnl32.patch (from rev 149712, crda/trunk/libnl32.patch) crda/repos/staging-x86_64/ crda/repos/staging-x86_64/PKGBUILD (from rev 149712, crda/trunk/PKGBUILD) crda/repos/staging-x86_64/crda.install (from rev 149712, crda/trunk/crda.install) crda/repos/staging-x86_64/crda.rc (from rev 149712, crda/trunk/crda.rc) crda/repos/staging-x86_64/libnl32.patch (from rev 149712, crda/trunk/libnl32.patch) ------------------------------+ staging-i686/PKGBUILD | 41 +++++++++++++++++++++++++++++++++++++++++ staging-i686/crda.install | 18 ++++++++++++++++++ staging-i686/crda.rc | 26 ++++++++++++++++++++++++++ staging-i686/libnl32.patch | 12 ++++++++++++ staging-x86_64/PKGBUILD | 41 +++++++++++++++++++++++++++++++++++++++++ staging-x86_64/crda.install | 18 ++++++++++++++++++ staging-x86_64/crda.rc | 26 ++++++++++++++++++++++++++ staging-x86_64/libnl32.patch | 12 ++++++++++++ 8 files changed, 194 insertions(+) Copied: crda/repos/staging-i686/PKGBUILD (from rev 149712, crda/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2012-02-09 17:56:54 UTC (rev 149713) @@ -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 +} Copied: crda/repos/staging-i686/crda.install (from rev 149712, crda/trunk/crda.install) =================================================================== --- staging-i686/crda.install (rev 0) +++ staging-i686/crda.install 2012-02-09 17:56:54 UTC (rev 149713) @@ -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 +} Copied: crda/repos/staging-i686/crda.rc (from rev 149712, crda/trunk/crda.rc) =================================================================== --- staging-i686/crda.rc (rev 0) +++ staging-i686/crda.rc 2012-02-09 17:56:54 UTC (rev 149713) @@ -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/staging-i686/libnl32.patch (from rev 149712, crda/trunk/libnl32.patch) =================================================================== --- staging-i686/libnl32.patch (rev 0) +++ staging-i686/libnl32.patch 2012-02-09 17:56:54 UTC (rev 149713) @@ -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) Copied: crda/repos/staging-x86_64/PKGBUILD (from rev 149712, crda/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2012-02-09 17:56:54 UTC (rev 149713) @@ -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 +} Copied: crda/repos/staging-x86_64/crda.install (from rev 149712, crda/trunk/crda.install) =================================================================== --- staging-x86_64/crda.install (rev 0) +++ staging-x86_64/crda.install 2012-02-09 17:56:54 UTC (rev 149713) @@ -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 +} Copied: crda/repos/staging-x86_64/crda.rc (from rev 149712, crda/trunk/crda.rc) =================================================================== --- staging-x86_64/crda.rc (rev 0) +++ staging-x86_64/crda.rc 2012-02-09 17:56:54 UTC (rev 149713) @@ -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/staging-x86_64/libnl32.patch (from rev 149712, crda/trunk/libnl32.patch) =================================================================== --- staging-x86_64/libnl32.patch (rev 0) +++ staging-x86_64/libnl32.patch 2012-02-09 17:56:54 UTC (rev 149713) @@ -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)