NetworkManager-openvpn: updated to 1.2.10

1 files changed, 28 insertions, 34 deletions

diff --git a/NetworkManager-openvpn/build/NetworkManager-openvpn.SlackBuild b/NetworkManager-openvpn/build/NetworkManager-openvpn.SlackBuild
index af8f5b8d..336f2950 100755
--- a/NetworkManager-openvpn/build/NetworkManager-openvpn.SlackBuild
+++ b/NetworkManager-openvpn/build/NetworkManager-openvpn.SlackBuild
@@ -22,7 +22,7 @@
 #   SUCH DAMAGE.
 # -----------------------------------------------------------------------------
 #
-# Modifications 2017 - Eric Hameleers, Eindhoven, NL
+# Modifications 2017, 2018 - Eric Hameleers, Eindhoven, NL
 #
 #
 # Slackware SlackBuild script 
@@ -34,8 +34,10 @@
 # Build needs: 
 # Needs:       NetworkManager
 # Changelog:   
-# 1.2.8-1:     29/Feb/2016 by Eric Hameleers <alien@slackware.com>
+# 1.2.8-1:     29/feb/2016 by Eric Hameleers <alien@slackware.com>
 #              * Created for inclusion into liveslak
+# 1.2.10-1:   029/apr/2016 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh NetworkManager-openvpn.SlackBuild' to build a Slackware package.
 # The package (.t?z) and .txt file as well as build logs are created in /tmp .
@@ -44,7 +46,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=NetworkManager-openvpn
-VERSION=${VERSION:-1.2.8}
+VERSION=${VERSION:-1.2.10}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j4 "}
 TAG=${TAG:-alien}
@@ -66,39 +68,31 @@ SRCURL="http://download.gnome.org/sources/${PRGNAM}/$(echo $VERSION |cut -d'.' -
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
 
-# You can use your own private machine.conf file to overrule machine defaults:
-if [ -e $SRCDIR/machine.conf ]; then
-  . $SRCDIR/machine.conf
-elif [ -e /etc/slackbuild/machine.conf ]; then
-  . /etc/slackbuild/machine.conf
-else
-  # Automatically determine the architecture we're building on:
-  MARCH=$( uname -m )
-  if [ -z "$ARCH" ]; then
-    case "$MARCH" in
-      i?86)    export ARCH=i486 ;;
-      armv7hl) export ARCH=$MARCH ;;
-      arm*)    export ARCH=arm ;;
-      # Unless $ARCH is already set, use uname -m for all other archs:
-      *)       export ARCH=$MARCH ;;
-    esac
-  fi
-  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
-  case "$ARCH" in
-    i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-               SLKLDFLAGS=""; LIBDIRSUFFIX=""
-               ;;
-    x86_64)    SLKCFLAGS="-O2 -fPIC"
-               SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
-               ;;
-    armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-               SLKLDFLAGS=""; LIBDIRSUFFIX=""
-               ;;
-    *)         SLKCFLAGS=${SLKCFLAGS:-"O2"}
-               SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
-               ;;
+# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
+if [ -z "$ARCH" ]; then
+  case "$MARCH" in
+    i?86)    export ARCH=i586 ;;
+    arm*)    readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && export ARCH=arm || export ARCH=armv7hl ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *)       export ARCH=$MARCH ;;
   esac
 fi
+# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+case "$ARCH" in
+  i?86)      SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  x86_64)    SLKCFLAGS="-O2 -fPIC"
+             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
+             ;;
+  armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  *)         SLKCFLAGS=${SLKCFLAGS:-"O2"}
+             SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
+             ;;
+esac
 
 case "$ARCH" in
     arm*)    TARGET=$ARCH-slackware-linux-gnueabi ;;