summaryrefslogtreecommitdiff
path: root/source/n
diff options
context:
space:
mode:
Diffstat (limited to 'source/n')
-rwxr-xr-xsource/n/ModemManager/ModemManager.SlackBuild10
-rw-r--r--source/n/NetworkManager/10-org.freedesktop.NetworkManager.rules7
-rwxr-xr-xsource/n/NetworkManager/NetworkManager.SlackBuild6
-rwxr-xr-xsource/n/bluez/bluez.SlackBuild7
-rw-r--r--source/n/netatalk/netatalk-invalid_dircache_entries.patch22
-rwxr-xr-xsource/n/netatalk/netatalk.SlackBuild7
-rwxr-xr-xsource/n/wpa_supplicant/wpa_supplicant.SlackBuild6
7 files changed, 57 insertions, 8 deletions
diff --git a/source/n/ModemManager/ModemManager.SlackBuild b/source/n/ModemManager/ModemManager.SlackBuild
index af9a88df..c8e19dd6 100755
--- a/source/n/ModemManager/ModemManager.SlackBuild
+++ b/source/n/ModemManager/ModemManager.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=ModemManager
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -81,6 +81,8 @@ find . \
zcat $CWD/WeDoNotHaveSystemD.patch.gz | patch -p1 --verbose || exit 1
+LIBSYSTEMD_LOGIN_CFLAGS="$(pkg-config --cflags libelogind)" \
+LIBSYSTEMD_LOGIN_LIBS="$(pkg-config --libs libelogind)" \
CFLAGS="$SLKCFLAGS -Wno-incompatible-pointer-types" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -92,11 +94,17 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--disable-static \
--docdir=/usr/doc/$PKGNAM-$VERSION \
+ --with-systemd-suspend-resume \
--build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || exit 1
make install DESTDIR=$PKG || exit 1
+# Move dbus configs to system location:
+mkdir -p $PKG/usr/share/dbus-1/system.d/
+mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
+rmdir --parents $PKG/etc/dbus-1/system.d/
+
# Don't ship .la files:
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
diff --git a/source/n/NetworkManager/10-org.freedesktop.NetworkManager.rules b/source/n/NetworkManager/10-org.freedesktop.NetworkManager.rules
new file mode 100644
index 00000000..9d6557b3
--- /dev/null
+++ b/source/n/NetworkManager/10-org.freedesktop.NetworkManager.rules
@@ -0,0 +1,7 @@
+polkit.addRule(function(action, subject) {
+ if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 &&
+ subject.isInGroup("netdev")) {
+ return polkit.Result.YES;
+ }
+});
+
diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild
index c826785b..fb108b5b 100755
--- a/source/n/NetworkManager/NetworkManager.SlackBuild
+++ b/source/n/NetworkManager/NetworkManager.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=NetworkManager
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:
MARCH=$( uname -m )
@@ -182,6 +182,10 @@ mkdir -p $PKG/etc/NetworkManager/conf.d
cat $CWD/conf.d/00-dhcp-client.conf > $PKG/etc/NetworkManager/conf.d/00-dhcp-client.conf.new
cat $CWD/conf.d/00-rc-manager.conf > $PKG/etc/NetworkManager/conf.d/00-rc-manager.conf.new
+# Add default polkit rules for NM
+mkdir -p $PKG/usr/share/polkit-1/rules.d/
+cat $CWD/10-org.freedesktop.NetworkManager.rules > $PKG/usr/share/polkit-1/rules.d/10-org.freedesktop.NetworkManager.rules
+
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
AUTHORS CONTRIBUTING COPYING ChangeLog INSTALL NEWS README TODO \
diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild
index cc55d396..eabe1014 100755
--- a/source/n/bluez/bluez.SlackBuild
+++ b/source/n/bluez/bluez.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=bluez
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -129,6 +129,11 @@ chmod 644 $PKG/lib/modprobe.d/btusb.conf
mkdir -p $PKG/usr/sbin
ln -s ../libexec/bluetooth/bluetoothd $PKG/usr/sbin
+# Move the dbus config file to the system directory
+mkdir -p $PKG/usr/share/dbus-1/system.d/
+mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
+rmdir --parents $PKG/etc/dbus-1/system.d/
+
# Fix substitution in /usr/share/dbus-1/services/org.bluez.obex.service:
if [ -x $PKG/usr/libexec/bluetooth/obexd ]; then
sed -i "s|@libexecdir@|/usr/libexec|g" $PKG/usr/share/dbus-1/services/org.bluez.obex.service
diff --git a/source/n/netatalk/netatalk-invalid_dircache_entries.patch b/source/n/netatalk/netatalk-invalid_dircache_entries.patch
new file mode 100644
index 00000000..8652b68c
--- /dev/null
+++ b/source/n/netatalk/netatalk-invalid_dircache_entries.patch
@@ -0,0 +1,22 @@
+From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001
+From: Andrew Bauer <zonexpertconsulting@outlook.com>
+Date: Wed, 22 Jan 2020 09:59:47 -0600
+Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries
+
+---
+ etc/afpd/directory.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h
+index eb89c606..81bfa9cb 100644
+--- a/etc/afpd/directory.h
++++ b/etc/afpd/directory.h
+@@ -91,7 +91,7 @@ struct maccess {
+ #define AR_UWRITE (1<<2)
+ #define AR_UOWN (1<<7)
+
+-q_t *invalid_dircache_entries;
++extern q_t *invalid_dircache_entries;
+
+ typedef int (*dir_loop)(struct dirent *, char *, void *);
+
diff --git a/source/n/netatalk/netatalk.SlackBuild b/source/n/netatalk/netatalk.SlackBuild
index 7674450d..09f715c4 100755
--- a/source/n/netatalk/netatalk.SlackBuild
+++ b/source/n/netatalk/netatalk.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=netatalk
VERSION=${VERSION:-$(echo netatalk-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -78,6 +78,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1793912
+zcat $CWD/netatalk-invalid_dircache_entries.patch.gz | patch -p1 --verbose || exit 1
+
# Choose correct options depending on whether PAM is installed:
if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
PAM_OPTIONS="--with-pam-confdir=/etc/pam.d --with-pam --enable-ddp"
@@ -101,7 +104,7 @@ CFLAGS="$SLKCFLAGS" \
$PAM_OPTIONS \
$SHADOW_OPTIONS \
--with-libevent=system \
- --with-dbus-sysconf-dir=/etc/dbus-1/system.d/ \
+ --with-dbus-sysconf-dir=/usr/share/dbus-1/system.d/ \
--with-dbus-daemon=/usr/bin/dbus-daemon \
--build=$ARCH-slackware-linux || exit 1
diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
index 61b993f8..18ed8393 100755
--- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
+++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=wpa_supplicant
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
SRCVERSION=$(printf $VERSION | tr _ -)
@@ -136,9 +136,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
# Install dbus configuration file:
-mkdir -p $PKG/etc/dbus-1/system.d/
+mkdir -p $PKG/usr/share/dbus-1/system.d/
cp dbus/dbus-wpa_supplicant.conf \
- $PKG/etc/dbus-1/system.d/dbus-wpa_supplicant.conf
+ $PKG/usr/share/dbus-1/system.d/dbus-wpa_supplicant.conf
mkdir -p $PKG/usr/share/dbus-1/system-services
install -m644 dbus/*.service $PKG/usr/share/dbus-1/system-services/