From 34e83ff53a18743ea5e55383b9f2797fb873ba84 Mon Sep 17 00:00:00 2001
From: Steven King <kingrst@gmail.com>
Date: Fri, 21 Mar 2014 09:11:28 +0700
Subject: [PATCH] network/mailman: Updated for version 2.1.17 + New Maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/mailman/README             |  5 +++
 network/mailman/doinst.sh          |  3 ++
 network/mailman/mailman.SlackBuild |  4 ++-
 network/mailman/mailman.info       | 10 +++---
 network/mailman/rc.mailman         | 54 +++++++++++++++++++++++++++---
 5 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/network/mailman/README b/network/mailman/README
index c019ccd646..afa42d05f3 100644
--- a/network/mailman/README
+++ b/network/mailman/README
@@ -28,3 +28,8 @@ with uid and gid of 204 (see http://slackbuilds.org/uid_gid.txt):
 
 If you execute the script without creating this user and group, it won't
 build the Mailman package.
+
+NOTE:
+You must run /opt/mailman/bin/check_perms -f (using root) after
+installation/upgrade and before running mailman daemon to fix permission
+needed by this package.
diff --git a/network/mailman/doinst.sh b/network/mailman/doinst.sh
index 0705113e98..c6c01f4292 100644
--- a/network/mailman/doinst.sh
+++ b/network/mailman/doinst.sh
@@ -23,4 +23,7 @@ preserve_perms() {
 }
 
 preserve_perms etc/rc.d/rc.mailman.new
+config opt/mailman/Mailman/mm_cfg.py.new
 
+# Ensure the private archive doesn't have o+w
+chmod o-x  /opt/mailman/var/mailman/archives/private
diff --git a/network/mailman/mailman.SlackBuild b/network/mailman/mailman.SlackBuild
index d4bae2e673..a6615a3768 100644
--- a/network/mailman/mailman.SlackBuild
+++ b/network/mailman/mailman.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Eugene Suter (easuter@gmail.com)
 
 PRGNAM=mailman
-VERSION=${VERSION:-2.1.16}
+VERSION=${VERSION:-2.1.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -108,6 +108,8 @@ mkdir $PKG/etc/rc.d
 cat $CWD/rc.mailman > $PKG/etc/rc.d/rc.mailman.new
 chmod 0755 $PKG/etc/rc.d/rc.mailman.new
 
+mv $PKG/opt/mailman/Mailman/mm_cfg.py $PKG/opt/mailman/Mailman/mm_cfg.py.new
+
 mkdir -p $PKG/$PREFIX/doc/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/doc
 cp -a ACKNOWLEDGMENTS BUGS FAQ NEWS README* STYLEGUIDE.txt TODO \
diff --git a/network/mailman/mailman.info b/network/mailman/mailman.info
index e4099b4efe..4edafd421b 100644
--- a/network/mailman/mailman.info
+++ b/network/mailman/mailman.info
@@ -1,10 +1,10 @@
 PRGNAM="mailman"
-VERSION="2.1.16"
+VERSION="2.1.17"
 HOMEPAGE="http://www.gnu.org/software/mailman/index.html"
-DOWNLOAD="http://ftp.gnu.org/gnu/mailman/mailman-2.1.16.tgz"
-MD5SUM="ab8969dc68661f7a7af3beb797a46b3e"
+DOWNLOAD="http://ftp.gnu.org/gnu/mailman/mailman-2.1.17.tgz"
+MD5SUM="39043257f91eb876082fa90470aa8d28"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Eugene Suter"
-EMAIL="easuter@gmail.com"
+MAINTAINER="Steven King"
+EMAIL="kingrst@gmail.com"
diff --git a/network/mailman/rc.mailman b/network/mailman/rc.mailman
index bf5e8eeda0..21840941e3 100644
--- a/network/mailman/rc.mailman
+++ b/network/mailman/rc.mailman
@@ -1,8 +1,54 @@
 #!/bin/sh
+#
+# mailman    This shell script starts and stops GNU Mailman.
+#
+# Copyright (C) 2001-2003 by the Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Copy this file to /etc/init.d/ (or /etc/rc.d/init.d/ depending on
+# your system) and activate it as such:
+#
+# On Debian, type "update-rc.d mailman defaults"
+# On RedHat, and derivatives, install with "chkconfig --add mailman"
+#
+# chkconfig: 2345 98 12
+# description: Mailman is the GNU Mailing List Manager, a program that \
+#              manages electronic mail discussion groups.  For more \
+#              on GNU Mailman see http://www.list.org
+# processname: mailmanctl
+# config: /opt/mailman/Mailman/mm_cfg.py
+# pidfile: /opt/mailman/var/mailman/data/master-qrunner.pid
 
-# Simple start-only rc file, since mainstream doesn't provide one
+PYTHON=/usr/bin/python
+MAILMANHOME=/opt/mailman/var/mailman
+MAILMANCTL=/opt/mailman/bin/mailmanctl
 
-if [ -x /opt/mailman/bin/mailmanctl ];then 
-	/opt/mailman/bin/mailmanctl -s start	
-fi
+case "$1" in
+'start')
+    #rm -f $MAILMANHOME/locks/*
+    $PYTHON $MAILMANCTL -s -q start
+    ;;
 
+'stop')
+    $PYTHON $MAILMANCTL -q stop
+    ;;
+
+'restart')
+    $PYTHON $MAILMANCTL -q restart
+    ;;
+
+esac
+exit 0