4 files changed, 44 insertions, 31 deletions
diff --git a/system/u3-tool/README b/system/u3-tool/README
index a93a75dc7d..97ca32fe15 100644
--- a/system/u3-tool/README
+++ b/system/u3-tool/README
@@ -3,13 +3,13 @@ u3-tool (utility for U3 flash drives, including SanDisk and Verbatim)
 Tool for controlling USB flash devices that confirm to the U3
 specifications. This program can control the following features:
 
-Replacing of CD image
-Changing of virtual CD allocated size and completely removing it
-Enabling and disabling Security
-Unlocking and changing password of secured U3 device
-Obtaining various device information
+- Replacing the virtual CD image
+- Changing the virtual CD's allocated size, or completely removing it
+- Enabling and disabling device security (password protection).
+- Unlocking and changing the password password of secured U3 device
+- Obtaining various device information
 
-In general all U3 USB flash devices should be supported. A list of devices
-that are reported to work with this tool is available in the forum:
+In general all U3 USB flash devices should be supported. A list of
+devices that are reported to work with this tool is available here:
 
-http://sourceforge.net/projects/u3-tool/forums/forum/746414/topic/3559573
+https://sourceforge.net/projects/u3-tool/forums/forum/746414/topic/3559573
diff --git a/system/u3-tool/slack-desc b/system/u3-tool/slack-desc
index 32e8ff90a2..f590b7acb5 100644
--- a/system/u3-tool/slack-desc
+++ b/system/u3-tool/slack-desc
@@ -11,9 +11,9 @@ u3-tool:
 u3-tool: Tool for controlling USB flash devices that confirm to the U3
 u3-tool: specifications. This program can control the following features:
 u3-tool:
-u3-tool: Replacing of CD image
-u3-tool: Changing of virtual CD allocated size and completely removing it
-u3-tool: Enabling and disabling Security
-u3-tool: Unlocking and changing password of secured U3 device
-u3-tool: Obtaining various device information
+u3-tool: - Replacing the virtual CD image
+u3-tool: - Changing the virtual CD's allocated size, or completely removing it
+u3-tool: - Enabling and disabling device security (password protection).
+u3-tool: - Unlocking and changing the password password of secured U3 device
+u3-tool: - Obtaining various device information
 u3-tool:
diff --git a/system/u3-tool/u3-tool.SlackBuild b/system/u3-tool/u3-tool.SlackBuild
index 42aa058f62..b7475f95e1 100644
--- a/system/u3-tool/u3-tool.SlackBuild
+++ b/system/u3-tool/u3-tool.SlackBuild
@@ -1,15 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for u3-tool
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210822 bkw:
+# - new upstream, which released a 1.0 in 2012. old, but not as old as
+#   the 0.3 version from 2009.
+# - include commands.txt in the doc dir.
+# - fix grammar issues with README and slack-desc.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=u3-tool
-VERSION=${VERSION:-0.3}
+VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +28,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -43,15 +56,14 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+autoreconf -ivf
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -70,10 +82,11 @@ gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog NEWS TODO README $PKG/usr/doc/$PRGNAM-$VERSION
+cat doc/commands.txt > $PKG/usr/doc/$PRGNAM-$VERSION/commands.txt
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/u3-tool/u3-tool.info b/system/u3-tool/u3-tool.info
index 6905e8ff6f..8e608255e5 100644
--- a/system/u3-tool/u3-tool.info
+++ b/system/u3-tool/u3-tool.info
@@ -1,10 +1,10 @@
 PRGNAM="u3-tool"
-VERSION="0.3"
-HOMEPAGE="http://u3-tool.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/u3-tool/u3-tool/0.3/u3-tool-0.3.tar.gz"
-MD5SUM="4c7268614b30ba118f6dea6c85137f43"
+VERSION="1.0"
+HOMEPAGE="https://github.com/marcusrugger/u3-tool/"
+DOWNLOAD="https://github.com/marcusrugger/u3-tool/archive/u3-tool-1.0/u3-tool-u3-tool-1.0.tar.gz"
+MD5SUM="f17d9917a2a6edf7c5988746c72549f4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"