diff options
Diffstat (limited to 'source/n/netatalk')
| -rw-r--r-- | source/n/netatalk/netatalk-invalid_dircache_entries.patch | 22 | ||||
| -rwxr-xr-x | source/n/netatalk/netatalk.SlackBuild | 7 |
2 files changed, 27 insertions, 2 deletions
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 000000000..8652b68ca --- /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 7674450d6..09f715c43 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 |