6 files changed, 42 insertions, 36 deletions
diff --git a/source/n/crda/crda.SlackBuild b/source/n/crda/crda.SlackBuild
index 20c96fac..abd2e2a7 100755
--- a/source/n/crda/crda.SlackBuild
+++ b/source/n/crda/crda.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2009  Robby Workman, Northport, AL, USA
-# Copyright 2009, 2010, 2016  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
+PKGNAM=crda
 VERSION=${VERSION:-3.18}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-7}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -35,9 +37,16 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-REGDBVERS=2016.02.08
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
+REGDBVERS=2018.05.09
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-crda
 
@@ -71,12 +80,12 @@ find . \
  -exec chmod 644 {} \;
 
 # If this isn't installed on the system, crda will not build:
-mkdir -p /usr/lib/crda
-cat regulatory.bin > /usr/lib/crda/regulatory.bin
+make install MANDIR=/usr/man || exit 1
+
+# Install to the package directory:
+make install DESTDIR=$PKG MANDIR=/usr/man || exit 1
 
-mkdir -p $PKG/usr/lib/crda $PKG/usr/man/man5 $PKG/usr/doc/crda-$VERSION/regdb
-cat regulatory.bin > $PKG/usr/lib/crda/regulatory.bin
-gzip -9c regulatory.bin.5 > $PKG/usr/man/man5/regulatory.bin.5.gz
+mkdir -p $PKG/usr/doc/crda-$VERSION/regdb
 cp -a LICENSE README db.txt $PKG/usr/doc/crda-$VERSION/regdb
 
 # Now we'll do crda itself
@@ -91,16 +100,17 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# There's some weirdness going on here, but this seems to fix it:
-make ; make clean ; make
+# This thing uses our CFLAGS on its own, but if we specify them,
+# it fails to build. The build failure is wacky, as if it's not
+# linking libnl into crda.o -- the detection for libnl is broken,
+# but even if it's fixed, the errors still occur. This works, so...
+sed -i -e "s,-Werror ,,g" -e "s,fpic,fPIC,g" Makefile
 
 make \
-  CFLAGS="$SLKCFLAGS" \
   MANDIR=/usr/man \
   LIBDIR=/usr/lib${LIBDIRSUFFIX} \
   || exit 1
 make install \
-  CFLAGS="$SLKCFLAGS" \
   MANDIR=/usr/man \
   LIBDIR=/usr/lib${LIBDIRSUFFIX} \
   DESTDIR=$PKG \
diff --git a/source/n/crda/crda.url b/source/n/crda/crda.url
new file mode 100644
index 00000000..29d4e08e
--- /dev/null
+++ b/source/n/crda/crda.url
@@ -0,0 +1 @@
+https://www.kernel.org/pub/software/network/crda/
diff --git a/source/n/crda/slack-desc b/source/n/crda/slack-desc
index d6c21127..794493d7 100644
--- a/source/n/crda/slack-desc
+++ b/source/n/crda/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
     |-----handy-ruler------------------------------------------------------|
@@ -11,9 +11,9 @@ crda:
 crda: This is the Central Regulatory Domain Agent for Linux. 
 crda: It serves one purpose: tell the Linux kernel what to enforce. 
 crda: In essence, it is a udev helper for communication between
-crda: the kernel and userspace.  
+crda: the kernel and userspace. 
 crda: 
 crda: You only need to run this manually for debugging purposes.
 crda: 
-crda: http://wireless.kernel.org/download/crda/
+crda: Homepage: http://wireless.kernel.org
 crda: 
diff --git a/source/n/crda/wireless-regdb-2016.02.08.tar.sign b/source/n/crda/wireless-regdb-2016.02.08.tar.sign
deleted file mode 100644
index e10b1380..00000000
--- a/source/n/crda/wireless-regdb-2016.02.08.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABCgAGBQJWuK7SAAoJEKtIAKYtufc6M0wQALm4zNeA/UlubfDeMjtLxDWb
-7b/SHnjzZ0KIOA52Ysqns4hvAdrzqNyHuT+9a6tBKZQLB5ZHnXSGdEZtznsjXnM1
-UcrIC6X0u1CLL1HE+JA+OTjDfJjBreKTlF2aX35DjsIc2kR0NYkF4qkFCeYHvn/n
-y+9YEF2VYkzxOkrX2B4aX2j4ncWA0vub11NoHdthzavPng8UJz91x9pu/8N2HzoC
-h64jqDZK5YBdc6SE+CS/QEMlnMmizf560rsTxFR4m6drDBJGnOYJbRsi784AZf/R
-HLJvzmou4BxKNTrFIkaE9CNgV3MHOaBB7NrvjgcoHCZI9Y9CQLZGJbPagLQ2KW0g
-q6TOBqi3eKmE1PbtEi8jkHME6CYFk5R2NJyKQmVDyKp37nzX6lrk+7lfoqpQ7Pmr
-fUNBCZoGGTLP9qV0fIRBk1pyIc2fXzXmSrh5v5GUzXRSFN6U4V6iKG1KqPVe6H7J
-OqPwfMWQhCaK2e+/qXHb068oOnxOKhnw6ucDyq2qZVaWy8qKuJZ/EGWFMgWEo6/H
-j9fReRc1k0/z5QFBRZ7tuqxTdquWO0Xsn5MvUbZA43Bi3CEAgxZoWmU7GxjW0Qh0
-8hu7Tyk58qqgyrpXUM3ccWJJ8wLK6kcdvtiRt9x5xavr4/2hdHb764HBtb0HdueK
-4FghlQ8df3rH5pX3QxkH
-=6hY4
------END PGP SIGNATURE-----
diff --git a/source/n/crda/wireless-regdb-2018.05.09.tar.sign b/source/n/crda/wireless-regdb-2018.05.09.tar.sign
new file mode 100644
index 00000000..c4d8ed0a
--- /dev/null
+++ b/source/n/crda/wireless-regdb-2018.05.09.tar.sign
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEkJ7fqygL5xE8uB3PUwOZruX0MckFAlrzAPEACgkQUwOZruX0
+MckmAAf/UH+XSV3fFCLAPjD1VaXp6gtO1+98EO7HQsOxR0X3LxY86VDyy4O2/2/b
+Kyb9oYDP0vFM0/d0qwOjHiZuRRGU4Lzsf5eOdRv2GMJUgSRiFmW6RvX6bWmPUNyl
+WOR1SHW3C/fNxjBoeYF2hPjw0omn9nwblG4I+8tHbCJZ7jyHGx1lKUx5FpjJvALm
+tR8djN6VymsIw5fjuKfjO82pBqyuK/qv52RGUTKi0HhzZpTyOJ+3oyCctiCQLC92
+7JjPT+BV7qfkNW7OPOLSGq3orIhhX7asSvBtrnUTewEObwWuuFXdBWAIpSlPjwpz
+XIbKXIssyz6u3RCkpjWvZOLt5qsxEA==
+=rQKU
+-----END PGP SIGNATURE-----
diff --git a/source/n/crda/wireless-regdb.url b/source/n/crda/wireless-regdb.url
new file mode 100644
index 00000000..a795b694
--- /dev/null
+++ b/source/n/crda/wireless-regdb.url
@@ -0,0 +1 @@
+http://kernel.org/pub/software/network/wireless-regdb/