diff options
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | bin/Makefile.in | 4 | ||||
| -rw-r--r-- | bin/mailman-config | 40 | ||||
| -rwxr-xr-x | configure | 33 | ||||
| -rw-r--r-- | configure.in | 18 |
5 files changed, 97 insertions, 4 deletions
@@ -7,6 +7,12 @@ Here is a history of user visible changes to Mailman. 2.1.26 (xx-xxx-xxxx) + New Features + + - Thanks to Lindsay Haisley, there is a new bin/mailman-config command + to display various information about this Mailman version and how it + was configured. + i18n - The German translation of a couple of templates has been updated by diff --git a/bin/Makefile.in b/bin/Makefile.in index 22c24b04..20ae5483 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2006 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 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 @@ -49,7 +49,7 @@ SCRIPTS= mmsitepass newlist rmlist add_members \ list_admins genaliases change_pw mailmanctl qrunner inject \ unshunt fix_url.py convert.py transcheck b4b5-archfix \ list_owners msgfmt.py show_qfiles discard rb-archfix \ - reset_pw.py export.py + reset_pw.py export.py mailman-config BUILDDIR= ../build/bin diff --git a/bin/mailman-config b/bin/mailman-config new file mode 100644 index 00000000..6f845270 --- /dev/null +++ b/bin/mailman-config @@ -0,0 +1,40 @@ +#! @PYTHON@ +# +# Copyright (C) 2018 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. +# +# Send bug reports or suggestions to Lindsay Haisley <fmouse@fmp.com> + +"""Show basic statistics about, and build options for this +installation of Mailman. Requires python 2.""" + +print """Configuration and build information for Mailman\n""" + +print "Mailman version: %s" % "@MM_VERSION@" +print "Build Date: %s" % "@BUILD_DATE@" +print "" +print "prefix: %s" % "@prefix@" +print "var_prefix: %s" % "@VAR_PREFIX@" +print "mailman_user: %s" % "@MAILMAN_USER@" +print "mailman_group: %s" % "@MAILMAN_GROUP@" +print "mail_group: %s" % "@MAIL_GROUP@" +print "cgi_group: %s" % "@CGI_GROUP@" +print "" + + +print "configure_opts: \"%s\"" % "@CONFIGURE_OPTS@" + @@ -651,8 +651,11 @@ INSTALL_PROGRAM KOCODECSPKG JACODECSPKG EMAILPKG +MM_VERSION PYTHON with_python +BUILD_DATE +CONFIGURE_OPTS target_alias host_alias build_alias @@ -672,6 +675,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -753,6 +757,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1005,6 +1010,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1142,7 +1156,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1295,6 +1309,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2127,6 +2142,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # /usr/local/mailman is the default installation directory +CONFIGURE_OPTS=`echo $@` + +BUILD_DATE=`date` + # Check for Python! Better be found on $PATH { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-python" >&5 @@ -2292,6 +2311,17 @@ $PYTHON conftest.py needemailpkg=`cat conftest.out` rm -f conftest.out conftest.py +cat > getver.py <<EOF +from Mailman.Version import VERSION +fp = open("getver.out", "w") +fp.write("%s\n" % VERSION) +fp.close() +EOF +$PYTHON getver.py +MM_VERSION=`cat getver.out` +rm -f getver.out getver.py + + # Should we rely on Python's own email package or use the pre-packaged version? if test "$needemailpkg" = "ok" @@ -4542,6 +4572,7 @@ build/bin/unshunt:bin/unshunt \ build/bin/update:bin/update \ build/bin/version:bin/version \ build/bin/withlist:bin/withlist \ +build/bin/mailman-config:bin/mailman-config \ build/bin/b4b5-archfix:bin/b4b5-archfix \ build/bin/rb-archfix:bin/rb-archfix \ build/contrib/check_perms_grsecurity.py:contrib/check_perms_grsecurity.py \ diff --git a/configure.in b/configure.in index f7bb7919..e4956674 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 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 @@ -23,6 +23,10 @@ AC_INIT(src/common.h) # /usr/local/mailman is the default installation directory AC_PREFIX_DEFAULT(/usr/local/mailman) +CONFIGURE_OPTS=`echo $@` +AC_SUBST(CONFIGURE_OPTS) +BUILD_DATE=`date` +AC_SUBST(BUILD_DATE) # Check for Python! Better be found on $PATH AC_MSG_CHECKING(for --with-python) @@ -135,6 +139,17 @@ $PYTHON conftest.py needemailpkg=`cat conftest.out` rm -f conftest.out conftest.py +cat > getver.py <<EOF +from Mailman.Version import VERSION +fp = open("getver.out", "w") +fp.write("%s\n" % VERSION) +fp.close() +EOF +$PYTHON getver.py +MM_VERSION=`cat getver.out` +rm -f getver.out getver.py +AC_SUBST(MM_VERSION) + # Should we rely on Python's own email package or use the pre-packaged version? AC_SUBST(EMAILPKG) if test "$needemailpkg" = "ok" @@ -705,6 +720,7 @@ bin/unshunt \ bin/update \ bin/version \ bin/withlist \ +bin/mailman-config \ bin/b4b5-archfix \ bin/rb-archfix \ contrib/check_perms_grsecurity.py \ |