From 75c03ef2312398560c05800d35ffffe0fe15ef7e Mon Sep 17 00:00:00 2001 From: Lindsay Date: Sat, 6 Jan 2018 16:13:00 -0600 Subject: Added contrib/mailman-config.py and changes to configure.in and configure to support it. mailman-config.py is added to the build/contrib directory when configure is run, and when executed, emits, to stdout, a number of useful configuration options, including the option string provided to configure at build time. This is useful when updating Mailman 2, or when trying to synchronize a manual install of Mailman with a distribution's FHS. --- configure | 19 +++++++++++++++++++ configure.in | 16 ++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/configure b/configure index 2c31df3f..3f67f85e 100755 --- a/configure +++ b/configure @@ -651,8 +651,11 @@ INSTALL_PROGRAM KOCODECSPKG JACODECSPKG EMAILPKG +MM_VERSION PYTHON with_python +BUILD_DATE +CONFIGURE_OPTS target_alias host_alias build_alias @@ -2127,6 +2130,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 +2299,17 @@ $PYTHON conftest.py needemailpkg=`cat conftest.out` rm -f conftest.out conftest.py +cat > getver.py < getver.py < Date: Sat, 6 Jan 2018 17:45:32 -0600 Subject: mailman-config.py builds to a small utility to output build-time stats and options --- contrib/README.mailman-config | 7 +++++++ contrib/mailman-config.py | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 contrib/README.mailman-config create mode 100644 contrib/mailman-config.py diff --git a/contrib/README.mailman-config b/contrib/README.mailman-config new file mode 100644 index 00000000..17f37dd5 --- /dev/null +++ b/contrib/README.mailman-config @@ -0,0 +1,7 @@ +The mailman-config.py script simply displays a few build-time option choices, +along with the option string provided to the configure script on the command +line. The latter is convenient when updating to a new version of Mailman 2, or +when trying to synchronize a manual Mailman installation with a the FHS of a +distribution. + +Currently the script requires python 2.x. diff --git a/contrib/mailman-config.py b/contrib/mailman-config.py new file mode 100644 index 00000000..70492036 --- /dev/null +++ b/contrib/mailman-config.py @@ -0,0 +1,22 @@ +#! @PYTHON@ + +# Show build-time configuration options +# This is free software under the GNU General Public License. +# Send bug reports or suggestions to Lindsay Haisley + +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@" + -- cgit v1.2.3 From a68d0a0033a99545601011ffbaaa156c93504c31 Mon Sep 17 00:00:00 2001 From: Lindsay Date: Sat, 6 Jan 2018 22:18:27 -0600 Subject: Configured source to put mailman-config in bin rather than contrib. Changed the name from mailman-config.py to mailman-config. --- bin/Makefile.in | 2 +- bin/mailman-config | 22 ++++++++++++++++++++++ configure | 16 ++++++++++++++-- configure.in | 2 +- contrib/mailman-config.py | 22 ---------------------- 5 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 bin/mailman-config delete mode 100644 contrib/mailman-config.py diff --git a/bin/Makefile.in b/bin/Makefile.in index 22c24b04..c8fae282 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -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..70492036 --- /dev/null +++ b/bin/mailman-config @@ -0,0 +1,22 @@ +#! @PYTHON@ + +# Show build-time configuration options +# This is free software under the GNU General Public License. +# Send bug reports or suggestions to Lindsay Haisley + +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@" + diff --git a/configure b/configure index 3f67f85e..6749b007 100755 --- a/configure +++ b/configure @@ -675,6 +675,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -756,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}' @@ -1008,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=* \ @@ -1145,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. @@ -1298,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] @@ -4560,13 +4572,13 @@ 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 \ build/contrib/qmail-to-mailman.py:contrib/qmail-to-mailman.py \ build/contrib/courier-to-mailman.py:contrib/courier-to-mailman.py \ build/contrib/rotatelogs.py:contrib/rotatelogs.py \ -build/contrib/mailman-config.py:contrib/mailman-config.py \ build/cron/bumpdigests:cron/bumpdigests \ build/cron/checkdbs:cron/checkdbs \ build/cron/cull_bad_shunt:cron/cull_bad_shunt \ diff --git a/configure.in b/configure.in index ead04a3a..4946367b 100644 --- a/configure.in +++ b/configure.in @@ -720,13 +720,13 @@ bin/unshunt \ bin/update \ bin/version \ bin/withlist \ +bin/mailman-config \ bin/b4b5-archfix \ bin/rb-archfix \ contrib/check_perms_grsecurity.py \ contrib/qmail-to-mailman.py \ contrib/courier-to-mailman.py \ contrib/rotatelogs.py \ -contrib/mailman-config.py \ cron/bumpdigests \ cron/checkdbs \ cron/cull_bad_shunt \ diff --git a/contrib/mailman-config.py b/contrib/mailman-config.py deleted file mode 100644 index 70492036..00000000 --- a/contrib/mailman-config.py +++ /dev/null @@ -1,22 +0,0 @@ -#! @PYTHON@ - -# Show build-time configuration options -# This is free software under the GNU General Public License. -# Send bug reports or suggestions to Lindsay Haisley - -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@" - -- cgit v1.2.3 From c01bc186bac0d687355b79f433f3b038c7bb936f Mon Sep 17 00:00:00 2001 From: Lindsay Date: Sun, 7 Jan 2018 12:30:52 -0600 Subject: Added customery GPL notice and disclaimers. --- bin/mailman-config | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/bin/mailman-config b/bin/mailman-config index 70492036..107ae083 100644 --- a/bin/mailman-config +++ b/bin/mailman-config @@ -1,9 +1,27 @@ #! @PYTHON@ - -# Show build-time configuration options -# This is free software under the GNU General Public License. +# +# Copyright (C) 2018 by Further Music Productions, 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 +"""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@" -- cgit v1.2.3 From 88da2bf6b172587f9e42c8730b7d4a6f97b91c90 Mon Sep 17 00:00:00 2001 From: Lindsay Date: Wed, 10 Jan 2018 23:03:17 -0600 Subject: Added appropriate FSF Copyright notices --- bin/Makefile.in | 2 +- bin/mailman-config | 2 +- configure.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/Makefile.in b/bin/Makefile.in index c8fae282..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 diff --git a/bin/mailman-config b/bin/mailman-config index 107ae083..6f845270 100644 --- a/bin/mailman-config +++ b/bin/mailman-config @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2018 by Further Music Productions, Inc. +# 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 diff --git a/configure.in b/configure.in index 4946367b..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 -- cgit v1.2.3