From 41b81aa13f4aff092134749e52c5e2f665da2cdf Mon Sep 17 00:00:00 2001
From: Robby Workman
Date: Sat, 2 Jan 2016 04:30:06 -0600
Subject: network/NetworkManager-openvpn: Updated for version 1.0.8.

This now requires an "nm-openvpn" user and group as well as a
chroot directory of /var/lib/nm-openvpn/chroot/

Thanks to David Miller for the bug report and fix.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 .../NetworkManager-openvpn.SlackBuild              | 27 +++++++++++++++++++---
 .../NetworkManager-openvpn.info                    |  6 ++---
 network/NetworkManager-openvpn/README              |  4 ++++
 3 files changed, 31 insertions(+), 6 deletions(-)

(limited to 'network/NetworkManager-openvpn')

diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild b/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
index 6fc156beac..0aa8ce7daf 100644
--- a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
+++ b/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for NetworkManager
+# Slackware build script for NetworkManager-openvpn
 
-# Copyright 2010-2013  Robby Workman, Northport, Alabama, USA
+# Copyright 2010-2015  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=NetworkManager-openvpn
-VERSION=${VERSION:-0.9.8.4}
+VERSION=${VERSION:-1.0.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,6 +54,19 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Bail out if user or group isn't valid on your system
+# For slackbuilds.org, assigned nm-openvpn uid/gid are 320/320
+# See http://slackbuilds.org/uid_gid.txt
+if ! getent group nm-openvpn 2>&1 > /dev/null; then
+    echo "  You must have a \"nm-openvpn\" group to run this script."
+    echo "    # groupadd -g 320 nm-openvpn"
+    exit 1
+elif ! getent passwd nm-openvpn 2>&1 > /dev/null; then
+    echo "  You must have a \"nm-openvpn\" user to run this script."
+    echo "    # useradd -u 320 -g nm-openvpn -d /var/lib/openvpn/chroot -s /bin/false nm-openvpn"
+    exit 1
+fi
+
 set -e
 
 rm -rf $PKG
@@ -83,6 +96,14 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+# Create the chroot directory
+# From src/nm-openvpn-service-defines.h
+#    /* User name and group to run nm-openvpn-service under */
+#    #define NM_OPENVPN_USER   "nm-openvpn"
+#    #define NM_OPENVPN_GROUP  "nm-openvpn"
+#    #define NM_OPENVPN_CHROOT LOCALSTATEDIR "/lib/openvpn/chroot"
+mkdir -p $PKG/var/lib/openvpn/chroot
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.info b/network/NetworkManager-openvpn/NetworkManager-openvpn.info
index ef5e1a87c4..273f68c688 100644
--- a/network/NetworkManager-openvpn/NetworkManager-openvpn.info
+++ b/network/NetworkManager-openvpn/NetworkManager-openvpn.info
@@ -1,8 +1,8 @@
 PRGNAM="NetworkManager-openvpn"
-VERSION="0.9.8.4"
+VERSION="1.0.8"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-0.9.8.4.tar.xz"
-MD5SUM="afe11c50ce63bd251e50a2f1b20af654"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.0/NetworkManager-openvpn-1.0.8.tar.xz"
+MD5SUM="758a9951ad5e20a37c72cc7326c9c750"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/NetworkManager-openvpn/README b/network/NetworkManager-openvpn/README
index 5091714834..9062204cbb 100644
--- a/network/NetworkManager-openvpn/README
+++ b/network/NetworkManager-openvpn/README
@@ -1 +1,5 @@
 OpenVPN support for NetworkManager
+
+You will need an "nm-openvpn" user and group to use this. Suggested:
+# groupadd -g 320 nm-openvpn
+# useradd -u 320 -g nm-openvpn -d /var/lib/openvpn/chroot -s /bin/false nm-openvpn
-- 
cgit v1.2.3