1 files changed, 52 insertions, 26 deletions
diff --git a/source/a/sysklogd/sysklogd.SlackBuild b/source/a/sysklogd/sysklogd.SlackBuild
index 110659e4c..a5cd75e26 100755
--- a/source/a/sysklogd/sysklogd.SlackBuild
+++ b/source/a/sysklogd/sysklogd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.4.1
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-10}
+VERSION=1.5
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:--j6}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -31,17 +40,10 @@ PKG=$TMP/package-sysklogd
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
-
-# Explode the package framework:
-cd $PKG
-explodepkg $CWD/_sysklogd.tar.gz
-
 cd $TMP
 rm -rf sysklogd-$VERSION
-tar xzvf $CWD/sysklogd-$VERSION.tar.gz || exit 1
+tar xvf $CWD/sysklogd-$VERSION.tar.gz || exit 1
 cd sysklogd-$VERSION
-zcat $CWD/sysklogd_1.4.1-20.diff.gz | patch -p1 --verbose || exit 1
-#zcat $CWD/sysklogd-1.4.1-owl-syslogd-crunch_list.diff.gz | patch -p1 --verbose || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -49,29 +51,53 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-make -j4 || exit 1
-make syslog_tst || exit 1
+# Use memmove() instead of strcpy() in syslogd.c
+zcat $CWD/use_memmove_not_strcpy.diff.gz | patch -p1 --verbose || exit 1
+
+make all syslog_tst $NUMJOBS || make || exit 1
+
+mkdir -p $PKG/usr/sbin
 cat klogd > $PKG/usr/sbin/klogd
 cat syslog_tst > $PKG/usr/sbin/syslog_tst
 cat syslogd > $PKG/usr/sbin/syslogd
-for page in klogd.8 sysklogd.8 ; do
-  cat $page | gzip -9c > $PKG/usr/man/man8/$page.gz
-done
+chmod 0755 $PKG/usr/sbin/*
+
+mkdir -p $PKG/usr/man/man{5,8}
 cat syslog.conf.5 | gzip -9c > $PKG/usr/man/man5/syslog.conf.5.gz
+cat klogd.8 | gzip -9c > $PKG/usr/man/man8/klogd.8.gz
+cat sysklogd.8 | gzip -9c > $PKG/usr/man/man8/sysklogd.8.gz
+( cd $PKG/usr/man/man8 ; ln -s sysklogd.8.gz syslogd.8.gz )
+
+mkdir -p $PKG/etc
+cat $CWD/config/syslog.conf.new > $PKG/etc/syslog.conf.new
+
+mkdir -p $PKG/etc/logrotate.d
+cat $CWD/config/syslog.logrotate > $PKG/etc/logrotate.d/syslog.new
+
+mkdir -p $PKG/etc/rc.d
+cat $CWD/config/rc.syslog.new > $PKG/etc/rc.d/rc.syslog.new
+chmod 0755 $PKG/etc/rc.d/rc.syslog.new
+
+mkdir -p $PKG/var/log
+for i in cron debug maillog messages secure spooler syslog ; 
+  do touch $PKG/var/log/$i.new ;
+done
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
 mkdir -p $PKG/usr/doc/sysklogd-$VERSION
-cp -a ANNOUNCE CHANGES COPYING INSTALL MANIFEST NEWS README.1st \
-  README.linux $PKG/usr/doc/sysklogd-$VERSION
-chmod 644 $PKG/usr/doc/sysklogd-$VERSION/*
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+cp -a \
+  ANNOUNCE CHANGES COPYING INSTALL MANIFEST NEWS README.1st README.linux \
+  $PKG/usr/doc/sysklogd-$VERSION
+chmod 0644 $PKG/usr/doc/sysklogd-$VERSION/*
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Build the package:
 cd $PKG
-makepkg -l y -c n $TMP/sysklogd-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/sysklogd-$VERSION-$ARCH-$BUILD.txz
 
 # Clean up the extra stuff:
 if [ "$1" = "--cleanup" ]; then