1 files changed, 44 insertions, 26 deletions
diff --git a/network/radicale/radicale.SlackBuild b/network/radicale/radicale.SlackBuild
index 1bbdd2b7ea..a08dc21dfe 100644
--- a/network/radicale/radicale.SlackBuild
+++ b/network/radicale/radicale.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for radicale
 
-# Copyright 2016-2017  Johannes Schoepfer, Germany
+# Copyright 2022 Ruben Schuller
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=radicale
-VERSION=${VERSION:-1.1.6}
+VERSION=${VERSION:-3.1.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -50,6 +50,9 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+RADICALE_GID=${RADICALE_GID:-375}
+RADICALE_UID=${RADICALE_UID:-375}
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -66,11 +69,28 @@ fi
 
 set -e
 
+if ! getent passwd radicale 1>/dev/null 2>/dev/null; then
+cat << EOF
+  You must have a radicale user to run this script
+
+  # groupadd -g $RADICALE_GID radicale
+  # useradd -u $RADICALE_UID -d /var/lib/$PRGNAM -s /bin/false -g radicale radicale
+EOF
+  exit 1
+elif ! getent group radicale 1>/dev/null 2>/dev/null; then
+cat << EOF
+  You must have a radicale group to run this script
+
+  # groupadd -g $RADICALE_GID radicale
+EOF
+  exit 1
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf Radicale-$VERSION
-tar vxf $CWD/Radicale-$VERSION.tar.gz
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/Radicale-$VERSION.tar.gz || tar xvf v$VERSION.tar.gz
 cd Radicale-$VERSION
 chown -R root:root .
 find -L . \
@@ -79,33 +99,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --prefix=/usr --root=$PKG
-install -m0644 -D config $PKG/etc/radicale/config.new
-install -m0644 logging $PKG/etc/radicale/logging.new
-install -m0644 -D radicale.wsgi $PKG/var/lib/radicale/radicale.wsgi
-install -m0644 radicale.fcgi $PKG/var/lib/radicale/radicale.fcgi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp COPYING README schema.sql config logging $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/etc/logrotate.d
-cat << EOF > $PKG/etc/logrotate.d/radicale
-/var/log/radicale {
-  rotate 10
-  notifempty
-  size=1M
-  compress
-  delaycompress
-}
-EOF
+python3 -m build --wheel --no-isolation
+python3 -m installer --destdir "$PKG" dist/*.whl
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+install -v -m 0755 -g radicale -o radicale -d $PKG/etc/radicale
+install -v -m 0755 -g radicale -o radicale -d $PKG/var/lib/radicale
+install -v -m 0644 -g radicale -o radicale config $PKG/etc/radicale/config.new
+install -v -m 0644 -g radicale -o radicale rights $PKG/etc/radicale/rights.new
+install -v -m 0755 -g root -o root -d $PKG/etc/rc.d
+install -g root -o root -m 0644 $CWD/rc.radicale $PKG/etc/rc.d/rc.radicale.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  radicale.wsgi \
+  Dockerfile \
+  DOCUMENTATION.md \
+  README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE