8 files changed, 35 insertions, 110 deletions
diff --git a/source/n/crda/crda.url b/source/n/crda/crda.url
deleted file mode 100644
index ea4bf7802..000000000
--- a/source/n/crda/crda.url
+++ /dev/null
@@ -1,2 +0,0 @@
-#https://www.kernel.org/pub/software/network/crda/
-https://git.kernel.org/cgit/linux/kernel/git/mcgrof/crda.git/
diff --git a/source/n/crda/get_regdb.sh b/source/n/crda/get_regdb.sh
deleted file mode 100644
index ce886f488..000000000
--- a/source/n/crda/get_regdb.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-_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/sforshee/wireless-regdb.git \
-  wireless-regdb-git_${_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/slack-desc b/source/n/crda/slack-desc
deleted file mode 100644
index 794493d70..000000000
--- a/source/n/crda/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# 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
-# customary to leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-crda: crda (Central Regulatory Domain Agent)
-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: 
-crda: You only need to run this manually for debugging purposes.
-crda: 
-crda: Homepage: http://wireless.kernel.org
-crda: 
diff --git a/source/n/gpgme/gpgme.SlackBuild b/source/n/gpgme/gpgme.SlackBuild
index 097a0225f..ec40fcfad 100755
--- a/source/n/gpgme/gpgme.SlackBuild
+++ b/source/n/gpgme/gpgme.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gpgme
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -96,6 +96,9 @@ make install DESTDIR=$PKG || exit 1
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
+# Nope.
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/python2.7/
+
 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/obexftp/obexftp.SlackBuild b/source/n/obexftp/obexftp.SlackBuild
index 900850df8..16437b094 100755
--- a/source/n/obexftp/obexftp.SlackBuild
+++ b/source/n/obexftp/obexftp.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2015, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2015, 2017, 2018, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=obexftp
 VERSION=${VERSION:-$(echo $PKGNAM-*-Source.tar.?z* | rev | cut -f 3- -d . | cut -f 2 -d - | rev)}
-BUILD=${BUILD:-10}
+BUILD=${BUILD:-11}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -62,7 +62,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
 PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
 
 rm -rf $PKG
@@ -98,21 +97,6 @@ cd build
   make install DESTDIR=$PKG || exit 1
 cd ..
 
-mkdir -p build-python2
-cd build-python2
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PKGNAM-$VERSION \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DPython_ADDITIONAL_VERSIONS=2.7 ..
-  cd swig/python
-  make $NUMJOBS || make || exit 1
-  make install DESTDIR=$PKG || exit 1
-cd ../../../
-
 # Relocate man pages:
 mv $PKG/usr/share/man $PKG/usr
 rmdir $PKG/usr/share 2> /dev/null
@@ -133,8 +117,6 @@ fi
 )
 
 # Generate .pyc files
-python -m compileall "${PKG}$PYTHONLIB"
-python -O -m compileall "${PKG}$PYTHONLIB"
 python3 -m compileall "${PKG}$PYTHON3LIB"
 python3 -O -m compileall "${PKG}$PYTHON3LIB"
 
diff --git a/source/n/wireless-regdb/slack-desc b/source/n/wireless-regdb/slack-desc
new file mode 100644
index 000000000..d7e240d5e
--- /dev/null
+++ b/source/n/wireless-regdb/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# 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
+# customary to leave one space after the ':'.
+
+              |-----handy-ruler------------------------------------------------------|
+wireless-regdb: wireless-regdb (radio regulatory compliance database)
+wireless-regdb: 
+wireless-regdb: This package provides a machine-readable database of legal regulations
+wireless-regdb: on radio emissions that affect use of wireless networking. The Linux
+wireless-regdb: kernel and drivers use this to maintain compliance with those
+wireless-regdb: regulations.
+wireless-regdb: 
+wireless-regdb: Homepage: https://wireless.wiki.kernel.org
+wireless-regdb: 
+wireless-regdb: 
+wireless-regdb: 
diff --git a/source/n/crda/crda.SlackBuild b/source/n/wireless-regdb/wireless-regdb.SlackBuild
index cf7a0a8e7..a38f6891c 100755
--- a/source/n/crda/crda.SlackBuild
+++ b/source/n/wireless-regdb/wireless-regdb.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright 2009  Robby Workman, Northport, AL, USA
-# Copyright 2009, 2010, 2016, 2018, 2023  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2016, 2018, 2023, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 
 cd $(dirname $0) ; CWD=$(pwd)
 
-PKGNAM=crda
-VERSION=${VERSION:-4.15}
+PKGNAM=wireless-regdb
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -45,10 +45,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
-REGDBVERS=2023.05.03
-
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-crda
+PKG=$TMP/package-wireless-regdb
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -70,8 +68,8 @@ mkdir -p $TMP $PKG
 
 # First, we need to install the wireless regulatory bin
 cd $TMP
-tar xvf $CWD/wireless-regdb-$REGDBVERS.tar.xz || exit 1
-cd wireless-regdb-$REGDBVERS || exit 1
+tar xvf $CWD/wireless-regdb-$VERSION.tar.xz || exit 1
+cd wireless-regdb-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -79,56 +77,15 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-# If this isn't installed on the system, crda will not build:
-make install MANDIR=/usr/man || exit 1
-
-# Install to the package directory:
-make install DESTDIR=$PKG MANDIR=/usr/man || exit 1
+make install DESTDIR=$PKG MANDIR=/usr/man FIRMWARE_PATH=/lib/firmware || exit 1
 
-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
-cd $TMP
-rm -rf crda-$VERSION
-tar xvf $CWD/crda-$VERSION.tar.?z* || exit 1
-cd crda-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-# 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 \
-  MANDIR=/usr/man \
-  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-  || exit 1
-make install \
-  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
+mkdir -p $PKG/usr/doc/wireless-regdb-$VERSION/regdb
+cp -a LICENSE README db.txt $PKG/usr/doc/wireless-regdb-$VERSION/regdb
 
 # Manpages are already compressed
 
-mkdir -p $PKG/usr/doc/crda-$VERSION
-cp -a \
-  LICENSE README \
-  $PKG/usr/doc/crda-$VERSION
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/crda-$VERSION-$ARCH-$BUILD.txz
-
+/sbin/makepkg -l y -c n $TMP/wireless-regdb-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/n/crda/wireless-regdb.url b/source/n/wireless-regdb/wireless-regdb.url
index a795b6947..a795b6947 100644
--- a/source/n/crda/wireless-regdb.url
+++ b/source/n/wireless-regdb/wireless-regdb.url