From 9393095d0adcdfc7d882fd505fcab2c708ed0936 Mon Sep 17 00:00:00 2001 From: Andrew Leary Date: Sun, 18 Jun 2017 19:45:33 -0400 Subject: [PATCH] Bring Git repository up to 1.0.7.2 level. --- ChangeLog | 11 +++++++++++ SETUP.sh | 8 ++++++++ configure | 2 +- configure.ac | 2 +- mbsebbs/door.c | 5 +++++ 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c49cbd51..33d8230e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +v1.0.7.2 18-Jun-2017 - Andrew Leary + + 1. Fixed first time installation on CentOS 7, caused by the + distribution no longer creating a uucp group by default. + +v1.0.7.1 14-Apr-2017 - Andrew Leary + + 1. Added /U switch on door optional data line; replaced + with the current user's home directory. Requested by Sean + Dennis. + v1.0.7 24-Mar-2017 - Andrew Leary Release version of v1.0.6.16 for wide distribution. diff --git a/SETUP.sh b/SETUP.sh index b6f2c30e..bf6b0b97 100644 --- a/SETUP.sh +++ b/SETUP.sh @@ -100,6 +100,10 @@ if [ "$OSTYPE" = "Linux" ]; then DISTNAME="Mandrake" # Format: Linux Mandrake release 8.0 (Cooker) for i586 DISTVERS=$( cat /etc/mandrake-release | awk '{ print $4 }' ) + elif [ -f /etc/centos-release ]; then + DISTNAME="CentOS" + # Format: CentOS release 7.3.1611 (AltArch) + DISTVERS=$( cat /etc/centos-release | awk '{ print $3 }' ) elif [ -f /etc/redhat-release ]; then DISTNAME="RedHat" if grep -q e-smith /etc/redhat-release ; then @@ -294,6 +298,10 @@ echo -n ", user 'mbse' $OSTYPE " if [ "$OSTYPE" = "Linux" ]; then # Different distros have different needs... GRPS="uucp" + if ! grep -q ^uucp /etc/group ; then + # Add the uucp group if it doesn't exist. + $PW groupadd uucp + fi if grep -q ^wheel /etc/group ; then GRPS=${GRPS}",wheel" fi diff --git a/configure b/configure index 2b7f29ec..5d487ca8 100755 --- a/configure +++ b/configure @@ -2309,7 +2309,7 @@ SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbutils mbnntp mbtask mbsetup unix lang PACKAGE="mbsebbs" MAJOR="1" MINOR="0" -REVISION="7" +REVISION="7.2" VERSION="$MAJOR.$MINOR.$REVISION" COPYRIGHT="Copyright (C) 1997-2017 MBSE Development Team, All Rights Reserved" SHORTRIGHT="Copyright (C) 1997-2017 MBSE DevTm" diff --git a/configure.ac b/configure.ac index b9bd3a66..2f642734 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_SUBST(SUBDIRS) PACKAGE="mbsebbs" MAJOR="1" MINOR="0" -REVISION="7" +REVISION="7.2" VERSION="$MAJOR.$MINOR.$REVISION" COPYRIGHT="Copyright (C) 1997-2017 MBSE Development Team, All Rights Reserved" SHORTRIGHT="Copyright (C) 1997-2017 MBSE DevTm" diff --git a/mbsebbs/door.c b/mbsebbs/door.c index 3dde3751..7864be39 100644 --- a/mbsebbs/door.c +++ b/mbsebbs/door.c @@ -152,6 +152,11 @@ void ExtDoor(char *Program, int NoDoorsys, int Y2Kdoorsys, int Comport, int NoSu strreplace(Program, (char *)"/N", temp1); } + if ((strstr(Program, "/U")) != NULL) { + snprintf(temp1, PATH_MAX, "%s/%s", CFG.bbs_usersdir, exitinfo.Name); + strreplace(Program, (char *)"/U", temp1); + } + if ((strstr(Program, "/A")) != NULL) { Enter(1); colour(CYAN, BLACK);