From 75c03ef2312398560c05800d35ffffe0fe15ef7e Mon Sep 17 00:00:00 2001
From: Lindsay <fmouse@fmp.com>
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 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'configure')

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 <<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"
@@ -4548,6 +4566,7 @@ 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 \
-- 
cgit v1.2.3


From a68d0a0033a99545601011ffbaaa156c93504c31 Mon Sep 17 00:00:00 2001
From: Lindsay <fmouse@fmp.com>
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.

---
 configure | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'configure')

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 \
-- 
cgit v1.2.3