mlmmj 1.3.0-6

The ‘mlmmj-make-ml’ shell script was changed from using /bin/sh to using bash,
and now passes linting with ‘shellcheck’:

* The previous ‘echo -n’ construct is undefined in POSIX sh.
* All environment variables are now in double quotes.
* The ‘read’ constructs has been changed to ‘read -r’.
* Old style backtick substitution (`command`) has been changed to ‘$(command)’.
* All cd commands will exit 1 if target directory is unavailable.
* A faulty crontab entry was corrected.
* Since ‘bash’ is installed with the ‘base’ package, ‘sh’ is no longer a dependency.

3 files changed, 163 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 699016d49d27..5162602df079 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = mlmmj
 	pkgdesc = Simple and slim mailing list manager (MLM) inspired by ezmlm
 	pkgver = 1.3.0
-	pkgrel = 5
+	pkgrel = 6
 	url = http://mlmmj.org/
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	license = MIT
-	depends = sh
 	depends = smtp-server
 	source = http://mlmmj.org/releases/mlmmj-1.3.0.tar.gz
 	source = mlmmj-1.3.0.diff
@@ -15,22 +14,27 @@ pkgbase = mlmmj
 	source = tmpfile.conf
 	md5sums = 365eff26063ddb87097bf2d93311f8a5
 	md5sums = 2c01b8fefee3efc87cac391d3060c861
+	md5sums = 18277bc799488973c5316055cf299af6
 	md5sums = 2226137319dc972f0ab10c14e6b951dd
 	md5sums = 0eaa5ec4f143945629577e8abd6b229a
 	sha1sums = 1c67bc9514f3d69c90bcdc0c42c2e9cba9123d3a
 	sha1sums = 31b661992a0f48ece92cc91a1611da9847b5e041
+	sha1sums = 70a383a8bf5a798aabd0e4bb390b53fef324592b
 	sha1sums = aeb9f5625407873419eba15d8a414346caf3fabd
 	sha1sums = 1ec89e15977c3617cc5395b10d3ebe1ce4aba9ce
 	sha256sums = 7609d0dd804f0c084c2e483eb58c60012b698bc76464537852a1ee1ff9c6f0e9
 	sha256sums = 18dd3c663c0c5cc4a713b70b7eb03c2a2b9d6af316e1e080febda1ef61be399c
+	sha256sums = 3a853e7288cb7a077374e3a79890ec47dbbab208611600ee3d2726e5f17889be
 	sha256sums = 4bbc24fc73ecb2d8f509c47eacff290921bb70a24b2a87b19704336cb4c466f1
 	sha256sums = 1836f8ddb013f3762e79b2bbd9e81f850d976c984fa2e24bcc8f39072eeb0d37
 	sha512sums = ea40cae02a7ca5949af6ae01adcdc97536f63f9336f1e4081cf875312bb121a285405353a5863aa6d5f09834b2b6dd328650ed212a30f4940b5fbf82d20184cf
 	sha512sums = a8d74b9f32858be4fb648ba26d85cfc5c1eaedce6f9aec764812164f85f9182207a736df0e0d4710210f7d4ac44cef6342b7dbe566012492cddbcf4c01c3c8f2
+	sha512sums = 2dd3ebd263467d8fb6c14f4acb138b5fc38735bfd9c9bb676acb8b2bb1504897ca27a008ef9409903ba911b1c1f763392e8fe3cd6d2d73ce026aa9751c2a744a
 	sha512sums = c0d96b8d9b1866892be4d14967390cdff2d74a5e4d099bce3c5dadbeef93b6bf69020042c4f986081dc9de62b5707b7f49ce4514999d7a35ceab6e0621a6bf6d
 	sha512sums = 5be7399233f1d2f4b806d2049801cd2f84061de5abcc3565b75e10e6ed197d33370e5d4cf6f8c6fc2e17ff7b984e036b7e4ab69a929ac045fa2f202f29229e1f
 	b2sums = 6b56ead8fb5840964835b139be7566a14df53266a7d83323176f73430c76702f0dc50f5b255e5881887ad8618abe3ace6cd710128821654709b6135b53adbfe4
 	b2sums = c0beb31414df706e3ce2fc62f8d23f893c8ce199adc2a81a48d3e3df6ddcbd131588d0ad12a4cfcd1d0e3db799ed95101a40d9b88d7ee758413310e2dfe205ab
+	b2sums = 8dd8291af4a6b04565df816f0fb193e749824fc05c4226f748b272346d9077ae5bc9904ecc245e5161e267e9d57cb9202db6b8d8a29c9724f563677798534fcd
 	b2sums = 946ee7047c127ce3a7a5d784b97002f2373231acad4c1c7cfd65b1fbc4e49761deaf19d74ad8764943736897f03afb814bd92d81e58767f5af3cb87a4a7fa826
 	b2sums = 6fc6d4bde198896dc706652cd0e32fde43ac47b40c4d3cd2d130aa5e0b3b7cdb1d97c0124d43f9240c143f3f6641fc626a62f2350b8b43c8cfdfb8fcca33391d
 
diff --git a/PKGBUILD b/PKGBUILD
index dbaf0ebfc47d..03516db745b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname='mlmmj'
 pkgver=1.3.0
-pkgrel=5
+pkgrel=6
 pkgdesc='Simple and slim mailing list manager (MLM) inspired by ezmlm'
-depends=('sh' 'smtp-server')
+depends=('smtp-server')
 arch=('i686' 'x86_64' 'armv7h')
 url='http://mlmmj.org/'
 license=('MIT')
@@ -19,30 +19,35 @@ source=(
 md5sums=(
   '365eff26063ddb87097bf2d93311f8a5'
   '2c01b8fefee3efc87cac391d3060c861'
+  '18277bc799488973c5316055cf299af6'
   '2226137319dc972f0ab10c14e6b951dd'
   '0eaa5ec4f143945629577e8abd6b229a'
 )
 sha1sums=(
   '1c67bc9514f3d69c90bcdc0c42c2e9cba9123d3a'
   '31b661992a0f48ece92cc91a1611da9847b5e041'
+  '70a383a8bf5a798aabd0e4bb390b53fef324592b'
   'aeb9f5625407873419eba15d8a414346caf3fabd'
   '1ec89e15977c3617cc5395b10d3ebe1ce4aba9ce'
 )
 sha256sums=(
   '7609d0dd804f0c084c2e483eb58c60012b698bc76464537852a1ee1ff9c6f0e9'
   '18dd3c663c0c5cc4a713b70b7eb03c2a2b9d6af316e1e080febda1ef61be399c'
+  '3a853e7288cb7a077374e3a79890ec47dbbab208611600ee3d2726e5f17889be'
   '4bbc24fc73ecb2d8f509c47eacff290921bb70a24b2a87b19704336cb4c466f1'
   '1836f8ddb013f3762e79b2bbd9e81f850d976c984fa2e24bcc8f39072eeb0d37'
 )
 sha512sums=(
   'ea40cae02a7ca5949af6ae01adcdc97536f63f9336f1e4081cf875312bb121a285405353a5863aa6d5f09834b2b6dd328650ed212a30f4940b5fbf82d20184cf'
   'a8d74b9f32858be4fb648ba26d85cfc5c1eaedce6f9aec764812164f85f9182207a736df0e0d4710210f7d4ac44cef6342b7dbe566012492cddbcf4c01c3c8f2'
+  '2dd3ebd263467d8fb6c14f4acb138b5fc38735bfd9c9bb676acb8b2bb1504897ca27a008ef9409903ba911b1c1f763392e8fe3cd6d2d73ce026aa9751c2a744a'
   'c0d96b8d9b1866892be4d14967390cdff2d74a5e4d099bce3c5dadbeef93b6bf69020042c4f986081dc9de62b5707b7f49ce4514999d7a35ceab6e0621a6bf6d'
   '5be7399233f1d2f4b806d2049801cd2f84061de5abcc3565b75e10e6ed197d33370e5d4cf6f8c6fc2e17ff7b984e036b7e4ab69a929ac045fa2f202f29229e1f'
 )
 b2sums=(
   '6b56ead8fb5840964835b139be7566a14df53266a7d83323176f73430c76702f0dc50f5b255e5881887ad8618abe3ace6cd710128821654709b6135b53adbfe4'
   'c0beb31414df706e3ce2fc62f8d23f893c8ce199adc2a81a48d3e3df6ddcbd131588d0ad12a4cfcd1d0e3db799ed95101a40d9b88d7ee758413310e2dfe205ab'
+  '8dd8291af4a6b04565df816f0fb193e749824fc05c4226f748b272346d9077ae5bc9904ecc245e5161e267e9d57cb9202db6b8d8a29c9724f563677798534fcd'
   '946ee7047c127ce3a7a5d784b97002f2373231acad4c1c7cfd65b1fbc4e49761deaf19d74ad8764943736897f03afb814bd92d81e58767f5af3cb87a4a7fa826'
   '6fc6d4bde198896dc706652cd0e32fde43ac47b40c4d3cd2d130aa5e0b3b7cdb1d97c0124d43f9240c143f3f6641fc626a62f2350b8b43c8cfdfb8fcca33391d'
 )
@@ -50,6 +55,7 @@ b2sums=(
 prepare() {
   cd "$pkgname-$pkgver" || exit 1
   patch -Np1 -i "$srcdir/$pkgname-$pkgver.diff"
+  patch -Np1 -i "$srcdir/$pkgname-$pkgver-bash.diff"
 }
 
 build() {
diff --git a/mlmmj-1.3.0-bash.diff b/mlmmj-1.3.0-bash.diff
new file mode 100644
index 000000000000..5276ce4374f7
--- /dev/null
+++ b/mlmmj-1.3.0-bash.diff
@@ -0,0 +1,149 @@
+diff --git a/src/mlmmj-make-ml.in b/src/mlmmj-make-ml.in
+index a6e10a3..e4ee4c6 100755
+--- a/src/mlmmj-make-ml.in
++++ b/src/mlmmj-make-ml.in
+@@ -1,9 +1,9 @@
+-#!/bin/sh
++#!/usr/bin/bash
+ #
+ # mlmmj-make-ml - henne@hennevogel.de
+ #
+ 
+-VERSION="0.1"
++VERSION="0.1-bash"
+ DEFAULTDIR="/var/spool/mlmmj"
+ ALIASFILE=/etc/aliases
+ 
+@@ -20,7 +20,7 @@ $0
+ 
+ while getopts ":hL:s:azc:" Option
+ do
+-case "$Option" in 
++case "$Option" in
+ 	h )
+ 	echo "$USAGE"
+ 	exit 0
+@@ -59,7 +59,7 @@ echo "Creating Directorys below $SPOOLDIR. Use '-s spooldir' to change"
+ 
+ if [ -z "$LISTNAME" ]; then
+ 	echo -n "What should the name of the Mailinglist be? [mlmmj-test] : "
+-	read LISTNAME
++	read -r LISTNAME
+ 	if [ -z "$LISTNAME" ]; then
+ 	LISTNAME="mlmmj-test"
+ 	fi
+@@ -67,32 +67,32 @@ fi
+ 
+ LISTDIR="$SPOOLDIR/$LISTNAME"
+ 
+-mkdir -p $LISTDIR
++mkdir -p "$LISTDIR"
+ 
+ for DIR in incoming queue queue/discarded archive text subconf unsubconf \
+ 	   bounce control moderation subscribers.d digesters.d requeue \
+ 	   nomailsubs.d
+ do
+-	mkdir "$LISTDIR"/"$DIR"
++	mkdir "$LISTDIR/$DIR"
+ done
+ 
+ test -f "$LISTDIR"/index || touch "$LISTDIR"/index
+ 
+ echo -n "The Domain for the List? [] : "
+-read FQDN
++read -r FQDN
+ if [ -z "$FQDN" ]; then
+-	FQDN=`domainname -f`
++	FQDN=$(domainname -f)
+ fi
+ 
+ echo -n "The emailaddress of the list owner? [postmaster] : "
+-read OWNER
++read -r OWNER
+ if [ -z "$OWNER" ]; then
+ 	OWNER="postmaster"
+ fi
+-echo "$OWNER" > "$LISTDIR"/"control/owner"
++echo "$OWNER" > "$LISTDIR/control/owner"
+ 
+ (
+-	cd "@textlibdir@"
++	cd "@textlibdir@" || exit 1
+ 	echo
+ 	echo "For the list texts you can choose between the following languages or"
+ 	echo "give a absolute path to a directory containing the texts."
+@@ -102,7 +102,7 @@ echo "$OWNER" > "$LISTDIR"/"control/owner"
+ 
+ 	TEXTPATHDEF=en
+ 	echo -n "The path to texts for the list? [$TEXTPATHDEF] : "
+-	read TEXTPATHIN
++	read -r TEXTPATHIN
+ 	if [ -z "$TEXTPATHIN" ] ; then
+ 		TEXTPATH="$TEXTPATHDEF"
+ 	else
+@@ -115,35 +115,35 @@ echo "$OWNER" > "$LISTDIR"/"control/owner"
+ 		echo "in the source distribution of mlmmj."
+ 		sleep 2
+ 	else
+-		cp "$TEXTPATH"/* "$LISTDIR"/"text"
++		cp "$TEXTPATH"/* "$LISTDIR/text"
+ 	fi
+ )
+ 
+ LISTADDRESS="$LISTNAME@$FQDN"
+-echo "$LISTADDRESS" > "$LISTDIR"/control/"listaddress"
++echo "$LISTADDRESS" > "$LISTDIR/control/listaddress"
+ 
+-MLMMJRECEIVE=`which mlmmj-receive 2>/dev/null`
++MLMMJRECEIVE=$(which mlmmj-receive 2>/dev/null)
+ if [ -z "$MLMMJRECEIVE" ]; then
+ 	MLMMJRECEIVE="/path/to/mlmmj-receive"
+ fi
+ 
+-MLMMJMAINTD=`which mlmmj-maintd 2>/dev/null`
++MLMMJMAINTD=$(which mlmmj-maintd 2>/dev/null)
+ if [ -z "$MLMMJMAINTD" ]; then
+ 	MLMMJMAINTD="/path/to/mlmmj-maintd"
+ fi
+ 
+ ALIAS="$LISTNAME:  \"|$MLMMJRECEIVE -L $SPOOLDIR/$LISTNAME/\""
+-CRONENTRY="0 */2 * * * \"$MLMMJMAINTD -F -L $SPOOLDIR/$LISTNAME/\""
++CRONENTRY="0 */2 * * * $MLMMJMAINTD -F -L $SPOOLDIR/$LISTNAME/"
+ 
+ if [ -n "$A_CREATE" ]; then
+ 	echo "I want to add the following to your $ALIASFILE file:"
+ 	echo "$ALIAS"
+ 
+ 	echo -n "is this ok? [y/N] : "
+-	read OKIDOKI
+-	case $OKIDOKI in
++	read -r OKIDOKI
++	case "$OKIDOKI" in
+ 		y|Y)
+-		echo "$ALIAS" >> $ALIASFILE
++		echo "$ALIAS" >> "$ALIASFILE"
+ 		;;
+ 		n|N)
+ 		exit 0
+@@ -160,10 +160,10 @@ fi
+ if [ "$DO_CHOWN" ] ; then
+ 	echo
+ 	echo -n "chown -R $CHOWN $SPOOLDIR/$LISTNAME? [y/n]: "
+-	read OKIDOKI
+-	case $OKIDOKI in
++	read -r OKIDOKI
++	case "$OKIDOKI" in
+ 		y|Y)
+-			chown -R $CHOWN $SPOOLDIR/$LISTNAME
++			chown -R "$CHOWN" "$SPOOLDIR/$LISTNAME"
+ 		;;
+ 		n|N)
+ 			exit 0
+@@ -181,6 +181,6 @@ echo "$CRONENTRY"
+ 
+ echo
+ echo " ** FINAL NOTES **
+-1) The mailinglist directory have to be owned by the user running the 
++1) The mailinglist directory have to be owned by the user running the
+ mailserver (i.e. starting the binaries to work the list)
+ 2) Run newaliases"