From 536f1b911f43e9f2b6d928ef7edd5daa051d5f19 Mon Sep 17 00:00:00 2001
From: Shawn Iverson <shawniverson@efa-project.org>
Date: Sat, 16 May 2020 19:40:06 -0400
Subject: [PATCH] Updates for 5.3.3-1 (#483)

---
 Build.all               | 13 +++++++++
 Build.debian            | 15 +++++++---
 Build.nix               | 42 ++++++++++------------------
 Build.rhel              | 17 +++++++----
 Build.suse              | 23 +++++++++------
 README                  |  6 ++--
 debian/DEBIAN/changelog |  2 +-
 rhel/mailscanner.spec   | 62 +++++++++++++++++++++++++++++++++++++----
 suse/mailscanner.spec   | 62 +++++++++++++++++++++++++++++++++++++----
 9 files changed, 179 insertions(+), 63 deletions(-)
 create mode 100755 Build.all

diff --git a/Build.all b/Build.all
new file mode 100755
index 0000000..f3c2700
--- /dev/null
+++ b/Build.all
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+#
+# Updated: 16 May 2020
+# MailScanner Team <https://www.mailscanner.info>
+#
+#
+# this Build.all script should be located in the base
+# directory when run.
+
+./Build.rhel
+./Build.suse
+./Build.debian
+./Build.nix
diff --git a/Build.debian b/Build.debian
index a97eb2e..295da21 100755
--- a/Build.debian
+++ b/Build.debian
@@ -14,9 +14,16 @@ if [ ! -d 'common' ]; then
 	exit 192
 fi
 
-MSVERSION=$(sed 's/-.*$//' VERSION)
-MSBUILD=$(sed 's/^.*-//' VERSION)
-VERSION=$(cat VERSION)
+if [ -z $(which fakeroot) -o -z $(which dpkg) ]; then
+    echo 'Required build packages are missing.';
+    echo 'Install fakeroot and dpkg before continuing, Exiting ...';
+    echo;
+    exit 192
+fi
+
+VERSION=$(sed -e 's/\n//' VERSION)
+MSVERSION=$(echo $VERSION | sed -e 's/-.*$//')
+MSBUILD=$(echo $VERSION | sed -e 's/^.*-//')
 MSDATE=$(date +"%a %d %B %Y %H:%M:%S %z")
 
 if [ -z $MSVERSION -o -z $MSBUILD ]; then
@@ -30,7 +37,7 @@ fi
 THISCURDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
 # where the final file will be copied
-FILEOUT="$HOME/msbuilds/deb";
+FILEOUT="$HOME/msbuilds";
 
 # check to see if the output directory exists
 if [ ! -d "$FILEOUT" ]; then
diff --git a/Build.nix b/Build.nix
index 73c1e00..0001352 100755
--- a/Build.nix
+++ b/Build.nix
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Updated 2 Nov 2019
+# Updated 16 May 2020
 # MailScanner Team <https://www.mailscanner.info>
 
 # this Build.tarball script should be located in the base
@@ -14,39 +14,24 @@ if [ ! -d 'common' ]; then
 	exit 192
 fi
 
-# if not set from the "Build.all" script
-if [ -z "$MSVERSION" ]; then
-	echo "Please tell me the version number (x.xx.x):"
-	read MSVERSION
-	export MSVERSION
-fi
+VERSION=$(sed -e 's/\n//' VERSION)
+MSVERSION=$(echo $VERSION | sed -e 's/-.*$//')
+MSBUILD=$(echo $VERSION | sed -e 's/^.*-//')
 
-# if not set from the "Build.all" script
-if [ -z "$MSBUILD" ]; then
-	echo "And the build number (-x):"
-	read MSBUILD	
-	export MSBUILD
-fi
-
-# if not set from the "Build.all" script
-if [ -z "$FULLMSVER" ]; then
-	FULLMSVER="$MSVERSION-$MSBUILD";
-	export FULLMSVER
+if [ -z $MSVERSION -o -z $MSBUILD ]; then
+    echo "Could not determine MailScanner version."
+    echo "Unable read VERSION file"
+    echo;
+    exit 192
 fi
 
 # if not set from the "Build.all" script
 if [ -z "$DEVBASEDIR" ]; then
-	DEVBASEDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-	export DEVBASEDIR
+    DEVBASEDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 fi
 
-
-# version info 
-VERSION=$MSVERSION-$MSBUILD
-export VERSION 
-
 # make some dirs
-mkdir -p ~/msbuilds/tar
+mkdir -p ~/msbuilds
 
 # the work directory
 WORK="/tmp/MailScanner-$MSVERSION";
@@ -69,7 +54,6 @@ cp -fr $DEVBASEDIR/README		$WORK/
 perl -pi -e 's/VersionNumberHere/'$MSVERSION'/;' $WORK/etc/MailScanner/MailScanner.conf
 perl -pi -e 's/VersionNumberHere/'$MSVERSION'/;' $WORK/usr/sbin/MailScanner
 
-
 # remove svn and git and mac stuff
 find $WORK -name '.svn' -exec rm -rf {} \;
 find $WORK -name '.git' -exec rm -rf {} \;
@@ -88,8 +72,10 @@ chmod +x $WORK/usr/lib/MailScanner/init/*
 
 # Build the MailScanner-version.tar.gz archive
 cd /tmp
-tar czf ~/msbuilds/tar/MailScanner-${VERSION}.nix.tar.gz MailScanner-$MSVERSION
+tar czf ~/msbuilds/MailScanner-${VERSION}.nix.tar.gz MailScanner-$MSVERSION
 
 cd $DEVBASEDIR
 rm -rf $WORK
 
+echo;
+echo "Completed: $HOME/msbuilds/MailScanner-${VERSION}.nix.tar.gz";
\ No newline at end of file
diff --git a/Build.rhel b/Build.rhel
index 6040b02..be05185 100755
--- a/Build.rhel
+++ b/Build.rhel
@@ -13,9 +13,16 @@ if [ ! -d 'rhel' ]; then
     exit 192
 fi
 
-MSVERSION=$(sed 's/-.*$//' VERSION)
-MSBUILD=$(sed 's/^.*-//' VERSION)
-VERSION=$(cat VERSION)
+if [ -z $(which rpmbuild) ]; then
+    echo 'Required rpmbuild package is missing';
+    echo 'install rpmbuild before continuing, Exiting ...';
+    echo;
+    exit 192
+fi
+
+VERSION=$(sed -e 's/\n//' VERSION)
+MSVERSION=$(echo $VERSION | sed -e 's/-.*$//')
+MSBUILD=$(echo $VERSION | sed -e 's/^.*-//')
 
 if [[ -z $MSVERSION || -z $MSBUILD ]]; then
     echo "Could not determine MailScanner version."
@@ -27,10 +34,8 @@ fi
 # directory we are in
 THISCURDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
-# if not set from the "Build.all" script
 if [ -z "$RPMOUT" ]; then
-	RPMOUT="$HOME/msbuilds/rhel";
-	export RPMOUT;
+	RPMOUT="$HOME/msbuilds";
 fi
 
 # setup rpm development dirs
diff --git a/Build.suse b/Build.suse
index 9674af8..2e9ccbd 100755
--- a/Build.suse
+++ b/Build.suse
@@ -13,9 +13,16 @@ if [ ! -d 'suse' ]; then
 	exit 192
 fi
 
-MSVERSION=$(sed 's/-.*$//' VERSION)
-MSBUILD=$(sed 's/^.*-//' VERSION)
-VERSION=$(cat VERSION)
+if [ -z $(which rpmbuild) ]; then
+    echo 'Required rpmbuild package is missing';
+    echo 'install rpmbuild before continuing, Exiting ...';
+    echo;
+    exit 192
+fi
+
+VERSION=$(sed -e 's/\n//' VERSION)
+MSVERSION=$(echo $VERSION | sed -e 's/-.*$//')
+MSBUILD=$(echo $VERSION | sed -e 's/^.*-//')
 
 if [[ -z $MSVERSION || -z $MSBUILD ]]; then
     echo "Could not determine MailScanner version."
@@ -27,10 +34,8 @@ fi
 # directory we are in
 THISCURDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
-# if not set from the "Build.all" script
 if [ -z "$RPMOUT" ]; then
-	RPMOUT="$HOME/msbuilds/suse";
-	export RPMOUT;
+	RPMOUT="$HOME/msbuilds";
 fi
 
 # setup rpm development dirs
@@ -68,18 +73,18 @@ tar czf ~/rpmbuild/SOURCES/MailScanner-${MSVERSION}.tar.gz MailScanner-${MSVERSI
 cd $THISCURDIR
 
 # Build the RPM and SRPMS
-cp -f $THISCURDIR/rhel/mailscanner.spec ~/rpmbuild/SPECS/mailscanner.spec
+cp -f $THISCURDIR/suse/mailscanner.spec ~/rpmbuild/SPECS/mailscanner.spec
 perl -pi -e 's/__Version__/'$MSVERSION'/;' ~/rpmbuild/SPECS/mailscanner.spec
 perl -pi -e 's/__Release__/'$MSBUILD'/;' ~/rpmbuild/SPECS/mailscanner.spec
 rpmbuild -ba ~/rpmbuild/SPECS/mailscanner.spec
 
 # Cleanup
-mv ~/rpmbuild/RPMS/noarch/MailScanner-${VERSION}.rhel.noarch.rpm $RPMOUT
+mv ~/rpmbuild/RPMS/noarch/MailScanner-${VERSION}.suse.noarch.rpm $RPMOUT
 rm -rf $WORK
 # Be mindful that rpmbuild may be present for other things...
 rm -f ~/rpmbuild/SOURCES/MailScanner-${MSVERSION}.tar.gz
 rm -f ~/rpmbuild/SPECS/mailscanner.spec
 
 echo;
-echo "Completed: $RPMOUT/MailScanner-${VERSION}.rhel.noarch.rpm";
+echo "Completed: $RPMOUT/MailScanner-${VERSION}.suse.noarch.rpm";
 
diff --git a/README b/README
index abe9037..17f9637 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 # Welcome to MailScanner!
 #
-# Current version: 5.3.2-2
+# Current version: 5.3.2-2 (5.3.3-1 pending)
 #
 # 25 April 2020
 # MailScanner Team <https://www.mailscanner.info>
@@ -21,13 +21,13 @@
 #
 #   Install/Update
 #       Redhat-based
-#           rpm -ivh MailScanner-5.x.x-x.rhel.noarch.rpm
+#           rpm -ivh|-Uvh MailScanner-5.x.x-x.rhel.noarch.rpm
 #           /usr/sbin/ms-configure [--update]
 #       Debian-based
 #           dpkg -i MailScanner-5.x.x.x-x.noarch.deb
 #           /usr/sbin/ms-configure [--update]
 #       SuSE-based
-#           rpm -ivh MailScanner-5.x.x.x-x.suse.noarch.rpm
+#           rpm -ivh|-Uvh MailScanner-5.x.x.x-x.suse.noarch.rpm
 #           /usr/sbin/ms-configure [--update]
 #       Other *nix
 #           tar -xvzf MailScanner-5.x.x-x.nix.tar.gz
diff --git a/debian/DEBIAN/changelog b/debian/DEBIAN/changelog
index eda046b..542d1d6 100644
--- a/debian/DEBIAN/changelog
+++ b/debian/DEBIAN/changelog
@@ -1,5 +1,5 @@
 MailScanner (DebianVersionHere) stable; urgency=low
 
-  * Maintenance release
+  * See changelog and README in /usr/share/MailScanner/doc
 
  -- MailScanner Team <https://www.mailscanner.info> __Date__
diff --git a/rhel/mailscanner.spec b/rhel/mailscanner.spec
index 3a67efa..f07f6a3 100644
--- a/rhel/mailscanner.spec
+++ b/rhel/mailscanner.spec
@@ -40,12 +40,62 @@ based Linux distributions.
 
 mkdir -p ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}/usr/sbin/
-mkdir -p ${RPM_BUILD_ROOT}/etc/MailScanner/{conf.d,rules,mcp}
-mkdir -p ${RPM_BUILD_ROOT}/etc/{cron.hourly,cron.daily}
-mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/reports/{hu,de,se,ca,cy+en,pt_br,fr,es,en,en_uk,cz,it,dk,nl,ro,sk}
-mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/{MailScanner,custom}
-mkdir -p ${RPM_BUILD_ROOT}/usr/{lib/MailScanner/wrapper,lib/MailScanner/init,lib/MailScanner/systemd}
-mkdir -p ${RPM_BUILD_ROOT}/var/spool/MailScanner/{archive,incoming,quarantine,milterin,milterout}
+
+while read f
+do
+  mkdir -p ${RPM_BUILD_ROOT}/etc/$f
+done << EOF
+MailScanner/conf.d
+MailScanner/rules
+MailScanner/mcp
+cron.hourly
+cron.daily
+EOF
+
+while read f
+do
+  mkdir -p ${RPM_BUILD_ROOT}/usr/share/$f
+done << EOF
+MailScanner/reports/hu
+MailScanner/reports/de
+MailScanner/reports/se
+MailScanner/reports/ca
+MailScanner/reports/cy+en
+MailScanner/reports/pt_br
+MailScanner/reports/fr
+MailScanner/reports/es
+MailScanner/reports/en
+MailScanner/reports/en_uk
+MailScanner/reports/cz
+MailScanner/reports/it
+MailScanner/reports/dk
+MailScanner/reports/nl
+MailScanner/reports/ro
+MailScanner/reports/sk
+MailScanner/perl/MailScanner
+MailScanner/perl/custom
+EOF
+
+while read f
+do
+  mkdir -p ${RPM_BUILD_ROOT}/usr/lib/$f
+done << EOF
+MailScanner/wrapper
+MailScanner/init
+MailScanner/systemd
+EOF
+
+while read f
+do
+  mkdir -p ${RPM_BUILD_ROOT}/var/spool/MailScanner/$f
+done << EOF
+archive
+incoming
+quarantine
+milterin
+milterout
+EOF
+
 mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/doc
 
 ### etc
diff --git a/suse/mailscanner.spec b/suse/mailscanner.spec
index 10fef40..cf828bc 100644
--- a/suse/mailscanner.spec
+++ b/suse/mailscanner.spec
@@ -41,12 +41,62 @@ based Linux distributions.
 
 mkdir -p $RPM_BUILD_ROOT
 mkdir -p ${RPM_BUILD_ROOT}/usr/sbin/
-mkdir -p ${RPM_BUILD_ROOT}/etc/MailScanner/{conf.d,rules,mcp}
-mkdir -p ${RPM_BUILD_ROOT}/etc/{cron.hourly,cron.daily}
-mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/reports/{hu,de,se,ca,cy+en,pt_br,fr,es,en,en_uk,cz,it,dk,nl,ro,sk}
-mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/{MailScanner,custom}
-mkdir -p ${RPM_BUILD_ROOT}/usr/{lib/MailScanner/wrapper,lib/MailScanner/init,lib/MailScanner/systemd}
-mkdir -p ${RPM_BUILD_ROOT}/var/spool/MailScanner/{archive,incoming,quarantine,milterin,milterout}
+
+while read f
+do
+  mkdir -p ${RPM_BUILD_ROOT}/etc/$f
+done << EOF
+MailScanner/conf.d
+MailScanner/rules
+MailScanner/mcp
+cron.hourly
+cron.daily
+EOF
+
+while read f
+do
+  mkdir -p ${RPM_BUILD_ROOT}/usr/share/$f
+done << EOF
+MailScanner/reports/hu
+MailScanner/reports/de
+MailScanner/reports/se
+MailScanner/reports/ca
+MailScanner/reports/cy+en
+MailScanner/reports/pt_br
+MailScanner/reports/fr
+MailScanner/reports/es
+MailScanner/reports/en
+MailScanner/reports/en_uk
+MailScanner/reports/cz
+MailScanner/reports/it
+MailScanner/reports/dk
+MailScanner/reports/nl
+MailScanner/reports/ro
+MailScanner/reports/sk
+MailScanner/perl/MailScanner
+MailScanner/perl/custom
+EOF
+
+while read f
+do
+  mkdir -p ${RPM_BUILD_ROOT}/usr/lib/$f
+done << EOF
+MailScanner/wrapper
+MailScanner/init
+MailScanner/systemd
+EOF
+
+while read f
+do
+  mkdir -p ${RPM_BUILD_ROOT}/var/spool/MailScanner/$f
+done << EOF
+archive
+incoming
+quarantine
+milterin
+milterout
+EOF
+
 mkdir -p ${RPM_BUILD_ROOT}/usr/share/MailScanner/doc
 
 ### etc