commit b958a3cc13abe6cc127aa9540970812b50798de0
Author: Elan Ruusamäe <[email protected]>
Date: Sun Aug 28 14:57:59 2016 +0300
up to 2.1.23
mailman-mailmanctl-status.patch | 16 ++++++++--------
mailman.init | 0
mailman.spec | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/mailman.spec b/mailman.spec
index f71f6fc..3a1d42e 100644
--- a/mailman.spec
+++ b/mailman.spec
@@ -2,19 +2,19 @@
# Conditional build:
%bcond_with umbrella_hack # break anonimization (for use with moderated
umbrella list of moderated lists)
-%define rel 3
+%define rel 1
Summary: The GNU Mailing List Management System
Summary(es.UTF-8): El Sistema de Mantenimiento de listas de GNU
Summary(pl.UTF-8): System Zarządzania Listami Pocztowymi GNU
Summary(pt_BR.UTF-8): O Sistema de Manutenção de listas da GNU
Name: mailman
-Version: 2.1.20
+Version: 2.1.23
Release: %{rel}%{?with_umbrella_hack:.umh}
Epoch: 5
License: GPL v2+
Group: Applications/System
Source0: http://downloads.sourceforge.net/mailman/%{name}-%{version}.tgz
-# Source0-md5: 96819640406f90a12bc28edd3dc09d4a
+# Source0-md5: ceb2d8427e29f4e69b2505423ffeb60b
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
# Source1-md5: 6b55f9f8051c76961b84a12ed17fc14f
Source2: %{name}.conf
diff --git a/mailman-mailmanctl-status.patch b/mailman-mailmanctl-status.patch
index ba2473d..380823c 100644
--- a/mailman-mailmanctl-status.patch
+++ b/mailman-mailmanctl-status.patch
@@ -1,6 +1,5 @@
-diff -r -u mailman-2.1.5.orig/bin/mailmanctl mailman-2.1.5/bin/mailmanctl
---- mailman-2.1.5.orig/bin/mailmanctl 2004-02-03 17:26:08.000000000 -0500
-+++ mailman-2.1.5/bin/mailmanctl 2004-09-10 18:23:34.000000000 -0400
+--- mailman-2.1.23/bin/mailmanctl~ 2016-08-28 14:46:13.000000000 +0300
++++ mailman-2.1.23/bin/mailmanctl 2016-08-28 14:47:55.871820256 +0300
@@ -35,7 +35,7 @@
pid directly. The `start', `stop', `restart', and `reopen' commands handle
everything for you.
@@ -73,20 +72,21 @@ diff -r -u mailman-2.1.5.orig/bin/mailmanctl
mailman-2.1.5/bin/mailmanctl
def acquire_lock_1(force):
# Be sure we can acquire the master qrunner lock. If not, it means some
-@@ -336,13 +385,15 @@
+@@ -387,13 +387,15 @@
command = COMMASPACE.join(args)
- usage(1, _('Bad command: %(command)s'))
+ usage(1, C_('Bad command: %(command)s'))
++ # Handle the commands
+ command = args[0].lower()
+
if checkprivs:
check_privs()
else:
-- print _('Warning! You may encounter permission problems.')
+- print C_('Warning! You may encounter permission problems.')
+ if command != 'status':
-+ print _('Warning! You may encounter permission problems.')
++ print C_('Warning! You may encounter permission problems.')
- # Handle the commands
+- # Handle the commands
- command = args[0].lower()
if command == 'stop':
# Sent the master qrunner process a SIGINT, which is equivalent to
diff --git a/mailman.init b/mailman.init
old mode 100644
new mode 100755
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mailman.git/commitdiff/b958a3cc13abe6cc127aa9540970812b50798de0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
