From a664233a2d2c15445ddc6034a5e3745f64354078 Mon Sep 17 00:00:00 2001
From: Andrew Leary <ajleary@sourceforge.net>
Date: Wed, 20 Jul 2016 18:44:16 -0400
Subject: [PATCH] Fix first time installations on Ubuntu 12.04+

---
 ChangeLog    | 10 ++++++++++
 SETUP.sh     |  4 ++++
 configure.ac |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7b0f9e66..4c5cdf54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+v1.0.6.8	20-Jul-2016 - Andrew Leary
+
+		1.  Fixed the SETUP.sh script to handle installing on fresh
+		installations of Ubuntu 12.04+.  These versions do not install
+		an admin group, which MBSE uses to enable the mbse user to run
+		sudo.  SETUP.sh will now add the admin group if it doesn't
+		exist, to prevent useradd failing to create the mbse user.
+		This change only affects first time installations on Ubuntu
+		12.04 or later.
+
 v1.0.6.7	28-Jun-2016 - Andrew Leary
 
 		1.  Added the ability to disable cross-zone SEEN-BY
diff --git a/SETUP.sh b/SETUP.sh
index af91f9ce..b6f2c30e 100644
--- a/SETUP.sh
+++ b/SETUP.sh
@@ -299,6 +299,10 @@ if [ "$OSTYPE" = "Linux" ]; then
     fi
     if [ "$DISTNAME" = "Ubuntu" ]; then
 	GRPS=${GRPS}",adm,admin"
+	if ! grep -q ^admin /etc/group ; then
+	    # Fresh install of Ubuntu 12.04+ has no admin group; we need it to enable use of sudo.
+	    $PW groupadd admin
+	fi
     fi
     if grep -q ^dialout /etc/group ; then
 	GRPS=${GRPS}",dialout"
diff --git a/configure.ac b/configure.ac
index 2681ff84..64c09c3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AC_SUBST(SUBDIRS)
 PACKAGE="mbsebbs"
 MAJOR="1"
 MINOR="0"
-REVISION="6.7"
+REVISION="6.8"
 VERSION="$MAJOR.$MINOR.$REVISION"
 COPYRIGHT="Copyright (C) 1997-2016 Michiel Broek, All Rights Reserved"
 SHORTRIGHT="Copyright (C) 1997-2016 M. Broek"