New release.

1 files changed, 17 insertions, 18 deletions

diff --git a/vnc/build/vnc.SlackBuild b/vnc/build/vnc.SlackBuild
index c8e24f1b..ac85bf09 100755
--- a/vnc/build/vnc.SlackBuild
+++ b/vnc/build/vnc.SlackBuild
@@ -4,8 +4,8 @@
 #
 # Slackware SlackBuild script 
 # ===========================
-# By:        Eric Hameleers <alien@sox.homeip.net>
-# For:       RealVNC
+# By:        Eric Hameleers <alien@slackware.com>
+# For:       vnc
 # URL:       http://www.realvnc.com/
 # Needs:     Fairly recent version of X
 # Changelog:
@@ -18,6 +18,8 @@
 #            * Somehow the permissions of the package were messed up, so that
 #              after installation,. / was group-writable and Sendmail
 #              refused to run. Fixed this in _vnc.tar.gz.
+# 4.1.2-1:   21/nov/2006 by Eric Hameleers
+#            * The 4.1.2 is a security fix.
 #
 # -----------------------------------------------------------------------------
 # 
@@ -36,11 +38,11 @@ if [ "$TMP" = "" ]; then
 fi
 
 PRGNAM=vnc
-VERSION=4_1_1
-DOCVER=4.0
+SRCVER=4_1_2
+VERSION=4.1.2
 SUB=x86_linux
 ARCH=i486
-BUILD=3
+BUILD=1
 
 PKG=$TMP/package-$PRGNAM
 
@@ -68,20 +70,20 @@ explodepkg $CWD/_$PRGNAM.tar.gz
 cd $TMP/tmp-$PRGNAM
 
 #
-# Extract the tar ball, patch and modify
+# Extract the tarball, patch and modify
 #
-echo "Extracting the program tarball..."
-tar -xzvf $CWD/${PRGNAM}-${VERSION}-${SUB}.tar.gz
+echo "Extracting the program source archive(s)..."
+tar -xzvf $CWD/${PRGNAM}-${SRCVER}-${SUB}.tar.gz
 
-cd ${PRGNAM}-${VERSION}-${SUB}
+mv ${PRGNAM}-${SRCVER}-${SUB} ${PRGNAM}-${VERSION}
+cd ${PRGNAM}-${VERSION}
 
-chown -R root.root *
+chown -R root:root *
 
 #cp -a Xvnc vncconnect vncpasswd vncserver vncviewer $PKG/usr/bin
 #chmod 555 $PKG/usr/bin/*
 #chgrp bin $PKG/usr/bin/*
 ./vncinstall $PKG/usr/bin $PKG/usr/man $PKG/usr/X11R6/lib/modules/extensions
-chown root:bin $PKG/usr/bin/*
 
 cp -a java/* $PKG/usr/share/vnc/classes/
 
@@ -93,16 +95,13 @@ chmod 444 $PKG/usr/lib/X11/app-defaults/Vncviewer
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 
-# Unpack the separate documentation tarball
-tar -C $TMP/tmp-$PRGNAM -xzvf $CWD/$PRGNAM-$DOCVER-documentation.tar.gz
-mv $TMP/tmp-$PRGNAM/$PRGNAM-$DOCVER-documentation/* $PKG/usr/doc/$PRGNAM-$VERSION/
 cp -a LICENCE.txt README $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/install/README.1st $PKG/usr/doc/$PRGNAM-$VERSION
-chown -R root.root $PKG/usr/doc/$PRGNAM-$VERSION/*
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION/*
 chmod -R a-ws $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 # Compress the man pages
-gzip -9f $PKG/usr/man/*/*
+find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
 
 #
 # Patch vncserver :
@@ -132,13 +131,13 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz \
+makepkg --linkadd y --chown n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz 2>&1 \
   | tee $CWD/makepkg.log
 (cd $TMP && \
   md5sum $PRGNAM-$VERSION-$ARCH-$BUILD.tgz > \
   $PRGNAM-$VERSION-$ARCH-$BUILD.tgz.md5
 )
-cat $CWD/slack-desc | grep "^${PRGNAM}" > \
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > \
   $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txt