diff options
Diffstat (limited to 'source/n/cifs-utils')
| -rwxr-xr-x | source/n/cifs-utils/cifs-utils.SlackBuild | 13 | ||||
| -rw-r--r-- | source/n/cifs-utils/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch | 38 |
2 files changed, 4 insertions, 47 deletions
diff --git a/source/n/cifs-utils/cifs-utils.SlackBuild b/source/n/cifs-utils/cifs-utils.SlackBuild index ef91a5419..20871fb7b 100755 --- a/source/n/cifs-utils/cifs-utils.SlackBuild +++ b/source/n/cifs-utils/cifs-utils.SlackBuild @@ -28,8 +28,8 @@ BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac @@ -38,11 +38,8 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -76,8 +73,6 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION -zcat $CWD/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/n/cifs-utils/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch b/source/n/cifs-utils/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch deleted file mode 100644 index a8dd96c46..000000000 --- a/source/n/cifs-utils/mount.cifs-set-rc-to-0-in-libcap-toggle_dac_capabili.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0eb3daa4b17ee64b464594f1a5d413ecb364957c Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@samba.org> -Date: Thu, 14 Jun 2012 10:59:18 -0400 -Subject: [PATCH] mount.cifs: set rc to 0 in libcap toggle_dac_capability - -Thus spake Jochen: - -The mount.cifs program from the cifs-utils package 5.5 did not work on -my Linux system. It just exited without an error message and did not -mount anything. - -[...] - -I think, when this variable rc is now used in this function, it has also -to be properly initialized there. - -Reported-by: Jochen Roderburg <roderburg@uni-koeln.de> -Signed-off-by: Jeff Layton <jlayton@samba.org> ---- - mount.cifs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mount.cifs.c b/mount.cifs.c -index a1b0454..6f3f382 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -495,7 +495,7 @@ free_caps: - static int - toggle_dac_capability(int writable, int enable) - { -- int rc; -+ int rc = 0; - cap_t caps; - cap_value_t capability = writable ? CAP_DAC_OVERRIDE : CAP_DAC_READ_SEARCH; - --- -1.7.11 - |