summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-12-16 23:13:10 +0000
committerEric Hameleers <alien@slackware.com>2019-12-17 08:59:48 +0100
commitf36e13b41f026660b357f6885075eb31ae8f2ae1 (patch)
tree54aca9fe05ab01f64c4d91d5055889a210be18a0 /source
parent3be7c5fe3b6a961dac28eb856ed2d8ca0bd0e2c9 (diff)
downloadcurrent-f36e13b41f026660b357f6885075eb31ae8f2ae1.tar.gz
Mon Dec 16 23:13:10 UTC 201920191216231310
a/usb_modeswitch-2.5.2-x86_64-2.txz: Rebuilt. Seems there's a regression in usb_modeswitch-2.6.0, so let's revert to usb_modeswitch-2.5.2 but keep the latest usb-modeswitch-data-20191128. Thanks to Lockywolf. l/fuse3-3.9.0-x86_64-2.txz: Rebuilt. Install fuse.conf as fuse.conf.new. This won't prevent an existing config file from being overwritten with this upgrade, but it will prevent that from happening again moving forward. Thanks to chrisVV.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/usb_modeswitch/usb_modeswitch.SlackBuild18
-rw-r--r--source/l/fuse3/doinst.sh2
-rwxr-xr-xsource/l/fuse3/fuse3.SlackBuild5
-rwxr-xr-xsource/l/libical/libical.SlackBuild2
-rw-r--r--source/n/samba/samba.url4
5 files changed, 21 insertions, 10 deletions
diff --git a/source/a/usb_modeswitch/usb_modeswitch.SlackBuild b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild
index a75620e8..97392fc1 100755
--- a/source/a/usb_modeswitch/usb_modeswitch.SlackBuild
+++ b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild
@@ -1,6 +1,8 @@
#!/bin/bash
-# Copyright 2010, 2012, 2013, 2015, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Slackware build script for usb_modeswitch.
+
+# Copyright 2010, 2012, 2013, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
# Copyright 2010 David Somero, Athens, TN, USA
# All rights reserved.
#
@@ -24,9 +26,9 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=usb_modeswitch
-VERSION=${VERSION:-2.6.0}
+VERSION=${VERSION:-2.5.2}
DATAVER=${DATAVER:-20191128}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -70,7 +72,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf $SRCPKGNAM-$VERSION
-tar xvf $CWD/$SRCPKGNAM-$VERSION.tar.?z || exit 1
+tar xvf $CWD/$SRCPKGNAM-$VERSION.tar.?z* || exit 1
cd $SRCPKGNAM-$VERSION || exit 1
chown -R root:root .
find . \
@@ -80,6 +82,8 @@ find . \
-exec chmod 644 {} \+
make clean || exit 1
+# "make static" uses the embedded "jim" Tcl interpreter
+make static || exit 1
make \
DESTDIR=$PKG \
@@ -112,6 +116,10 @@ cp -a \
$PKG/usr/doc/$PKGNAM-$VERSION
# http://www.draisberghof.de/usb_modeswitch/device_reference.txt.gz
zcat $CWD/device_reference.txt.gz > $PKG/usr/doc/$PKGNAM-$VERSION/device_reference.txt
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/jim
+cp -a \
+ jim/{AUTHORS,LICENSE,README*} \
+ $PKG/usr/doc/$PKGNAM-$VERSION/jim
# If there's a ChangeLog, installing at least part of the recent history
# is useful, but don't let it get totally out of control:
@@ -124,7 +132,7 @@ fi
# Now, install the data pack:
cd $TMP
rm -rf usb-modeswitch-data-${DATAVER}
-tar xvf $CWD/usb-modeswitch-data-${DATAVER}.tar.?z || exit 1
+tar xvf $CWD/usb-modeswitch-data-${DATAVER}.tar.?z* || exit 1
cd usb-modeswitch-data-${DATAVER} || exit 1
chown -R root:root .
find . \
diff --git a/source/l/fuse3/doinst.sh b/source/l/fuse3/doinst.sh
index f87ea43b..0369602a 100644
--- a/source/l/fuse3/doinst.sh
+++ b/source/l/fuse3/doinst.sh
@@ -21,4 +21,4 @@ if [ -e etc/rc.d/rc.fuse3 ]; then
fi
config etc/rc.d/rc.fuse3.new
-
+config etc/fuse.conf.new
diff --git a/source/l/fuse3/fuse3.SlackBuild b/source/l/fuse3/fuse3.SlackBuild
index 054179b2..2b5e3ab4 100755
--- a/source/l/fuse3/fuse3.SlackBuild
+++ b/source/l/fuse3/fuse3.SlackBuild
@@ -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) "}
@@ -110,6 +110,9 @@ cd ..
# Don't ship .la files:
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+# Move /etc/fuse.conf to /etc/fuse.conf.new:
+mv $PKG/etc/fuse.conf $PKG/etc/fuse.conf.new
+
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/l/libical/libical.SlackBuild b/source/l/libical/libical.SlackBuild
index e4126d5c..9fea6a54 100755
--- a/source/l/libical/libical.SlackBuild
+++ b/source/l/libical/libical.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libical
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url
index d20f67a8..89890af2 100644
--- a/source/n/samba/samba.url
+++ b/source/n/samba/samba.url
@@ -1,2 +1,2 @@
-https://download.samba.org/pub/samba/stable/samba-4.11.3.tar.gz
-https://download.samba.org/pub/samba/stable/samba-4.11.3.tar.asc
+https://download.samba.org/pub/samba/stable/samba-4.11.4.tar.gz
+https://download.samba.org/pub/samba/stable/samba-4.11.4.tar.asc