network/vpnc: Updated for version 0.5.1

5 files changed, 81 insertions, 33 deletions

diff --git a/network/vpnc/README b/network/vpnc/README
index 7f260ad6e9ba..eb6e58430bbf 100644
--- a/network/vpnc/README
+++ b/network/vpnc/README
@@ -1,11 +1,4 @@
-Supports IPSec (ESP) with Mode Configuration and Xauth.  Supports 
-only shared-secret IPSec authentication with Xauth,
-AES (256, 192, 128), 3DES, 1DES, MD5, SHA1,
-DH1/2/5 and IP tunneling.
-
-Homepage:  http://www.unix-ag.uni-kl.de/~massar/vpnc/
-
-This packages requires libgpg-error and libgcrypt which can be
-obtained at slackbuilds.org.  Make sure to install them
-in the order listed above.  Libgcrypt won't compile without 
-libgpg-error. 
+Supports IPSec (ESP) with Mode Configuration and Xauth.
+Supports only shared-secret IPSec authentication with 
+Xauth, AES (256, 192, 128), 3DES, 1DES, MD5, SHA1, DH1/2/5, 
+and IP tunneling.
diff --git a/network/vpnc/doinst.sh b/network/vpnc/doinst.sh
new file mode 100644
index 000000000000..4be223a1c12f
--- /dev/null
+++ b/network/vpnc/doinst.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/vpnc/default.conf.new
+config etc/vpnc/vpnc-script.new
+
diff --git a/network/vpnc/slack-desc b/network/vpnc/slack-desc
index b981f8bf01b5..12f6cbedd6a8 100644
--- a/network/vpnc/slack-desc
+++ b/network/vpnc/slack-desc
@@ -1,12 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
     |-----handy-ruler------------------------------------------------------|
+vpnc: VPNC (VPN client compatible with Cisco's EasyVPN equipment)
 vpnc:
-vpnc: A VPN client compatible with Cisco's EasyVPN equipment.
+vpnc: Supports IPSec (ESP) with Mode Configuration and Xauth.
+vpnc: Supports only shared-secret IPSec authentication with Xauth,
+vpnc: AES (256, 192, 128), 3DES, 1DES, MD5, SHA1, DH1/2/5, and 
+vpnc: IP tunneling.
 vpnc:
-vpnc: Supports IPSec (ESP) with Mode Configuration and Xauth.  Supports 
-vpnc: only shared-secret IPSec authentication with Xauth,
-vpnc: AES (256, 192, 128), 3DES, 1DES, MD5, SHA1,
-vpnc: DH1/2/5 and IP tunneling.
+vpnc: Homepage:  http://www.unix-ag.uni-kl.de/~massar/vpnc/
 vpnc:
 vpnc:
-vpnc: Homepage:  http://www.unix-ag.uni-kl.de/~massar/vpnc/
 vpnc:
diff --git a/network/vpnc/vpnc.SlackBuild b/network/vpnc/vpnc.SlackBuild
index 8278b2ae8fb1..961e1a03ef7b 100644
--- a/network/vpnc/vpnc.SlackBuild
+++ b/network/vpnc/vpnc.SlackBuild
@@ -1,15 +1,42 @@
-#!/bin/bash
+#!/bin/sh
 
 # Slackware build script for vpnc
-# Written by Alex Lysenka <me@alkos333.net>
-# Licensed under GNU GPL v2
+
+# Copyright (c) 2007  Alex Lysenka <me@alkos333.net>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+#   copyright notice, this list of conditions and the following disclaimer
+#   in the documentation and/or other materials provided with the
+#   distribution.
+# * Neither the name of the {company} nor the names of its
+#   contributors may be used to endorse or promote products derived from
+#   this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by the SlackBuild Project.
 
 set -e
 
 PRGNAM=vpnc
-VERSION=0.4.0
+VERSION=0.5.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -18,9 +45,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-
 if [ "$ARCH" = "i486" ]; then
-	SLKCFLAGS="-O2 -march=i486 -mtune=i868"
+	SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
 	SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
@@ -29,13 +55,13 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -zxvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-make || exit 1
-make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man || exit 1
+make CFLAGS="$SLKCFLAGS" 
+make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -47,13 +73,17 @@ cp VERSION COPYING README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
-
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
 )
 
+# Let's not clobber config files
+mv $PKG/etc/vpnc/default.conf $PKG/etc/vpnc/default.conf.new
+mv $PKG/etc/vpnc/vpnc-script $PKG/etc/vpnc/vpnc-script.new
+
 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.tgz
diff --git a/network/vpnc/vpnc.info b/network/vpnc/vpnc.info
index 776bcc188b14..0241693eb756 100644
--- a/network/vpnc/vpnc.info
+++ b/network/vpnc/vpnc.info
@@ -1,8 +1,8 @@
 PRGNAM="vpnc"
-VERSION="0.4.0"
+VERSION="0.5.1"
 HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
-DOWNLOAD="http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.4.0.tar.gz"
-MD5SUM="604807e7dd90fce00a4e2344ee29c76d"
-MAINTAINER="Alex Lysenka"
+DOWNLOAD="http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.5.1.tar.gz"
+MD5SUM="7a8e94dbe94f39a4fd89b72e0125f66f"
+MAINTAINER="alkos333"
 EMAIL="me@alkos333.net"
-APPROVED="BP{k}"
+APPROVED="rworkman"