[arch-commits] Commit in wireless-regdb/repos (7 files)

Tobias Powalowski tpowa at archlinux.org
Mon Nov 27 05:51:04 UTC 2017


    Date: Monday, November 27, 2017 @ 05:51:03
  Author: tpowa
Revision: 310991

db-move: moved wireless-regdb from [testing] to [core] (any)

Added:
  wireless-regdb/repos/core-any/PKGBUILD
    (from rev 310990, wireless-regdb/repos/testing-any/PKGBUILD)
  wireless-regdb/repos/core-any/crda.conf.d
    (from rev 310990, wireless-regdb/repos/testing-any/crda.conf.d)
  wireless-regdb/repos/core-any/wireless-regdb.install
    (from rev 310990, wireless-regdb/repos/testing-any/wireless-regdb.install)
Deleted:
  wireless-regdb/repos/core-any/PKGBUILD
  wireless-regdb/repos/core-any/crda.conf.d
  wireless-regdb/repos/core-any/wireless-regdb.install
  wireless-regdb/repos/testing-any/

---------------------------------+
 /PKGBUILD                       |   47 ++++++++++++++++++++++++++++++++++++++
 /crda.conf.d                    |    4 +++
 /wireless-regdb.install         |   13 ++++++++++
 core-any/PKGBUILD               |   47 --------------------------------------
 core-any/crda.conf.d            |    4 ---
 core-any/wireless-regdb.install |   13 ----------
 6 files changed, 64 insertions(+), 64 deletions(-)

Deleted: core-any/PKGBUILD
===================================================================
--- core-any/PKGBUILD	2017-11-27 05:50:55 UTC (rev 310990)
+++ core-any/PKGBUILD	2017-11-27 05:51:03 UTC (rev 310991)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-pkgname=wireless-regdb
-pkgver=2016.06.10
-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')
-source=(https://www.kernel.org/pub/software/network/wireless-regdb/${pkgname}-${pkgver}.tar.{xz,sign}
-        crda.conf.d)
-sha256sums=('cfedf1c3521b3c8f32602f25ed796e96e687c3441a00e7c050fedf7fd4f1b8b7'
-            'SKIP'
-            '192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b')
-validpgpkeys=('2ABCA7498D83E1D32D51D3B5AB4800A62DB9F73A') #Seth Forshee <seth.forshee at 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/core-any/PKGBUILD (from rev 310990, wireless-regdb/repos/testing-any/PKGBUILD)
===================================================================
--- core-any/PKGBUILD	                        (rev 0)
+++ core-any/PKGBUILD	2017-11-27 05:51:03 UTC (rev 310991)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=wireless-regdb
+pkgver=2017.03.07
+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')
+source=(https://www.kernel.org/pub/software/network/wireless-regdb/${pkgname}-${pkgver}.tar.{xz,sign}
+        crda.conf.d)
+sha256sums=('371eafa3b26ece916ef83aca02c4bed2e54099eb5b8c6d22d3a4358dce6535b9'
+            'SKIP'
+            '192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b')
+validpgpkeys=('2ABCA7498D83E1D32D51D3B5AB4800A62DB9F73A') #Seth Forshee <seth.forshee at 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: core-any/crda.conf.d
===================================================================
--- core-any/crda.conf.d	2017-11-27 05:50:55 UTC (rev 310990)
+++ core-any/crda.conf.d	2017-11-27 05:51:03 UTC (rev 310991)
@@ -1,4 +0,0 @@
-#
-# Wireless regulatory domain configuration
-#
-

Copied: wireless-regdb/repos/core-any/crda.conf.d (from rev 310990, wireless-regdb/repos/testing-any/crda.conf.d)
===================================================================
--- core-any/crda.conf.d	                        (rev 0)
+++ core-any/crda.conf.d	2017-11-27 05:51:03 UTC (rev 310991)
@@ -0,0 +1,4 @@
+#
+# Wireless regulatory domain configuration
+#
+

Deleted: core-any/wireless-regdb.install
===================================================================
--- core-any/wireless-regdb.install	2017-11-27 05:50:55 UTC (rev 310990)
+++ core-any/wireless-regdb.install	2017-11-27 05:51:03 UTC (rev 310991)
@@ -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/core-any/wireless-regdb.install (from rev 310990, wireless-regdb/repos/testing-any/wireless-regdb.install)
===================================================================
--- core-any/wireless-regdb.install	                        (rev 0)
+++ core-any/wireless-regdb.install	2017-11-27 05:51:03 UTC (rev 310991)
@@ -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
+}


More information about the arch-commits mailing list