summaryrefslogtreecommitdiff
path: root/source/l/fuse3
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-12-05 19:04:24 +0000
committerEric Hameleers <alien@slackware.com>2019-12-06 08:59:49 +0100
commit4fc798c4ca2a975ab8af459a6c27ee592baf0605 (patch)
tree2af17336626f9fd97e027cecda2e09f5665b7e70 /source/l/fuse3
parentcd6f7a8c2cc3858324e194828283bc5a265a97f6 (diff)
downloadcurrent-4fc798c4ca2a975ab8af459a6c27ee592baf0605.tar.gz
Thu Dec 5 19:04:24 UTC 201920191205190424
a/tcsh-6.22.02-x86_64-1.txz: Upgraded. ap/vim-8.1.2391-x86_64-1.txz: Upgraded. l/fuse3-3.8.0-x86_64-2.txz: Rebuilt. rc.fuse3: Don't source /lib/lsb/init-functions unless it exists. NOTE: FUSE seems to work fine without starting rc.fuse3, which it why it isn't actually called from anywhere during system startup. n/iw-5.4-x86_64-1.txz: Upgraded. n/php-7.4.0-x86_64-2.txz: Rebuilt. Rebuilt using --enable-gd=shared and --with-zip=shared. Thanks to Matteo Bernardini. xap/gv-3.7.4-x86_64-3.txz: Rebuilt. Patched to fix save/print features when used with the latest ghostscript. Added --enable-international build option. Fixed broken whitespace in the bounding-box patch. Thanks to Xsane. xap/vim-gvim-8.1.2391-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/fuse3')
-rwxr-xr-xsource/l/fuse3/fuse3.SlackBuild9
-rw-r--r--source/l/fuse3/rc.fuse3.no.source.lsb.init-functions.diff13
2 files changed, 20 insertions, 2 deletions
diff --git a/source/l/fuse3/fuse3.SlackBuild b/source/l/fuse3/fuse3.SlackBuild
index 20a718a7..7a85f8c2 100755
--- a/source/l/fuse3/fuse3.SlackBuild
+++ b/source/l/fuse3/fuse3.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright (c) 2008, Antonio Hernandez Blas <hba.nihilismus@gmail.com>
-# Copyright 2008, 2009, 2010, 2011, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2015, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=fuse3
SRCNAM=fuse
VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -80,6 +80,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+# We don't include LSB cruft, so check to see if the LSB init-functions
+# file exists before sourcing it. On another note, I've never found any
+# reason to actually run this init script. FUSE works fine without it.
+zcat $CWD/rc.fuse3.no.source.lsb.init-functions.diff.gz | patch -p1 --verbose || exit 1
+
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
diff --git a/source/l/fuse3/rc.fuse3.no.source.lsb.init-functions.diff b/source/l/fuse3/rc.fuse3.no.source.lsb.init-functions.diff
new file mode 100644
index 00000000..824b4b8a
--- /dev/null
+++ b/source/l/fuse3/rc.fuse3.no.source.lsb.init-functions.diff
@@ -0,0 +1,13 @@
+--- ./util/init_script.orig 2019-11-03 03:53:39.000000000 -0600
++++ ./util/init_script 2019-12-05 12:06:09.156052064 -0600
+@@ -20,7 +20,9 @@
+ which fusermount3 &>/dev/null || exit 5
+
+ # Define LSB log_* functions.
+-. /lib/lsb/init-functions
++if [ -r /lib/lsb/init-functions ]; then
++ . /lib/lsb/init-functions
++fi
+
+ case "$1" in
+ start|restart|force-reload)