Final version for 2.9.9.3

1 files changed, 19 insertions, 12 deletions

diff --git a/dansguardian/build/dansguardian.SlackBuild b/dansguardian/build/dansguardian.SlackBuild
index cf51998d..f5095fd9 100755
--- a/dansguardian/build/dansguardian.SlackBuild
+++ b/dansguardian/build/dansguardian.SlackBuild
@@ -35,7 +35,8 @@
 # 2.9.7.1-1:  08/jun/2006 by Eric Hameleers <alien@slackware.com>
 #             * Bugfix release.
 # 2.9.9.3-1:  27/Feb/2008 by Eric Hameleers <alien@slackware.com>
-#             * Update.
+#             * Update. An existing (and modified) rc script or logrotate
+#               script will no longer be overwritten.
 # 
 # Run 'sh dansguardian.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -167,9 +168,12 @@ CFLAGS="$SLKCFLAGS" \
             --libdir=/usr/lib${LIBDIRSUFFIX} \
             --localstatedir=/var \
             --sysconfdir=/etc \
+            --mandir=/usr/man \
+            --docdir=/usr/doc/$PRGNAM-$VERSION \
             --enable-pcre \
             --enable-clamd \
-             --enable-email \
+            --enable-commandline \
+            --enable-email \
             --with-proxyuser=${PROXY_USR} \
             --with-proxygroup=${PROXY_GRP} \
             --program-prefix="" \
@@ -197,12 +201,12 @@ done
 
 # Install the init script
 mkdir -p $PKG/etc/rc.d
-cp $SRCDIR/rc.dansguardian $PKG/etc/rc.d/
-chmod 644 $PKG/etc/rc.d/rc.dansguardian
+cp $SRCDIR/rc.dansguardian $PKG/etc/rc.d/rc.dansguardian.new
+chmod 644 $PKG/etc/rc.d/rc.dansguardian.new
 
 # Install the logrotate script
 mkdir -p $PKG/etc/logrotate.d
-cp $SRCDIR/logrotate.dansguardian $PKG/etc/logrotate.d/dansguardian
+cp $SRCDIR/logrotate.dansguardian $PKG/etc/logrotate.d/dansguardian.new
 
 # Add this to the doinst.sh:
 ! [ -d $PKG/install ] && mkdir -p $PKG/install
@@ -224,11 +228,20 @@ config() {
 }
 
 # Handle the configuration files
-for cf in \`find etc/dansguardian -name *.conf.new\`
+for cf in \$(find etc/dansguardian -name *.conf.new)
 do
   config \$cf
 done
 
+for file in  etc/rc.d/rc.dansguardian.new etc/logrotate.d/dansguardian.new ; do
+  if [ -e \$(dirname \$file)/\$(basename \$file .new) -a -x \$(dirname \$file)/\$(basename \$file .new) ]; then
+    chmod 755 \$file
+  else
+    chmod 644 \$file
+  fi
+  config \$file
+done
+
 # Fix permissions of the log directory:
 chown ${PROXY_USR}:${PROXY_GRP} var/log/dansguardian
 
@@ -257,9 +270,6 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc
 if [ -f $SRCDIR/doinst.sh ]; then
   cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
 fi
-if [ -f $SRCDIR/slack-required ]; then
-  cat $SRCDIR/slack-required > $PKG/install/slack-required
-fi
 
 # Build the package:
 cd $PKG
@@ -268,9 +278,6 @@ cd $OUTPUT
 md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
-if [ -f $PKG/install/slack-required ]; then
-  cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.dep
-fi
 
 # Clean up the extra stuff:
 if [ "$P1" = "--cleanup" ]; then