summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-04-12 22:13:09 +0000
committer Eric Hameleers <alien@slackware.com>2019-04-13 08:59:41 +0200
commit0be8c4f3725261a2db58f6fb2454330f5c831075 (patch)
tree260e85d3564693dedcdcea1e7e713f1091c20f12 /source
parentb392d3dae3830b3b1b7565fd94754b18ac11a5c8 (diff)
downloadcurrent-0be8c4f3725261a2db58f6fb2454330f5c831075.tar.gz
current-0be8c4f3725261a2db58f6fb2454330f5c831075.tar.xz
Fri Apr 12 22:13:09 UTC 201920190412221309
a/gawk-5.0.0-x86_64-1.txz: Upgraded. ap/pamixer-1.4-x86_64-2.txz: Rebuilt. Recompiled against boost-1.70.0. ap/vim-8.1.1157-x86_64-1.txz: Upgraded. d/cmake-3.14.2-x86_64-1.txz: Upgraded. e/emacs-26.2-x86_64-1.txz: Upgraded. kde/calligra-2.9.11-x86_64-30.txz: Rebuilt. Recompiled against boost-1.70.0. l/akonadi-1.13.0-x86_64-12.txz: Rebuilt. Recompiled against boost-1.70.0. l/boost-1.70.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. Note: Boost now provides its own BoostConfig.cmake config file, and it may not work with all existing code (here, calligra stumbled over it). At this point it's not clear if the included cmake config files are buggy, or if affected projects need to change something in order to use them, but there's an easy workaround to use cmake's FindBoost.cmake (as was used previously). Add this to the call to cmake from any affected project (if cmake fails with an error: "No suitable build variant has been found."): -DBoost_NO_BOOST_CMAKE=ON n/libmbim-1.18.2-x86_64-1.txz: Upgraded. n/nfs-utils-2.3.3-x86_64-3.txz: Rebuilt. rc.nfsd: don't try to create the nfsv4recoverydir - the build script will determine the directory to use and include it in the package. rc.nfsd: drop 2.4 kernel support, and use better code for mounting the nfsd filesystem. Thanks to shasta. x/libwacom-0.33-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.1157-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/gawk/gawk.SlackBuild2
-rwxr-xr-xsource/ap/pamixer/pamixer.SlackBuild2
-rw-r--r--source/kde/build/calligra2
-rw-r--r--source/kde/cmake/calligra1
-rwxr-xr-xsource/l/akonadi/akonadi.SlackBuild2
-rwxr-xr-xsource/l/boost/boost.SlackBuild2
-rwxr-xr-xsource/n/libmbim/libmbim.SlackBuild3
-rwxr-xr-xsource/n/nfs-utils/nfs-utils.SlackBuild13
-rw-r--r--source/n/nfs-utils/rc.nfsd18
9 files changed, 23 insertions, 22 deletions
diff --git a/source/a/gawk/gawk.SlackBuild b/source/a/gawk/gawk.SlackBuild
index ba35e1f4f..48dc371fe 100755
--- a/source/a/gawk/gawk.SlackBuild
+++ b/source/a/gawk/gawk.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gawk
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/ap/pamixer/pamixer.SlackBuild b/source/ap/pamixer/pamixer.SlackBuild
index 45cef570e..7492e3e0e 100755
--- a/source/ap/pamixer/pamixer.SlackBuild
+++ b/source/ap/pamixer/pamixer.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pamixer
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
diff --git a/source/kde/build/calligra b/source/kde/build/calligra
index f04c001f3..64bb6b746 100644
--- a/source/kde/build/calligra
+++ b/source/kde/build/calligra
@@ -1 +1 @@
-29
+30
diff --git a/source/kde/cmake/calligra b/source/kde/cmake/calligra
index 636fda00f..117df82a6 100644
--- a/source/kde/cmake/calligra
+++ b/source/kde/cmake/calligra
@@ -20,5 +20,6 @@ cd build
-DIHAVEPATCHEDQT:BOOL=ON \
-DOPENJPEG_INCLUDE_DIR=/usr/include/openmj2-2.1 \
-DOPENJPEG_NAMES=openmj2 \
+ -DBoost_NO_BOOST_CMAKE=ON \
..
diff --git a/source/l/akonadi/akonadi.SlackBuild b/source/l/akonadi/akonadi.SlackBuild
index 4a3471140..eb7a91116 100755
--- a/source/l/akonadi/akonadi.SlackBuild
+++ b/source/l/akonadi/akonadi.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=akonadi
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-11}
+BUILD=${BUILD:-12}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild
index c80d1788b..a17cbdbf1 100755
--- a/source/l/boost/boost.SlackBuild
+++ b/source/l/boost/boost.SlackBuild
@@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=boost
VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d _)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/n/libmbim/libmbim.SlackBuild b/source/n/libmbim/libmbim.SlackBuild
index 6066878b8..6820ad7df 100755
--- a/source/n/libmbim/libmbim.SlackBuild
+++ b/source/n/libmbim/libmbim.SlackBuild
@@ -73,6 +73,9 @@ rm -rf $PKGNAM-$VERSION
tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
cd $PKGNAM-$VERSION || exit 1
+# Remove these (if they exist) to force generating them with help2man:
+rm -f docs/man/*.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/nfs-utils/nfs-utils.SlackBuild b/source/n/nfs-utils/nfs-utils.SlackBuild
index 336ffb296..53f05d7e6 100755
--- a/source/n/nfs-utils/nfs-utils.SlackBuild
+++ b/source/n/nfs-utils/nfs-utils.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=nfs-utils
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -132,8 +132,15 @@ mkdir -p $PKG/sbin
mv $PKG/usr/sbin/rpc.statd $PKG/sbin
( cd $PKG/usr/sbin ; ln -sf ../../sbin/rpc.statd . )
-# Make recovery directory:
-mkdir -p $PKG/var/lib/nfs/v4recovery
+# Make recovery directory. The location expected may be found in
+# /proc/fs/nfsd/nfsv4recoverydir, so if that file exists we will get the
+# location from there. If not, we'll use the usual directory path.
+if [ -r /proc/fs/nfsd/nfsv4recoverydir ]; then
+ NFSV4RECOVERYDIR="$(cat /proc/fs/nfsd/nfsv4recoverydir)"
+else
+ NFSV4RECOVERYDIR="/var/lib/nfs/v4recovery"
+fi
+mkdir -p ${PKG}${NFSV4RECOVERYDIR}
# Chown /var/lib/nfs so that rpc.statd runs as rpc:rpc:
chown -R rpc:rpc $PKG/var/lib/nfs
diff --git a/source/n/nfs-utils/rc.nfsd b/source/n/nfs-utils/rc.nfsd
index 06c34b018..b73d8cc81 100644
--- a/source/n/nfs-utils/rc.nfsd
+++ b/source/n/nfs-utils/rc.nfsd
@@ -24,26 +24,16 @@ nfsd_start() {
exit # no uncommented shares in /etc/exports
fi
- # Without this directory the logs will complain with
- # 'NFSD: Unable to end grace period'.
- NFSV4RECOVERYDIR=$(cat /proc/fs/nfsd/nfsv4recoverydir)
- if [ -r /proc/fs/nfsd/nfsv4recoverydir -a ! -d "$NFSV4RECOVERYDIR" ]; then
- mkdir "$NFSV4RECOVERYDIR"
- chown -R rpc:rpc "$NFSV4RECOVERYDIR"
- fi
-
# If we do not detect nfsd support built into the kernel (or previously
# loaded as a module), we will try to load the nfsd.ko kernel module:
if [ ! -r /proc/1/net/rpc/nfsd ]; then
/sbin/modprobe nfsd
fi
- # For kernels newer than 2.4.x, use the new way of handling nfs client requests.
- if [ ! "$(/bin/uname -r | /bin/cut -f 1,2 -d .)" = "2.4" ]; then
- if grep -wq nfsd /proc/filesystems 2> /dev/null ; then
- if grep -vwq nfsd /proc/mounts 2> /dev/null ; then
- /sbin/mount -t nfsd nfsd /proc/fs/nfs 2> /dev/null
- fi
+ # Mount the nfsd filesystem:
+ if awk '$NF == "nfsd"' /proc/filesystems | grep -q . ; then
+ if ! awk '$3 == "nfsd" && $2 == "/proc/fs/nfs"' /proc/mounts | grep -q . ; then
+ /sbin/mount -t nfsd nfsd /proc/fs/nfs 2> /dev/null
fi
fi