diff options
| -rw-r--r-- | abs/extra/wireless-regdb/PKGBUILD | 48 | ||||
| -rw-r--r-- | abs/extra/wireless-regdb/wireless-regdb.install | 4 |
2 files changed, 26 insertions, 26 deletions
diff --git a/abs/extra/wireless-regdb/PKGBUILD b/abs/extra/wireless-regdb/PKGBUILD index 0a5f163..4ff914e 100644 --- a/abs/extra/wireless-regdb/PKGBUILD +++ b/abs/extra/wireless-regdb/PKGBUILD @@ -1,46 +1,46 @@ -# $Id: PKGBUILD 141966 2011-11-03 18:52:54Z thomas $ +# $Id$ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wireless-regdb -pkgver=2011.04.28 +pkgver=2013.11.27 pkgrel=1 pkgdesc="Central Regulatory Domain Database" arch=('any') -url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" +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=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2 +source=(https://www.kernel.org/pub/software/network/wireless-regdb/${pkgname}-${pkgver}.tar.xz crda.conf.d) -sha256sums=('ed1c3e134e34ba5f93594f6f76b90861fe8d24359c064839a2bb78736416642b' +sha256sums=('aa86150a367df0d6c8d875c05448c96a18c4ddf063f3e1b8c2235c2679117cc2' '192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b') package() { # Install and verify regulatory.bin file msg "Installing and verifying the regulatory.bin file ..." - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - # If crda is installed, the wireless regdb can be verified using regdbdump - # Keep this step optional so no depend/makedepend loop is created - if [ -x /sbin/regdbdump ]; then - if /sbin/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}/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 - warning "Crda is not installed, regulatory database could not be verified." + error "Regulatory database verification failed." + return 1 fi - + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/linville.key.pub.pem "${pkgdir}"/usr/lib/crda/pubkeys/linville.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 + 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 -f ${pkgdir}/etc/conf.d/wireless-regdom.tmp + 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 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/extra/wireless-regdb/wireless-regdb.install b/abs/extra/wireless-regdb/wireless-regdb.install index ae712db..7b5a05d 100644 --- a/abs/extra/wireless-regdb/wireless-regdb.install +++ b/abs/extra/wireless-regdb/wireless-regdb.install @@ -5,8 +5,8 @@ post_install() { post_upgrade() { # If crda is installed, we verify the integrity of the database # If not, we skip this step silently - if [ -x /sbin/regdbdump ]; then - if ! /sbin/regdbdump /usr/lib/crda/regulatory.bin > /dev/null; then + 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 |