4 files changed, 61 insertions, 12 deletions
diff --git a/source/n/crda/crda-3.18.tar.sign b/source/n/crda/crda-3.18.tar.sign
new file mode 100644
index 000000000..7325da890
--- /dev/null
+++ b/source/n/crda/crda-3.18.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJUy9eSAAoJEM4jHQowkoinDOMP/3mh/jtlCn3dY0OLKSurmLtn
+QIAk3fPklndffVvAbdBEIC1z4OaRBqvJezlo9fP1v7m9mgzZduTPvEj79E8sBjG8
+WwECfEXQLTZy3OPaDA762Yt/Gbg3MCnpY15CN0o+Wxspwl6SapNjryr6EKs/NMX6
+5n0Taga4mXqTpJ+K3LUv9prh0lch5P5ofFDY2zqohEDsCgQAzzhEJh0JAkLjnKak
+P2wvquNLReUuTYVKHGZBAgPYjVQj2sWPnm8engButLz4eafK3FAv3EIDO4nWkYNu
+hIzsWtaKU8LDAWdS63CIK/Bh72NzFZ93B7jZDF2DJOS0/007Gaml+Szmx0S00csr
+Rl5ll2tqbIFTGp6NImO0XIXI7Or1mnBrrrRNodwEylsM5LvjOMtZpvQnAHJjjH1x
+j3KF0Uv99gEVlX3tSLKej4nhnCE8dUa/C6buFUb3Cx1kILiARoNJ/wBScdSubew1
+nQmMd8L9j9gTRVkLTI2KJmoziZdZm6bgDCUOM0+uQ35QlNNPw20Op3vSHUf+BgDS
+3XTCqL+QnYJh1gLdMx6q7cub6sf9GVj/MqCf+j5y6lhv7GPjQviObZVnkvdEkiF3
+PKJmhSQixJ5QM+kkcJDdks6Lu03h6HBKUlO+AcyV1tS7SK/q5oURwFQDW6dveW+f
+SdI8tSCva6j6kLAX6XkF
+=j/L/
+-----END PGP SIGNATURE-----
diff --git a/source/n/crda/crda.SlackBuild b/source/n/crda/crda.SlackBuild
index 93ffcd64a..20c96fac5 100755
--- a/source/n/crda/crda.SlackBuild
+++ b/source/n/crda/crda.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2009  Robby Workman, Northport, AL, USA
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2016  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,31 +22,32 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-1.1.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.18}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-REGDBVERS=git_20100502
+REGDBVERS=2016.02.08
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-crda
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 elif [ "$ARCH" = "arm" ]; then
   SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
 elif [ "$ARCH" = "armel" ]; then
@@ -60,7 +61,7 @@ mkdir -p $TMP $PKG
 
 # First, we need to install the wireless regulatory bin
 cd $TMP
-tar xvf $CWD/wireless-regdb-$REGDBVERS.tar.bz2 || exit 1
+tar xvf $CWD/wireless-regdb-$REGDBVERS.tar.xz || exit 1
 cd wireless-regdb-$REGDBVERS || exit 1
 chown -R root:root .
 find . \
@@ -89,8 +90,21 @@ find . \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
-make CFLAGS="$SLKCFLAGS" MANDIR=/usr/man || exit 1
-make install MANDIR=/usr/man DESTDIR=$PKG || exit 1
+
+# There's some weirdness going on here, but this seems to fix it:
+make ; make clean ; make
+
+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 \
+  || exit 1
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/n/crda/get_regdb.sh b/source/n/crda/get_regdb.sh
index 05a2e93bc..ce886f488 100644
--- a/source/n/crda/get_regdb.sh
+++ b/source/n/crda/get_regdb.sh
@@ -5,10 +5,11 @@ _DATE="$(date +%Y%m%d)"
 rm -rf wireless-regdb-git_${_DATE} wireless-regdb-git_${_DATE}.tar.bz2
 
 git clone \
-  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.git \
+  git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git \
   wireless-regdb-git_${_DATE}
 
-chown -R root:root wireless-regdb-${_DATE}
+chown -R root:root wireless-regdb-git_${_DATE}
+rm -rf wireless-regdb-git_${_DATE}/.git*
 tar cjf wireless-regdb-git_${_DATE}.tar.bz2 wireless-regdb-git_${_DATE}
 rm -rf wireless-regdb-git_${_DATE}
 
diff --git a/source/n/crda/wireless-regdb-2016.02.08.tar.sign b/source/n/crda/wireless-regdb-2016.02.08.tar.sign
new file mode 100644
index 000000000..e10b13801
--- /dev/null
+++ b/source/n/crda/wireless-regdb-2016.02.08.tar.sign
@@ -0,0 +1,17 @@
+-----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-----