1 files changed, 22 insertions, 8 deletions
diff --git a/network/cherokee/cherokee.SlackBuild b/network/cherokee/cherokee.SlackBuild
index ee57d2b98a..207850d16f 100644
--- a/network/cherokee/cherokee.SlackBuild
+++ b/network/cherokee/cherokee.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cherokee
 
 # Written by Pablo Hernan Saro (pablosaro@gmail.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cherokee
-VERSION=${VERSION:-20131105_d91c9c1}
+VERSION=${VERSION:-20230111_ce1ca8a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+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}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -86,6 +96,8 @@ 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 {} \;
 
+sed -i "s|\[2\.71|[2.69|" configure.ac m4/{nls,po,progtest}.m4
+
 # Apply all the patches in $CWD/patches (thanks Gentoo)
 for patch in $CWD/patches/* ; do
   patch -p1 < $patch
@@ -107,7 +119,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-mysql=$MYSQL \
   --enable-ipv6=$IPV6 \
   --enable-admin=$ADMIN \
-  --disable-pam \
+  --enable-pam \
   --disable-static \
   --enable-trace=$TRACE
 
@@ -130,9 +142,11 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 install -D -m 0755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 mv $PKG/etc/cherokee/cherokee.conf $PKG/etc/cherokee/cherokee.conf.new
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 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