[arch-commits] Commit in crda/repos (8 files)
Date: Wednesday, November 13, 2019 @ 15:51:09 Author: foutrelis Revision: 368111 archrelease: copy trunk to staging-x86_64 Added: crda/repos/staging-x86_64/ crda/repos/staging-x86_64/0001-Makefile-Don-t-run-ldconfig.patch (from rev 368110, crda/trunk/0001-Makefile-Don-t-run-ldconfig.patch) crda/repos/staging-x86_64/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch (from rev 368110, crda/trunk/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch) crda/repos/staging-x86_64/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch (from rev 368110, crda/trunk/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch) crda/repos/staging-x86_64/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch (from rev 368110, crda/trunk/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch) crda/repos/staging-x86_64/PKGBUILD (from rev 368110, crda/trunk/PKGBUILD) crda/repos/staging-x86_64/crda.install (from rev 368110, crda/trunk/crda.install) crda/repos/staging-x86_64/set-wireless-regdom (from rev 368110, crda/trunk/set-wireless-regdom) -+ 0001-Makefile-Don-t-run-ldconfig.patch | 24 0001-Makefile-Link-libreg.so-against-the-crypto-library.patch | 55 ++ 0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch | 52 + 0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch | 37 ++ PKGBUILD| 46 crda.install|5 set-wireless-regdom |5 7 files changed, 224 insertions(+) Copied: crda/repos/staging-x86_64/0001-Makefile-Don-t-run-ldconfig.patch (from rev 368110, crda/trunk/0001-Makefile-Don-t-run-ldconfig.patch) === --- staging-x86_64/0001-Makefile-Don-t-run-ldconfig.patch (rev 0) +++ staging-x86_64/0001-Makefile-Don-t-run-ldconfig.patch 2019-11-13 15:51:09 UTC (rev 368111) @@ -0,0 +1,24 @@ +From 15bc8065e9dc5485c650c528f8d80f7536e378d6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= +Date: Fri, 21 Feb 2014 20:30:24 +0100 +Subject: [PATCH] Makefile: Don't run ldconfig + +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 80f4946..c003195 100644 +--- a/Makefile b/Makefile +@@ -130,7 +130,6 @@ install-libreg: + $(NQ) ' INSTALL libreg' + $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) + $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ +- $(Q)ldconfig + + %.o: %.c regdb.h $(LIBREG) + $(NQ) ' CC ' $@ +-- +1.9.0 + Copied: crda/repos/staging-x86_64/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch (from rev 368110, crda/trunk/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch) === --- staging-x86_64/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch (rev 0) +++ staging-x86_64/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch 2019-11-13 15:51:09 UTC (rev 368111) @@ -0,0 +1,55 @@ +From e2e519730c33de4503ac5dda28863d029e3cf578 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= +Date: Fri, 21 Feb 2014 20:15:32 +0100 +Subject: [PATCH] Makefile: Link libreg.so against the crypto library. + +--- + Makefile | 9 ++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 1f25509..80f4946 100644 +--- a/Makefile b/Makefile +@@ -33,6 +33,7 @@ LDLIBS += $(LDLIBREG) + LDLIBS += -lm + LIBREG += libreg.so + LDFLAGS += -L ./ ++LIBREG_LDFLAGS += -lm + + all: all_noverify verify + +@@ -40,17 +41,19 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize + + ifeq ($(USE_OPENSSL),1) + CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` +-LDLIBS += `pkg-config --libs openssl` ++LDCRYPTOLIB := `pkg-config --libs openssl` + + $(LIBREG): keys-ssl.c + + else + CFLAGS += -DUSE_GCRYPT +-LDLIBS += -lgcrypt ++LDCRYPTOLIB := -lgcrypt + + $(LIBREG): keys-gcrypt.c + + endif ++LDLIBS += $(LDCRYPTOLIB) ++LIBREG_LDFLAGS += $(LDCRYPTOLIB) + MKDIR ?= mkdir -p + INSTALL ?= install + +@@ -116,7 +119,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) + + $(LIBREG): regdb.h reglib.h reglib.c + $(NQ) ' CC ' $@ +- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ ++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREG_LDFLAGS) + + install-libreg-headers: + $(NQ) ' INSTALL libreg-headers' +-- +1.9.0 + Copied: crda/repos/staging-x86_64/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch (from rev 3
[arch-commits] Commit in crda/repos (8 files)
Date: Saturday, January 5, 2019 @ 15:55:36 Author: dreisner Revision: 343013 archrelease: copy trunk to testing-x86_64 Added: crda/repos/testing-x86_64/ crda/repos/testing-x86_64/0001-Makefile-Don-t-run-ldconfig.patch (from rev 343012, crda/trunk/0001-Makefile-Don-t-run-ldconfig.patch) crda/repos/testing-x86_64/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch (from rev 343012, crda/trunk/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch) crda/repos/testing-x86_64/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch (from rev 343012, crda/trunk/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch) crda/repos/testing-x86_64/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch (from rev 343012, crda/trunk/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch) crda/repos/testing-x86_64/PKGBUILD (from rev 343012, crda/trunk/PKGBUILD) crda/repos/testing-x86_64/crda.install (from rev 343012, crda/trunk/crda.install) crda/repos/testing-x86_64/set-wireless-regdom (from rev 343012, crda/trunk/set-wireless-regdom) -+ 0001-Makefile-Don-t-run-ldconfig.patch | 24 0001-Makefile-Link-libreg.so-against-the-crypto-library.patch | 55 ++ 0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch | 52 + 0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch | 37 ++ PKGBUILD| 46 crda.install|5 set-wireless-regdom |5 7 files changed, 224 insertions(+) Copied: crda/repos/testing-x86_64/0001-Makefile-Don-t-run-ldconfig.patch (from rev 343012, crda/trunk/0001-Makefile-Don-t-run-ldconfig.patch) === --- testing-x86_64/0001-Makefile-Don-t-run-ldconfig.patch (rev 0) +++ testing-x86_64/0001-Makefile-Don-t-run-ldconfig.patch 2019-01-05 15:55:36 UTC (rev 343013) @@ -0,0 +1,24 @@ +From 15bc8065e9dc5485c650c528f8d80f7536e378d6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= +Date: Fri, 21 Feb 2014 20:30:24 +0100 +Subject: [PATCH] Makefile: Don't run ldconfig + +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 80f4946..c003195 100644 +--- a/Makefile b/Makefile +@@ -130,7 +130,6 @@ install-libreg: + $(NQ) ' INSTALL libreg' + $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) + $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ +- $(Q)ldconfig + + %.o: %.c regdb.h $(LIBREG) + $(NQ) ' CC ' $@ +-- +1.9.0 + Copied: crda/repos/testing-x86_64/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch (from rev 343012, crda/trunk/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch) === --- testing-x86_64/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch (rev 0) +++ testing-x86_64/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch 2019-01-05 15:55:36 UTC (rev 343013) @@ -0,0 +1,55 @@ +From e2e519730c33de4503ac5dda28863d029e3cf578 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= +Date: Fri, 21 Feb 2014 20:15:32 +0100 +Subject: [PATCH] Makefile: Link libreg.so against the crypto library. + +--- + Makefile | 9 ++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 1f25509..80f4946 100644 +--- a/Makefile b/Makefile +@@ -33,6 +33,7 @@ LDLIBS += $(LDLIBREG) + LDLIBS += -lm + LIBREG += libreg.so + LDFLAGS += -L ./ ++LIBREG_LDFLAGS += -lm + + all: all_noverify verify + +@@ -40,17 +41,19 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize + + ifeq ($(USE_OPENSSL),1) + CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` +-LDLIBS += `pkg-config --libs openssl` ++LDCRYPTOLIB := `pkg-config --libs openssl` + + $(LIBREG): keys-ssl.c + + else + CFLAGS += -DUSE_GCRYPT +-LDLIBS += -lgcrypt ++LDCRYPTOLIB := -lgcrypt + + $(LIBREG): keys-gcrypt.c + + endif ++LDLIBS += $(LDCRYPTOLIB) ++LIBREG_LDFLAGS += $(LDCRYPTOLIB) + MKDIR ?= mkdir -p + INSTALL ?= install + +@@ -116,7 +119,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) + + $(LIBREG): regdb.h reglib.h reglib.c + $(NQ) ' CC ' $@ +- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ ++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREG_LDFLAGS) + + install-libreg-headers: + $(NQ) ' INSTALL libreg-headers' +-- +1.9.0 + Copied: crda/repos/testing-x86_64/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch (from rev 34301
[arch-commits] Commit in crda/repos (8 files)
Date: Sunday, April 8, 2018 @ 18:13:34 Author: jelle Revision: 321319 archrelease: copy trunk to testing-x86_64 Added: crda/repos/testing-x86_64/ crda/repos/testing-x86_64/0001-Makefile-Don-t-run-ldconfig.patch (from rev 321318, crda/trunk/0001-Makefile-Don-t-run-ldconfig.patch) crda/repos/testing-x86_64/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch (from rev 321318, crda/trunk/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch) crda/repos/testing-x86_64/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch (from rev 321318, crda/trunk/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch) crda/repos/testing-x86_64/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch (from rev 321318, crda/trunk/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch) crda/repos/testing-x86_64/PKGBUILD (from rev 321318, crda/trunk/PKGBUILD) crda/repos/testing-x86_64/crda.install (from rev 321318, crda/trunk/crda.install) crda/repos/testing-x86_64/set-wireless-regdom (from rev 321318, crda/trunk/set-wireless-regdom) -+ 0001-Makefile-Don-t-run-ldconfig.patch | 24 0001-Makefile-Link-libreg.so-against-the-crypto-library.patch | 55 ++ 0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch | 52 + 0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch | 37 ++ PKGBUILD| 47 crda.install|5 set-wireless-regdom |5 7 files changed, 225 insertions(+) Copied: crda/repos/testing-x86_64/0001-Makefile-Don-t-run-ldconfig.patch (from rev 321318, crda/trunk/0001-Makefile-Don-t-run-ldconfig.patch) === --- testing-x86_64/0001-Makefile-Don-t-run-ldconfig.patch (rev 0) +++ testing-x86_64/0001-Makefile-Don-t-run-ldconfig.patch 2018-04-08 18:13:34 UTC (rev 321319) @@ -0,0 +1,24 @@ +From 15bc8065e9dc5485c650c528f8d80f7536e378d6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= +Date: Fri, 21 Feb 2014 20:30:24 +0100 +Subject: [PATCH] Makefile: Don't run ldconfig + +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 80f4946..c003195 100644 +--- a/Makefile b/Makefile +@@ -130,7 +130,6 @@ install-libreg: + $(NQ) ' INSTALL libreg' + $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) + $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ +- $(Q)ldconfig + + %.o: %.c regdb.h $(LIBREG) + $(NQ) ' CC ' $@ +-- +1.9.0 + Copied: crda/repos/testing-x86_64/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch (from rev 321318, crda/trunk/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch) === --- testing-x86_64/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch (rev 0) +++ testing-x86_64/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch 2018-04-08 18:13:34 UTC (rev 321319) @@ -0,0 +1,55 @@ +From e2e519730c33de4503ac5dda28863d029e3cf578 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= +Date: Fri, 21 Feb 2014 20:15:32 +0100 +Subject: [PATCH] Makefile: Link libreg.so against the crypto library. + +--- + Makefile | 9 ++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 1f25509..80f4946 100644 +--- a/Makefile b/Makefile +@@ -33,6 +33,7 @@ LDLIBS += $(LDLIBREG) + LDLIBS += -lm + LIBREG += libreg.so + LDFLAGS += -L ./ ++LIBREG_LDFLAGS += -lm + + all: all_noverify verify + +@@ -40,17 +41,19 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize + + ifeq ($(USE_OPENSSL),1) + CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` +-LDLIBS += `pkg-config --libs openssl` ++LDCRYPTOLIB := `pkg-config --libs openssl` + + $(LIBREG): keys-ssl.c + + else + CFLAGS += -DUSE_GCRYPT +-LDLIBS += -lgcrypt ++LDCRYPTOLIB := -lgcrypt + + $(LIBREG): keys-gcrypt.c + + endif ++LDLIBS += $(LDCRYPTOLIB) ++LIBREG_LDFLAGS += $(LDCRYPTOLIB) + MKDIR ?= mkdir -p + INSTALL ?= install + +@@ -116,7 +119,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) + + $(LIBREG): regdb.h reglib.h reglib.c + $(NQ) ' CC ' $@ +- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ ++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREG_LDFLAGS) + + install-libreg-headers: + $(NQ) ' INSTALL libreg-headers' +-- +1.9.0 + Copied: crda/repos/testing-x86_64/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch (from rev 321318, crd
[arch-commits] Commit in crda/repos (8 files)
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/PKGBUILD2012-02-23 13:53:53 UTC (rev 150887) +++ core-x86_64/PKGBUILD2012-02-23 13:53:54 UTC (rev 150888) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Thomas Bächler - -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/PKGBUILD2012-02-23 13:53:54 UTC (rev 150888) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Thomas Bächler + +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.install2012-02-23 13:53:53 UTC (rev 150887) +++ core-x86_64/crda.install2012-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 pa
[arch-commits] Commit in crda/repos (8 files)
Date: Thursday, February 23, 2012 @ 08:53:53 Author: allan Revision: 150887 db-move: moved crda from [testing] to [core] (i686) Added: crda/repos/core-i686/PKGBUILD (from rev 150886, crda/repos/testing-i686/PKGBUILD) crda/repos/core-i686/crda.install (from rev 150886, crda/repos/testing-i686/crda.install) crda/repos/core-i686/crda.rc (from rev 150886, crda/repos/testing-i686/crda.rc) crda/repos/core-i686/libnl32.patch (from rev 150886, crda/repos/testing-i686/libnl32.patch) Deleted: crda/repos/core-i686/PKGBUILD crda/repos/core-i686/crda.install crda/repos/core-i686/crda.rc crda/repos/testing-i686/ ---+ PKGBUILD | 80 crda.install | 36 - crda.rc | 52 ++-- libnl32.patch | 12 4 files changed, 97 insertions(+), 83 deletions(-) Deleted: core-i686/PKGBUILD === --- core-i686/PKGBUILD 2012-02-23 13:48:15 UTC (rev 150886) +++ core-i686/PKGBUILD 2012-02-23 13:53:53 UTC (rev 150887) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Thomas Bächler - -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-i686/PKGBUILD (from rev 150886, crda/repos/testing-i686/PKGBUILD) === --- core-i686/PKGBUILD (rev 0) +++ core-i686/PKGBUILD 2012-02-23 13:53:53 UTC (rev 150887) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Thomas Bächler + +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-i686/crda.install === --- core-i686/crda.install 2012-02-23 13:48:15 UTC (rev 150886) +++ core-i686/crda.install 2012-02-23 13:53:53 UTC (rev 150887) @@ -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
[arch-commits] Commit in crda/repos (8 files)
Date: Sunday, October 30, 2011 @ 19:13:54 Author: thomas Revision: 141491 archrelease: copy trunk to testing-i686, testing-x86_64 Added: crda/repos/testing-i686/ crda/repos/testing-i686/PKGBUILD (from rev 141490, crda/trunk/PKGBUILD) crda/repos/testing-i686/crda.install (from rev 141490, crda/trunk/crda.install) crda/repos/testing-i686/crda.rc (from rev 141490, crda/trunk/crda.rc) crda/repos/testing-x86_64/ crda/repos/testing-x86_64/PKGBUILD (from rev 141490, crda/trunk/PKGBUILD) crda/repos/testing-x86_64/crda.install (from rev 141490, crda/trunk/crda.install) crda/repos/testing-x86_64/crda.rc (from rev 141490, crda/trunk/crda.rc) -+ testing-i686/PKGBUILD | 39 +++ testing-i686/crda.install | 18 ++ testing-i686/crda.rc| 26 ++ testing-x86_64/PKGBUILD | 39 +++ testing-x86_64/crda.install | 18 ++ testing-x86_64/crda.rc | 26 ++ 6 files changed, 166 insertions(+) Copied: crda/repos/testing-i686/PKGBUILD (from rev 141490, crda/trunk/PKGBUILD) === --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2011-10-30 23:13:54 UTC (rev 141491) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Thomas Bächler + +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/testing-i686/crda.install (from rev 141490, crda/trunk/crda.install) === --- testing-i686/crda.install (rev 0) +++ testing-i686/crda.install 2011-10-30 23:13:54 UTC (rev 141491) @@ -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/testing-i686/crda.rc (from rev 141490, crda/trunk/crda.rc) === --- testing-i686/crda.rc(rev 0) +++ testing-i686/crda.rc2011-10-30 23:13:54 UTC (rev 141491) @@ -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/testing-x86_64/PKGBUILD (from rev 141490, crda/trunk/PKGBUILD) === --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD