diff options
Diffstat (limited to 'source/n/cifs-utils')
-rw-r--r-- | source/n/cifs-utils/cifs-utils-6.7-talloc.patch | 29 | ||||
-rwxr-xr-x | source/n/cifs-utils/cifs-utils.SlackBuild | 9 | ||||
-rw-r--r-- | source/n/cifs-utils/cifs-utils.url | 1 |
3 files changed, 3 insertions, 36 deletions
diff --git a/source/n/cifs-utils/cifs-utils-6.7-talloc.patch b/source/n/cifs-utils/cifs-utils-6.7-talloc.patch deleted file mode 100644 index 7e3418631..000000000 --- a/source/n/cifs-utils/cifs-utils-6.7-talloc.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=612018 - -From: Thomas Witt <pyromaniac@exherbo.org> -Date: Wed, 15 Mar 2017 20:20:44 +0000 (+0000) -Subject: mount.cifs: Remove data_blob.h include -X-Git-Url: https://git.samba.org/?p=cifs-utils.git;a=commitdiff_plain;h=272d523a57a4e8791d625a479128613be5e401f5 - -mount.cifs: Remove data_blob.h include - -data_blob.h includes talloc.h from libtalloc, but that is only marked as -a dependency for cifs.upcall. No symbols from that header are used by -cifs.mount, so remove it to avoid the libtalloc dependency - -Signed-off-by: Thomas Witt <pyromaniac@exherbo.org> ---- - -diff --git a/mount.cifs.c b/mount.cifs.c -index 13b71ef..2612feb 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -61,7 +61,6 @@ - #include "mount.h" - #include "util.h" - #include "resolve_host.h" --#include "data_blob.h" - - #ifndef MS_MOVE - #define MS_MOVE 8192 - diff --git a/source/n/cifs-utils/cifs-utils.SlackBuild b/source/n/cifs-utils/cifs-utils.SlackBuild index c3f94f3fa..3260d00fc 100755 --- a/source/n/cifs-utils/cifs-utils.SlackBuild +++ b/source/n/cifs-utils/cifs-utils.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cifs-utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -88,11 +88,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# data_blob.h is only needed for cifs_upcall, which we don't have due -# to lack of krb5, so let's unfail the build -zcat $CWD/cifs-utils-6.7-talloc.patch.gz | patch -p1 --verbose || exit 1 - -# Sigh. autoreconf -vif # Configure: @@ -102,7 +97,7 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 # Build and install: make $NUMJOBS || make || exit 1 diff --git a/source/n/cifs-utils/cifs-utils.url b/source/n/cifs-utils/cifs-utils.url new file mode 100644 index 000000000..4d637ad04 --- /dev/null +++ b/source/n/cifs-utils/cifs-utils.url @@ -0,0 +1 @@ +https://www.samba.org/ftp/linux-cifs/cifs-utils |