summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--[-rwxr-xr-x]Mailman/bin/add_members.py0
-rw-r--r--Mailman/bin/bounces.py (renamed from scripts/bounces)9
-rw-r--r--[-rwxr-xr-x]Mailman/bin/confirm.py (renamed from scripts/confirm)9
-rw-r--r--Mailman/bin/disabled.py1
-rw-r--r--[-rwxr-xr-x]Mailman/bin/find_member.py0
-rw-r--r--[-rwxr-xr-x]Mailman/bin/gate_news.py0
-rw-r--r--[-rwxr-xr-x]Mailman/bin/join.py (renamed from scripts/join)9
-rw-r--r--[-rwxr-xr-x]Mailman/bin/leave.py (renamed from scripts/leave)9
-rw-r--r--[-rwxr-xr-x]Mailman/bin/list_members.py0
-rw-r--r--[-rwxr-xr-x]Mailman/bin/mmsitepass.py0
-rw-r--r--[-rwxr-xr-x]Mailman/bin/newlist.py0
-rw-r--r--[-rwxr-xr-x]Mailman/bin/owner.py (renamed from scripts/owner)11
-rw-r--r--[-rwxr-xr-x]Mailman/bin/post.py (renamed from scripts/post)9
-rw-r--r--[-rwxr-xr-x]Mailman/bin/request.py (renamed from scripts/request)11
-rw-r--r--[-rwxr-xr-x]Mailman/bin/rmlist.py0
-rw-r--r--[-rwxr-xr-x]Mailman/bin/senddigests.py0
-rwxr-xr-xconfigure48
-rw-r--r--configure.in11
-rw-r--r--scripts/Makefile.in66
-rw-r--r--scripts/driver2
20 files changed, 100 insertions, 95 deletions
diff --git a/Mailman/bin/add_members.py b/Mailman/bin/add_members.py
index 0adcda518..0adcda518 100755..100644
--- a/Mailman/bin/add_members.py
+++ b/Mailman/bin/add_members.py
diff --git a/scripts/bounces b/Mailman/bin/bounces.py
index 6fa0f56b9..b37f8a437 100644
--- a/scripts/bounces
+++ b/Mailman/bin/bounces.py
@@ -1,5 +1,3 @@
-# -*- python -*-
-#
# Copyright (C) 2001-2006 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
@@ -28,13 +26,14 @@ Errors are redirected to logs/error.
import sys
import logging
-import paths
from Mailman import Utils
-from Mailman import mm_cfg
from Mailman import loginit
+from Mailman import mm_cfg
from Mailman.Queue.sbcache import get_switchboard
from Mailman.i18n import _
+__i18n_templates__ = True
+
def main():
@@ -48,7 +47,7 @@ def main():
sys.exit(1)
# Make sure the list exists
if not Utils.list_exists(listname):
- log.error(_('bounces script, list not found: %(listname)s'))
+ log.error(_('bounces script, list not found: $listname'))
sys.exit(1)
# Immediately queue the message for the bounces qrunner to process. The
# advantage to this approach is that messages should never get lost --
diff --git a/scripts/confirm b/Mailman/bin/confirm.py
index b5a62dd46..b51264d1a 100755..100644
--- a/scripts/confirm
+++ b/Mailman/bin/confirm.py
@@ -1,5 +1,3 @@
-# -*- python -*-
-#
# Copyright (C) 2002-2006 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
@@ -28,13 +26,14 @@ Errors are redirected to logs/error.
import sys
import logging
-import paths
from Mailman import Utils
-from Mailman import mm_cfg
from Mailman import loginit
+from Mailman import mm_cfg
from Mailman.Queue.sbcache import get_switchboard
from Mailman.i18n import _
+__i18n_templates__ = True
+
def main():
@@ -48,7 +47,7 @@ def main():
sys.exit(1)
# Make sure the list exists
if not Utils.list_exists(listname):
- log.error(_('confirm script, list not found: %(listname)s'))
+ log.error(_('confirm script, list not found: $listname'))
sys.exit(1)
# Immediately queue the message for the bounce/cmd qrunner to process.
# The advantage to this approach is that messages should never get lost --
diff --git a/Mailman/bin/disabled.py b/Mailman/bin/disabled.py
index 161a06712..cc9205c19 100644
--- a/Mailman/bin/disabled.py
+++ b/Mailman/bin/disabled.py
@@ -15,7 +15,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
# USA.
-import sys
import time
import logging
import optparse
diff --git a/Mailman/bin/find_member.py b/Mailman/bin/find_member.py
index e249fb30b..e249fb30b 100755..100644
--- a/Mailman/bin/find_member.py
+++ b/Mailman/bin/find_member.py
diff --git a/Mailman/bin/gate_news.py b/Mailman/bin/gate_news.py
index 4c55273cd..4c55273cd 100755..100644
--- a/Mailman/bin/gate_news.py
+++ b/Mailman/bin/gate_news.py
diff --git a/scripts/join b/Mailman/bin/join.py
index b378cc316..2ea07419c 100755..100644
--- a/scripts/join
+++ b/Mailman/bin/join.py
@@ -1,5 +1,3 @@
-# -*- python -*-
-#
# Copyright (C) 2001-2006 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
@@ -28,13 +26,14 @@ Errors are redirected to logs/error.
import sys
import logging
-import paths
from Mailman import Utils
-from Mailman import mm_cfg
from Mailman import loginit
+from Mailman import mm_cfg
from Mailman.Queue.sbcache import get_switchboard
from Mailman.i18n import _
+__i18n_templates__ = True
+
def main():
@@ -48,7 +47,7 @@ def main():
sys.exit(1)
# Make sure the list exists
if not Utils.list_exists(listname):
- log.error(_('join script, list not found: %(listname)s'))
+ log.error(_('join script, list not found: $listname'))
sys.exit(1)
# Immediately queue the message for the bounce/cmd qrunner to process.
# The advantage to this approach is that messages should never get lost --
diff --git a/scripts/leave b/Mailman/bin/leave.py
index 627c440df..9687906de 100755..100644
--- a/scripts/leave
+++ b/Mailman/bin/leave.py
@@ -1,5 +1,3 @@
-# -*- python -*-
-#
# Copyright (C) 2001-2006 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
@@ -28,13 +26,14 @@ Errors are redirected to logs/error.
import sys
import logging
-import paths
from Mailman import Utils
-from Mailman import mm_cfg
from Mailman import loginit
+from Mailman import mm_cfg
from Mailman.Queue.sbcache import get_switchboard
from Mailman.i18n import _
+__i18n_templates__ = True
+
def main():
@@ -48,7 +47,7 @@ def main():
sys.exit(1)
# Make sure the list exists
if not Utils.list_exists(listname):
- log.error(_('leave script, list not found: %(listname)s'))
+ log.error(_('leave script, list not found: $listname'))
sys.exit(1)
# Immediately queue the message for the bounce/cmd qrunner to process.
# The advantage to this approach is that messages should never get lost --
diff --git a/Mailman/bin/list_members.py b/Mailman/bin/list_members.py
index 1239b955f..1239b955f 100755..100644
--- a/Mailman/bin/list_members.py
+++ b/Mailman/bin/list_members.py
diff --git a/Mailman/bin/mmsitepass.py b/Mailman/bin/mmsitepass.py
index b6576c8fa..b6576c8fa 100755..100644
--- a/Mailman/bin/mmsitepass.py
+++ b/Mailman/bin/mmsitepass.py
diff --git a/Mailman/bin/newlist.py b/Mailman/bin/newlist.py
index bd2ec0dde..bd2ec0dde 100755..100644
--- a/Mailman/bin/newlist.py
+++ b/Mailman/bin/newlist.py
diff --git a/scripts/owner b/Mailman/bin/owner.py
index 82921880e..34f796ad3 100755..100644
--- a/scripts/owner
+++ b/Mailman/bin/owner.py
@@ -1,5 +1,3 @@
-# -*- python -*-
-#
# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
@@ -31,13 +29,14 @@ Errors are redirected to logs/error.
import sys
import logging
-import paths
from Mailman import Utils
-from Mailman import mm_cfg
from Mailman import loginit
+from Mailman import mm_cfg
from Mailman.Queue.sbcache import get_switchboard
from Mailman.i18n import _
+__i18n_templates__ = True
+
def main():
@@ -47,11 +46,11 @@ def main():
try:
listname = sys.argv[1]
except IndexError:
- log.error(_('mailowner script got no listname.'))
+ log.error(_('owner script got no listname.'))
sys.exit(1)
# Make sure the list exists
if not Utils.list_exists(listname):
- log.error(_('mailowner script, list not found: %(listname)s'))
+ log.error(_('owner script, list not found: $listname'))
sys.exit(1)
# Queue the message for the owners. We will send them through the
# incoming queue because we need some processing done on the message. The
diff --git a/scripts/post b/Mailman/bin/post.py
index 0f5b268ec..aaf943e8e 100755..100644
--- a/scripts/post
+++ b/Mailman/bin/post.py
@@ -1,5 +1,3 @@
-# -*- python -*-
-#
# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
@@ -31,13 +29,14 @@ Errors are redirected to logs/error.
import sys
import logging
-import paths
from Mailman import Utils
-from Mailman import mm_cfg
from Mailman import loginit
+from Mailman import mm_cfg
from Mailman.Queue.sbcache import get_switchboard
from Mailman.i18n import _
+__i18n_templates__ = True
+
def main():
@@ -55,7 +54,7 @@ def main():
sys.exit(1)
# Make sure the list exists
if not Utils.list_exists(listname):
- log.error(_('post script, list not found: %(listname)s'))
+ log.error(_('post script, list not found: $listname'))
sys.exit(1)
# Immediately queue the message for the incoming qrunner to process. The
# advantage to this approach is that messages should never get lost --
diff --git a/scripts/request b/Mailman/bin/request.py
index 70ee8c7f4..15300537b 100755..100644
--- a/scripts/request
+++ b/Mailman/bin/request.py
@@ -1,5 +1,3 @@
-# -*- python -*-
-#
# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
@@ -28,13 +26,14 @@ Errors are redirected to logs/error.
import sys
import logging
-import paths
from Mailman import Utils
-from Mailman import mm_cfg
from Mailman import loginit
+from Mailman import mm_cfg
from Mailman.Queue.sbcache import get_switchboard
from Mailman.i18n import _
+__i18n_templates__ = True
+
def main():
@@ -44,11 +43,11 @@ def main():
try:
listname = sys.argv[1]
except IndexError:
- log.error(_('mailcmd script got no listname.'))
+ log.error(_('request script got no listname.'))
sys.exit(1)
# Make sure the list exists
if not Utils.list_exists(listname):
- log.error(_('mailcmd script, list not found: %(listname)s'))
+ log.error(_('request script, list not found: $listname'))
sys.exit(1)
# Immediately queue the message for the bounce/cmd qrunner to process.
# The advantage to this approach is that messages should never get lost --
diff --git a/Mailman/bin/rmlist.py b/Mailman/bin/rmlist.py
index aef927c88..aef927c88 100755..100644
--- a/Mailman/bin/rmlist.py
+++ b/Mailman/bin/rmlist.py
diff --git a/Mailman/bin/senddigests.py b/Mailman/bin/senddigests.py
index fa01d3666..fa01d3666 100755..100644
--- a/Mailman/bin/senddigests.py
+++ b/Mailman/bin/senddigests.py
diff --git a/configure b/configure
index 058482c71..4378ddfd4 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.in Revision: 7893 .
+# From configure.in Revision: 7895 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.59 for GNU Mailman 2.2.0a0.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -266,13 +266,12 @@ SHELL=${CONFIG_SHELL-/bin/sh}
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='GNU Mailman'
+PACKAGE_TARNAME='mailman'
+PACKAGE_VERSION='2.2.0a0'
+PACKAGE_STRING='GNU Mailman 2.2.0a0'
+PACKAGE_BUGREPORT=''
-ac_unique_file="src/common.h"
ac_default_prefix=/usr/local/mailman
# Factoring default headers for most tests.
ac_includes_default="\
@@ -780,7 +779,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures GNU Mailman 2.2.0a0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -836,7 +835,9 @@ _ACEOF
fi
if test -n "$ac_init_help"; then
-
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of GNU Mailman 2.2.0a0:";;
+ esac
cat <<\_ACEOF
Optional Packages:
@@ -962,6 +963,8 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
+GNU Mailman configure 2.2.0a0
+generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -974,7 +977,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by GNU Mailman $as_me 2.2.0a0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1304,6 +1307,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+
# /usr/local/mailman is the default installation directory
@@ -1389,8 +1399,7 @@ PYTHON=$with_python
echo "$as_me:$LINENO: result: $PYTHON" >&5
echo "${ECHO_T}$PYTHON" >&6
-# See if Python is new enough. 2.1 or better is required, with 2.1.3
-# recommended.
+# See if Python is new enough. 2.3 or better is required.
echo "$as_me:$LINENO: checking Python version" >&5
echo $ECHO_N "checking Python version... $ECHO_C" >&6
@@ -1400,8 +1409,7 @@ try:
v = sys.hexversion
except AttributeError:
v = 0
-# int of hexversion 0x2010000
-if v >= 0x2010000:
+if v >= 0x2030000:
s = sys.version.split()[0]
else:
s = ""
@@ -4011,9 +4019,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
+## -------------------------------------- ##
+## Report this to the GNU Mailman lists. ##
+## -------------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -4706,7 +4714,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by $as_me, which was
+This file was extended by GNU Mailman $as_me 2.2.0a0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4764,7 +4772,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-config.status
+GNU Mailman config.status 2.2.0a0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.in b/configure.in
index 8e49ab032..e50a3ad6e 100644
--- a/configure.in
+++ b/configure.in
@@ -15,10 +15,9 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 7895 $)
+AC_REVISION($Revision: 7897 $)
AC_PREREQ(2.0)
-AC_INIT(src/common.h)
-
+AC_INIT([GNU Mailman], [2.2.0a0])
# /usr/local/mailman is the default installation directory
AC_PREFIX_DEFAULT(/usr/local/mailman)
@@ -52,8 +51,7 @@ AC_SUBST(PYTHON)
PYTHON=$with_python
AC_MSG_RESULT($PYTHON)
-# See if Python is new enough. 2.1 or better is required, with 2.1.3
-# recommended.
+# See if Python is new enough. 2.3 or better is required.
AC_MSG_CHECKING(Python version)
changequote(,)
cat > conftest.py <<EOF
@@ -62,8 +60,7 @@ try:
v = sys.hexversion
except AttributeError:
v = 0
-# int of hexversion 0x2010000
-if v >= 0x2010000:
+if v >= 0x2030000:
s = sys.version.split()[0]
else:
s = ""
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 49b82ec0e..14692b8e3 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,57 +1,57 @@
-# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2006 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.
-
-# NOTE: Makefile.in is converted into Makefile by the configure script
-# in the parent directory. Once configure has run, you can recreate
-# the Makefile by running just config.status.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
# Variables set by configure
-VPATH= @srcdir@
-srcdir= @srcdir@
-bindir= @bindir@
-prefix= @prefix@
-exec_prefix= @exec_prefix@
+VPATH= @srcdir@
+srcdir= @srcdir@
+bindir= @bindir@
+prefix= @prefix@
+exec_prefix= @exec_prefix@
DESTDIR=
-CC= @CC@
-CHMOD= @CHMOD@
-INSTALL= @INSTALL@
+CC= @CC@
+CHMOD= @CHMOD@
+INSTALL= @INSTALL@
+LN_S= @LN_S@
-DEFS= @DEFS@
+DEFS= @DEFS@
# Customizable but not set by configure
-OPT= @OPT@
-CFLAGS= $(OPT) $(DEFS)
-SCRIPTSDIR= $(prefix)/scripts
+OPT= @OPT@
+CFLAGS= $(OPT) $(DEFS)
+SCRIPTSDIR= $(prefix)/scripts
+BINDIR= ../bin
-SHELL= /bin/sh
+SHELL= /bin/sh
# Note that `admin' is a backwards compatible alias for `bounces'
# 'subscribe' is an alias for join
# 'unsubscribe' is an alias for leave
-SCRIPTS= bounces confirm driver join leave owner post request
+SCRIPTS= driver
+LN_SCRIPTS= bounces confirm join leave owner post request
# Modes for directories and executables created by the install
# process. Default to group-writable directories but
# user-only-writable for executables.
-DIRMODE= 775
-EXEMODE= 755
-FILEMODE= 644
+DIRMODE= 775
+EXEMODE= 755
+FILEMODE= 644
INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
@@ -64,9 +64,17 @@ install:
do \
$(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(SCRIPTSDIR); \
done
- $(INSTALL) -m $(FILEMODE) $(srcdir)/bounces $(DESTDIR)$(SCRIPTSDIR)/admin
- $(INSTALL) -m $(FILEMODE) $(srcdir)/join $(DESTDIR)$(SCRIPTSDIR)/subscribe
- $(INSTALL) -m $(FILEMODE) $(srcdir)/leave $(DESTDIR)$(SCRIPTSDIR)/unsubscribe
+ for f in $(LN_SCRIPTS); \
+ do \
+ rm -f $(DESTDIR)$(SCRIPTSDIR)/$$f; \
+ (cd $(DESTDIR)$(SCRIPTSDIR); $(LN_S) $(BINDIR)/mmshell $$f); \
+ done
+ rm -f $(DESTDIR)$(SCRIPTSDIR)/admin
+ (cd $(DESTDIR)$(SCRIPTSDIR); $(LN_S) $(BINDIR)/mmshell admin)
+ rm -f $(DESTDIR)$(SCRIPTSDIR)/subscribe
+ (cd $(DESTDIR)$(SCRIPTSDIR); $(LN_S) $(BINDIR)/mmshell subscribe)
+ rm -f $(DESTDIR)$(SCRIPTSDIR)/unsubscribe
+ (cd $(DESTDIR)$(SCRIPTSDIR); $(LN_S) $(BINDIR)/mmshell unsubscribe)
finish:
diff --git a/scripts/driver b/scripts/driver
index 08bee07bd..20cbece10 100644
--- a/scripts/driver
+++ b/scripts/driver
@@ -29,7 +29,7 @@ import sys
# comfortable with. By setting STEALTH_MODE to True, you disable the printing
# of this information to the web pages. This information is still, and
# always, printed in the error logs.
-STEALTH_MODE = True
+STEALTH_MODE = False
# This will be set to the entity escaper.
def websafe(s):
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-08 16:50:50 +0000