5 files changed, 67 insertions, 23 deletions
diff --git a/system/loggedfs/README b/system/loggedfs/README
index 829d936be5..90617bc62f 100644
--- a/system/loggedfs/README
+++ b/system/loggedfs/README
@@ -1,16 +1,21 @@
 loggedfs (filesystem monitoring with FUSE)
 
 LoggedFS is a fuse-based filesystem which can log every operation that
-happens in it. LoggedFS only sends a message to syslog (or a file) when
-called by fuse and then let the real filesystem do the rest of the job.
+happens in it. LoggedFS only sends a message to syslog (or a file)
+when called by fuse and then lets the real filesystem do the rest of
+the job.
+
+There is a sample config file installed as /etc/loggedfs.xml, for use
+with the -c option.
 
 Note: loggedfs doesn't cross filesystem boundaries. If you e.g. have
-/usr/local mounted as a separate partition, monitoring /usr won't also
-monitor /usr/local (though you can always run another instance of loggedfs
-in that case).
+/usr/local mounted as a separate partition, monitoring /usr won't
+also monitor /usr/local (though you can always run another instance of
+loggedfs in that case).
 
-Slackware note: since Slackware's /etc/mtab is a regular file (not a
-symlink to /proc/mounts), killing a loggedfs process causes its /etc/mtab
-entry to stay. This makes it look like the filesystem is still mounted,
-though it actually isn't. To avoid this, always use "fusermount -u"
-to cleanly umount the fs, which will also make the loggedfs process exit.
+Slackware note: since Slackware's /etc/mtab is a regular file (not
+a symlink to /proc/mounts), killing a loggedfs process causes its
+/etc/mtab entry to stay. This makes it look like the filesystem is
+still mounted, though it actually isn't. To avoid this, always use
+"fusermount -u" to cleanly umount the fs, which will also make the
+loggedfs process exit.
diff --git a/system/loggedfs/loggedfs.SlackBuild b/system/loggedfs/loggedfs.SlackBuild
index 66432962a5..3e7349dad1 100644
--- a/system/loggedfs/loggedfs.SlackBuild
+++ b/system/loggedfs/loggedfs.SlackBuild
@@ -1,17 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for loggedfs
 
-# 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.
 
+# 20230423 bkw: this got removed 2 years ago because it depended on rlog,
+# which got removed... only, this didn't actually depend on rlog. Re-adding.
+# BUILD=2 because I added a small patch to fix the grammar in the man page.
+
 # 20180612 bkw: updated for v0.9. script will no longer build old version.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=loggedfs
 VERSION=${VERSION:-0.9}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -21,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}
@@ -49,11 +60,10 @@ 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 {} \+
+
+patch -p1 < $CWD/manpage_grammar.diff
 
 sed -i "s,-Wall,& $SLKCFLAGS," Makefile
 
@@ -74,4 +84,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/loggedfs/loggedfs.info b/system/loggedfs/loggedfs.info
index aae8a8371f..0d9afac038 100644
--- a/system/loggedfs/loggedfs.info
+++ b/system/loggedfs/loggedfs.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/rflament/loggedfs/archive/loggedfs-0.9/loggedfs-log
 MD5SUM="d04761535b471a15b7bd4475d0fb3483"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="rlog"
+REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/loggedfs/manpage_grammar.diff b/system/loggedfs/manpage_grammar.diff
new file mode 100644
index 0000000000..a6166133fd
--- /dev/null
+++ b/system/loggedfs/manpage_grammar.diff
@@ -0,0 +1,29 @@
+diff -Naur loggedfs-loggedfs-0.9/loggedfs.1 loggedfs-loggedfs-0.9.patched/loggedfs.1
+--- loggedfs-loggedfs-0.9/loggedfs.1	2018-03-26 04:34:32.000000000 -0400
++++ loggedfs-loggedfs-0.9.patched/loggedfs.1	2023-04-23 02:34:49.572040899 -0400
+@@ -11,7 +11,7 @@
+ .B ...
+ .SH DESCRIPTION
+ .B LoggedFS 
+-is a transparent fuse-filesystem which allows to log every operations that happens in the backend filesystem. Logs can be written to syslog, to a file, or to the standard output. LoggedFS comes with a XML configuration file in which you can choose exactly what you want to log and what you don't want to log. You can add filters on users, operations (open, read, write, chown, chmod, etc.), filenames , and return code. Filename's filters are regular expressions.
++is a transparent fuse-filesystem which allows logging every operation that happens in the backend filesystem. Logs can be written to syslog, to a file, or to the standard output. LoggedFS comes with an XML configuration file in which you can choose exactly what you want to log and what you don't want to log. You can add filters on users, operations (open, read, write, chown, chmod, etc.), filenames, and return codes. Filename filters are regular expressions.
+ .SH OPTIONS
+ .IP -f
+ Do not start as a daemon. Write logs to stdout if no log file is specified.
+@@ -22,13 +22,13 @@
+ .IP "-l log-file"
+ Use the
+ .I log-file
+-to write logs to. If no log file is specified then logs are only written to syslog or to stdout, depending on -f.
++to write logs to. If no log file is specified, then logs are only written to syslog or to stdout, depending on -f.
+ .IP -p
+-Allow every users to see the new loggedfs. 
++Allow every user to see the new loggedfs.
+ .SH FILES
+ .I /etc/fuse.conf
+ .RS
+-The system wide configuration file.
++The system wide FUSE configuration file.
+ .RE
+ .SH AUTHOR
+ Remi Flament <remipouak@gmail.com>
diff --git a/system/loggedfs/slack-desc b/system/loggedfs/slack-desc
index 7ef4c59139..6df7a4af7c 100644
--- a/system/loggedfs/slack-desc
+++ b/system/loggedfs/slack-desc
@@ -10,7 +10,7 @@ loggedfs: loggedfs (filesystem monitoring with FUSE)
 loggedfs:
 loggedfs: LoggedFS is a fuse-based filesystem which can log every operation
 loggedfs: that happens in it. Fuse does almost everything. LoggedFS only
-loggedfs: sends a message to syslog when called by fuse and then let the real
+loggedfs: sends a message to syslog when called by fuse and then lets the real
 loggedfs: filesystem do the rest of the job.
 loggedfs:
 loggedfs: