From ff24b826e7381ffc1cc80348b822538beb6389bd Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 12 Nov 2020 02:32:20 +0100
Subject: fix revive support for singular LISTOWNER, and similarly support
 MODERATOR

---
 mailman/mklist.inc | 4 ++--
 mailman/mklist.pl  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mailman/mklist.inc b/mailman/mklist.inc
index a392dd1..cbe399d 100644
--- a/mailman/mklist.inc
+++ b/mailman/mklist.inc
@@ -30,12 +30,12 @@ mklist() {
 	owner="${2:-$OWNER}"
 	emailhost="${3:-$LISTDOMAIN}"
 	urlhost="${4:-${LISTWEBDOMAIN:-$emailhost}}"
-	moderators="${5:-${MODERATORS}}"
+	moderator="${5:-${MODERATOR}}"
 
 	if ! echo "$existinglists" | grep -q "^$list\$"; then
 		newlist -l "$lang"${urlhost:+ -u "$urlhost"}${emailhost:+ -e "$emailhost"} -q "$list" "$owner" "$(mkpw)"
 	fi
-	LISTNAME="$list_anycase" LISTDESC="$desc" SENDERS="$senders" LISTOWNER="$owner" LISTHOST="$emailhost" MODERATORS="$moderators" "$sharedir/mklist.pl" "$skeldir/$type.$lang.py" > "$list.py"
+	LISTNAME="$list_anycase" LISTDESC="$desc" SENDERS="$senders" LISTOWNER="$owner" LISTHOST="$emailhost" MODERATOR="$moderator" "$sharedir/mklist.pl" "$skeldir/$type.$lang.py" > "$list.py"
 	config_list -i "$cfgdir/$list.py" "$list"
 	config_list -o "$cfgdir/$list.py" "$list"
 }
diff --git a/mailman/mklist.pl b/mailman/mklist.pl
index e1c2d06..7893ad7 100755
--- a/mailman/mklist.pl
+++ b/mailman/mklist.pl
@@ -21,9 +21,9 @@ $listhost = $ENV{'LISTHOST'} or die "LISTHOST missing";
 $senders  = $ENV{'SENDERS'} or die "SENDERS missing";
 $senderfilters = $ENV{'SENDERFILTER'} || $ENV{'SENDERFILTERS'} || ''
 	or warn "Ignoring missing SENDERFILTER(S)";
-$listowners = $ENV{'LISTOWNER'} || $ENV{'LISTOWNERS'}
+$listowners = $ENV{'LISTOWNERS'} || "'$ENV{'LISTOWNER'}'"
 	or die "LISTOWNER(S) missing";
-$moderators = $ENV{'MODERATORS'} || '';
+$moderators = $ENV{'MODERATORS'} || "'$ENV{'MODERATOR'}'";
 
 while (<>) {
 	# Replace keywords - except in comments
-- 
cgit v1.2.3