Date: Saturday, February 7, 2015 @ 11:51:09 Author: tpowa Revision: 231105
archrelease: copy trunk to testing-any Added: wireless-regdb/repos/testing-any/PKGBUILD (from rev 231104, wireless-regdb/trunk/PKGBUILD) wireless-regdb/repos/testing-any/crda.conf.d (from rev 231104, wireless-regdb/trunk/crda.conf.d) wireless-regdb/repos/testing-any/wireless-regdb.install (from rev 231104, wireless-regdb/trunk/wireless-regdb.install) Deleted: wireless-regdb/repos/testing-any/PKGBUILD wireless-regdb/repos/testing-any/crda.conf.d wireless-regdb/repos/testing-any/wireless-regdb.install ------------------------+ PKGBUILD | 93 +++++++++++++++++++++++------------------------ crda.conf.d | 8 ++-- wireless-regdb.install | 26 ++++++------- 3 files changed, 63 insertions(+), 64 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-02-07 10:51:00 UTC (rev 231104) +++ PKGBUILD 2015-02-07 10:51:09 UTC (rev 231105) @@ -1,47 +0,0 @@ -# $Id$ -# Maintainer: Thomas Bächler <tho...@archlinux.org> - -pkgname=wireless-regdb -pkgver=2015.01.30 -pkgrel=1 -pkgdesc="Central Regulatory Domain Database" -arch=('any') -url="http://wireless.kernel.org/en/developers/Regulatory" -backup=(etc/conf.d/wireless-regdom) -license=('custom') -depends=('sh') -makedepends=('crda') -install=wireless-regdb.install -source=(https://www.kernel.org/pub/software/network/wireless-regdb/${pkgname}-${pkgver}.tar.{xz,sign} - crda.conf.d) -sha256sums=('438d7f3d62686bc997098d17fe1aff95c6f6ec061aaab90ab7c2c17e8451ce85' - 'SKIP' - '192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b') -validpgpkeys=('2ABCA7498D83E1D32D51D3B5AB4800A62DB9F73A') #Seth Forshee <seth.fors...@canonical.com> -package() { - # Install and verify regulatory.bin file - msg "Installing and verifying the regulatory.bin file ..." - install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.bin "${pkgdir}"/usr/lib/crda/regulatory.bin - # This creates a depend/makedepend loop: - # crda depends on wireless-regdb (but strictly doesn't makedepend on it) - # wireless-regdb makedepends on crda - if /usr/bin/regdbdump "${pkgdir}"/usr/lib/crda/regulatory.bin > /dev/null; then - msg "Regulatory database verification was succesful." - else - error "Regulatory database verification failed." - return 1 - fi - install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/sforshee.key.pub.pem "${pkgdir}"/usr/lib/crda/pubkeys/sforshee.key.pub.pem - install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/wireless-regdb/LICENSE - install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.bin.5 "${pkgdir}"/usr/share/man/man5/regulatory.bin.5 - - msg "Installing /etc/conf.d/wireless-regdom ..." - install -D -m644 "${srcdir}"/crda.conf.d "${pkgdir}"/etc/conf.d/wireless-regdom - for dom in $(grep ^country "${srcdir}"/${pkgname}-${pkgver}/db.txt | cut -d' ' -f2 | sed 's|:||g'); do - echo "#WIRELESS_REGDOM=\"${dom}\"" >> "${pkgdir}"/etc/conf.d/wireless-regdom.tmp - done - sort -u "${pkgdir}"/etc/conf.d/wireless-regdom.tmp >> "${pkgdir}"/etc/conf.d/wireless-regdom - rm "${pkgdir}"/etc/conf.d/wireless-regdom.tmp - - install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: wireless-regdb/repos/testing-any/PKGBUILD (from rev 231104, wireless-regdb/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-02-07 10:51:09 UTC (rev 231105) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Thomas Bächler <tho...@archlinux.org> + +pkgname=wireless-regdb +pkgver=2015.01.30 +pkgrel=2 +pkgdesc="Central Regulatory Domain Database" +arch=('any') +url="http://wireless.kernel.org/en/developers/Regulatory" +backup=(etc/conf.d/wireless-regdom) +license=('custom') +depends=('sh') +makedepends=('crda') +source=(https://www.kernel.org/pub/software/network/wireless-regdb/${pkgname}-${pkgver}.tar.{xz,sign} + crda.conf.d) +sha256sums=('438d7f3d62686bc997098d17fe1aff95c6f6ec061aaab90ab7c2c17e8451ce85' + 'SKIP' + '192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b') +validpgpkeys=('2ABCA7498D83E1D32D51D3B5AB4800A62DB9F73A') #Seth Forshee <seth.fors...@canonical.com> +package() { + # Install and verify regulatory.bin file + msg "Installing and verifying the regulatory.bin file ..." + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.bin "${pkgdir}"/usr/lib/crda/regulatory.bin + # This creates a depend/makedepend loop: + # crda depends on wireless-regdb (but strictly doesn't makedepend on it) + # wireless-regdb makedepends on crda + if /usr/bin/regdbdump "${pkgdir}"/usr/lib/crda/regulatory.bin > /dev/null; then + msg "Regulatory database verification was succesful." + else + error "Regulatory database verification failed." + return 1 + fi + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/sforshee.key.pub.pem "${pkgdir}"/usr/lib/crda/pubkeys/sforshee.key.pub.pem + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/wireless-regdb/LICENSE + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.bin.5 "${pkgdir}"/usr/share/man/man5/regulatory.bin.5 + + msg "Installing /etc/conf.d/wireless-regdom ..." + install -D -m644 "${srcdir}"/crda.conf.d "${pkgdir}"/etc/conf.d/wireless-regdom + for dom in $(grep ^country "${srcdir}"/${pkgname}-${pkgver}/db.txt | cut -d' ' -f2 | sed 's|:||g'); do + echo "#WIRELESS_REGDOM=\"${dom}\"" >> "${pkgdir}"/etc/conf.d/wireless-regdom.tmp + done + sort -u "${pkgdir}"/etc/conf.d/wireless-regdom.tmp >> "${pkgdir}"/etc/conf.d/wireless-regdom + rm "${pkgdir}"/etc/conf.d/wireless-regdom.tmp + + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: crda.conf.d =================================================================== --- crda.conf.d 2015-02-07 10:51:00 UTC (rev 231104) +++ crda.conf.d 2015-02-07 10:51:09 UTC (rev 231105) @@ -1,4 +0,0 @@ -# -# Wireless regulatory domain configuration -# - Copied: wireless-regdb/repos/testing-any/crda.conf.d (from rev 231104, wireless-regdb/trunk/crda.conf.d) =================================================================== --- crda.conf.d (rev 0) +++ crda.conf.d 2015-02-07 10:51:09 UTC (rev 231105) @@ -0,0 +1,4 @@ +# +# Wireless regulatory domain configuration +# + Deleted: wireless-regdb.install =================================================================== --- wireless-regdb.install 2015-02-07 10:51:00 UTC (rev 231104) +++ wireless-regdb.install 2015-02-07 10:51:09 UTC (rev 231105) @@ -1,13 +0,0 @@ -post_install() { - post_upgrade -} - -post_upgrade() { - # If crda is installed, we verify the integrity of the database - # If not, we skip this step silently - if [ -x /usr/bin/regdbdump ]; then - if ! /usr/bin/regdbdump /usr/lib/crda/regulatory.bin > /dev/null; then - echo "Failed to verify the integrity of the wireless regulatory database, CRDA will not work." - fi - fi -} Copied: wireless-regdb/repos/testing-any/wireless-regdb.install (from rev 231104, wireless-regdb/trunk/wireless-regdb.install) =================================================================== --- wireless-regdb.install (rev 0) +++ wireless-regdb.install 2015-02-07 10:51:09 UTC (rev 231105) @@ -0,0 +1,13 @@ +post_install() { + post_upgrade +} + +post_upgrade() { + # If crda is installed, we verify the integrity of the database + # If not, we skip this step silently + if [ -x /usr/bin/regdbdump ]; then + if ! /usr/bin/regdbdump /usr/lib/crda/regulatory.bin > /dev/null; then + echo "Failed to verify the integrity of the wireless regulatory database, CRDA will not work." + fi + fi +}