2 files changed, 21 insertions, 18 deletions
diff --git a/development/cvsd/cvsd.SlackBuild b/development/cvsd/cvsd.SlackBuild
index 2985b62003..d041e3d937 100644
--- a/development/cvsd/cvsd.SlackBuild
+++ b/development/cvsd/cvsd.SlackBuild
@@ -7,11 +7,18 @@
 # Based on http://slackbuilds.org/template.SlackBuild
 
 PRGNAM=cvsd
-VERSION=${VERSION:-1.0.18}
-ARCH=${ARCH:-x86}
+VERSION=${VERSION:-1.0.24}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -28,7 +35,7 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
-set -e 
+set -e
 
 # Bail out if user or group isn't valid on your system
 # For slackbuilds.org, assigned cvsd uid/gid are 233/233
@@ -52,10 +59,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -71,13 +78,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/etc/rc.d
 mv $PKG/etc/init.d/cvsd $PKG/etc/rc.d/rc.cvsd.new
@@ -90,9 +95,7 @@ sed -i 's/^#Listen \* 2401/Listen 0.0.0.0 2401/g' $PKG/etc/cvsd/cvsd.conf.new
 mkdir -p $PKG/srv/cvsd
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog* FAQ INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog* FAQ INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/cvsd/cvsd.info b/development/cvsd/cvsd.info
index a95d4c0677..edf760c310 100644
--- a/development/cvsd/cvsd.info
+++ b/development/cvsd/cvsd.info
@@ -1,8 +1,8 @@
 PRGNAM="cvsd"
-VERSION="1.0.18"
+VERSION="1.0.24"
 HOMEPAGE="http://arthurdejong.org/cvsd/"
-DOWNLOAD="http://arthurdejong.org/cvsd/cvsd-1.0.18.tar.gz"
-MD5SUM="1117d78572619597ece45c04aab75e2d"
+DOWNLOAD="http://arthurdejong.org/cvsd/cvsd-1.0.24.tar.gz"
+MD5SUM="b73ee40774c3086cb8490cdbb96ac883"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""