Bug#750010: pu: package mlmmj/1.2.18.1-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu
Dear release team,
Upstream for MLMMJ has released a bugfix version correcting
a few bugs, one of which is the loss of some emails in some
cases, which is IMO bad enough to deserve a correction in
Debian Stable.
The upstream ChangeLog file contains:
1.2.18.1
o Stop mlmmj-maintd deleting list posts while they are being sent
o Fix +list from crashing Mlmmj
o Fix bug that made double subscription possible
I believe these are important bugfixes.
I have attached the debdiff between 1.2.18.0-2 and
1.2.18.1-1 which I just uploaded to Sid. There's a bit of
noise in this debdiff, like the Makefile.in, some doc
updates, and such. These are only updates of the GNU
tooling, and I don't believe there's much impact on
MLMMJ itself. However, the interesting part is the
last bits, with the below files updated:
src/mlmmj-maintd.c
src/send_list.c
src/subscriberfuncs.c
When filtering to only these .c files, the patch is only
138 lines long (so, much more easy to review).
So, I would like to upgrade the current Wheezy version of
MLMMJ to the upstream release 1.2.18.1. If that was not
possible from the view of the release team, then I would
like to add a patch to the current version including all
the modifications on the .c files seen in the attached
diff file.
Please let me know the stable release team view on this,
Cheers,
Thomas Goirand (zigo)
diff -Nru mlmmj-1.2.18.0/aclocal.m4 mlmmj-1.2.18.1/aclocal.m4
--- mlmmj-1.2.18.0/aclocal.m4 2012-05-29 13:47:25.000000000 +0000
+++ mlmmj-1.2.18.1/aclocal.m4 2014-02-05 06:12:37.000000000 +0000
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.12 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
+
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -26,8 +25,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
-
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -37,7 +34,7 @@
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -53,7 +50,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -66,8 +63,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
-
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
@@ -121,8 +116,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 10
-
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
@@ -154,7 +147,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 16
# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -166,7 +158,7 @@
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -182,6 +174,7 @@
m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
[$1], [CXX], [depcc="$CXX" am_compiler_list=],
[$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
[$1], [UPC], [depcc="$UPC" am_compiler_list=],
[$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
@@ -345,7 +338,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 6
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
@@ -420,8 +412,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
-
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
@@ -433,8 +423,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 18
-
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -479,7 +467,10 @@
# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+[$0: two- and three-arguments forms are deprecated. For more info, see:
+http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
@@ -505,7 +496,12 @@
AM_MISSING_PROG([MAKEINFO], [makeinfo])
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
@@ -517,16 +513,23 @@
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
[_AM_DEPENDENCIES([CC])],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+ [m4_define([AC_PROG_CC],
+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES([CXX])],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+ [m4_define([AC_PROG_CXX],
+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
[_AM_DEPENDENCIES([OBJC])],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+ [m4_define([AC_PROG_OBJC],
+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+dnl Support for Objective C++ was only introduced in Autoconf 2.65,
+dnl but we still cater to Autoconf 2.62.
+m4_ifdef([AC_PROG_OBJCXX],
+[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+ [_AM_DEPENDENCIES([OBJCXX])],
+ [m4_define([AC_PROG_OBJCXX],
+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
])
_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
@@ -571,8 +574,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
-
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@ -594,8 +595,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
-
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
@@ -617,8 +616,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
-
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
@@ -669,8 +666,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 7
-
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
@@ -678,7 +673,6 @@
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-
# AM_MISSING_HAS_RUN
# ------------------
# Define MISSING if not defined so far and test if it supports --run.
@@ -703,34 +697,6 @@
fi
])
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for 'mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001-2012 Free Software Foundation, Inc.
@@ -739,8 +705,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 6
-
# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
@@ -772,8 +736,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 9
-
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
@@ -855,8 +817,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
-
# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor 'install' (even GNU) is that you can't
@@ -885,8 +845,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
-
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -906,8 +864,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
-
# _AM_PROG_TAR(FORMAT)
# --------------------
# Check how to create a tarball in format FORMAT.
diff -Nru mlmmj-1.2.18.0/ChangeLog mlmmj-1.2.18.1/ChangeLog
--- mlmmj-1.2.18.0/ChangeLog 2012-05-29 13:43:06.000000000 +0000
+++ mlmmj-1.2.18.1/ChangeLog 2014-02-05 06:08:53.000000000 +0000
@@ -1,3 +1,7 @@
+1.2.18.1
+ o Stop mlmmj-maintd deleting list posts while they are being sent
+ o Fix +list from crashing Mlmmj
+ o Fix bug that made double subscription possible
1.2.18.0
o New list texts (Ben Schmidt, Xuacu Saturio, Nino Novak, Sophie Gautier,
Epaminondas Diamantopoulos, Valter Mura, Sérgio Marques, Milos Sramek, Dean
diff -Nru mlmmj-1.2.18.0/configure mlmmj-1.2.18.1/configure
--- mlmmj-1.2.18.0/configure 2012-05-29 13:47:26.000000000 +0000
+++ mlmmj-1.2.18.1/configure 2014-02-05 06:12:37.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mlmmj 1.2.18.0.
+# Generated by GNU Autoconf 2.69 for mlmmj 1.2.18.1.
#
# Report bugs to <mmj@mmj.dk>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='mlmmj'
PACKAGE_TARNAME='mlmmj'
-PACKAGE_VERSION='1.2.18.0'
-PACKAGE_STRING='mlmmj 1.2.18.0'
+PACKAGE_VERSION='1.2.18.1'
+PACKAGE_STRING='mlmmj 1.2.18.1'
PACKAGE_BUGREPORT='mmj@mmj.dk'
PACKAGE_URL=''
@@ -1264,7 +1264,7 @@
# 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 mlmmj 1.2.18.0 to adapt to many kinds of systems.
+\`configure' configures mlmmj 1.2.18.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1330,7 +1330,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mlmmj 1.2.18.0:";;
+ short | recursive ) echo "Configuration of mlmmj 1.2.18.1:";;
esac
cat <<\_ACEOF
@@ -1420,7 +1420,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mlmmj configure 1.2.18.0
+mlmmj configure 1.2.18.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1843,7 +1843,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mlmmj $as_me 1.2.18.0, which was
+It was created by mlmmj $as_me 1.2.18.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2567,12 +2567,6 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2676,6 +2670,7 @@
# Define the identity of the package.
+
PACKAGE=mlmmj
VERSION=$VERSION
@@ -2705,6 +2700,12 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
@@ -4977,7 +4978,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mlmmj $as_me 1.2.18.0, which was
+This file was extended by mlmmj $as_me 1.2.18.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5043,7 +5044,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mlmmj config.status 1.2.18.0
+mlmmj config.status 1.2.18.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru mlmmj-1.2.18.0/contrib/Makefile.in mlmmj-1.2.18.1/contrib/Makefile.in
--- mlmmj-1.2.18.0/contrib/Makefile.in 2012-05-29 13:47:27.000000000 +0000
+++ mlmmj-1.2.18.1/contrib/Makefile.in 2014-02-05 06:12:38.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.12 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -235,7 +234,7 @@
# (1) if the variable is set in 'config.status', edit 'config.status'
# (which will cause the Makefiles to be regenerated when you run 'make');
# (2) otherwise, pass the desired values on the 'make' command line.
-$(RECURSIVE_TARGETS):
+$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -245,7 +244,11 @@
done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -259,37 +262,6 @@
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
diff -Nru mlmmj-1.2.18.0/contrib/receivestrip/Makefile.in mlmmj-1.2.18.1/contrib/receivestrip/Makefile.in
--- mlmmj-1.2.18.0/contrib/receivestrip/Makefile.in 2012-05-29 13:47:27.000000000 +0000
+++ mlmmj-1.2.18.1/contrib/receivestrip/Makefile.in 2014-02-05 06:12:38.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.12 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -Nru mlmmj-1.2.18.0/debian/changelog mlmmj-1.2.18.1/debian/changelog
--- mlmmj-1.2.18.0/debian/changelog 2012-06-21 16:31:33.000000000 +0000
+++ mlmmj-1.2.18.1/debian/changelog 2014-05-31 14:44:56.000000000 +0000
@@ -1,3 +1,14 @@
+mlmmj (1.2.18.1-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #749959).
+ * Added Brazilian Portuguese debconf templates translation thanks to
+ Adriano Rafael Gomes <adrianorg@gmail.com> (Closes: #693384).
+ * Now also packages README.listtexts.
+ * VCS URLs now canonical.
+ * Standards-Version is now 3.9.5.
+
+ -- Thomas Goirand <zigo@debian.org> Sat, 31 May 2014 14:33:19 +0000
+
mlmmj (1.2.18.0-2) unstable; urgency=low
* Fixes path to web files, now conf files are in /etc (Closes: #677817),
diff -Nru mlmmj-1.2.18.0/debian/control mlmmj-1.2.18.1/debian/control
--- mlmmj-1.2.18.0/debian/control 2012-06-21 16:31:33.000000000 +0000
+++ mlmmj-1.2.18.1/debian/control 2014-05-31 14:44:56.000000000 +0000
@@ -4,9 +4,9 @@
Maintainer: MLMMJ packaging team <pkg-mlmmj-devel@lists.alioth.debian.org>
Uploaders: Thomas Goirand <zigo@debian.org>
Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1~)
-Standards-Version: 3.9.3
-Vcs-Browser: http://git.debian.org/?p=pkg-mlmmj/mlmmj.git
-Vcs-Git: http://git.debian.org/git/pkg-mlmmj/mlmmj.git
+Standards-Version: 3.9.5
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mlmmj/mlmmj.git
+Vcs-Git: http://anonscm.debian.org/git/pkg-mlmmj/mlmmj.git
Homepage: http://mlmmj.org/
Package: mlmmj
diff -Nru mlmmj-1.2.18.0/debian/docs mlmmj-1.2.18.1/debian/docs
--- mlmmj-1.2.18.0/debian/docs 2012-06-21 16:31:33.000000000 +0000
+++ mlmmj-1.2.18.1/debian/docs 2014-05-31 14:44:56.000000000 +0000
@@ -9,5 +9,5 @@
TODO
TUNABLES
UPGRADE
-VERSION
debian/README.source
+README.listtexts
diff -Nru mlmmj-1.2.18.0/debian/po/pt_BR.po mlmmj-1.2.18.1/debian/po/pt_BR.po
--- mlmmj-1.2.18.0/debian/po/pt_BR.po 1970-01-01 00:00:00.000000000 +0000
+++ mlmmj-1.2.18.1/debian/po/pt_BR.po 2014-05-31 14:44:56.000000000 +0000
@@ -0,0 +1,52 @@
+# Debconf translations for mlmmj.
+# Copyright (C) 2012 THE mlmmj'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mlmmj package.
+# Adriano Rafael Gomes <adrianorg@gmail.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mlmmj 1.2.18.0-2\n"
+"Report-Msgid-Bugs-To: mlmmj@packages.debian.org\n"
+"POT-Creation-Date: 2012-02-09 19:44+0100\n"
+"PO-Revision-Date: 2012-09-09 23:05-0300\n"
+"Last-Translator: Adriano Rafael Gomes <adrianorg@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../mlmmj.templates:1001
+msgid "Remove mlmmj lists on purge?"
+msgstr "Remover listas mlmmj ao expurgar?"
+
+#. Type: boolean
+#. Description
+#: ../mlmmj.templates:1001
+msgid ""
+"Removing mlmmj on purge includes the removal of all subscriber lists, "
+"archives and configuration options for all lists currently stored."
+msgstr ""
+"Remover o mlmmj ao expurgar inclui a remoção de todas as listas de "
+"inscritos, arquivos e opções de configuração para todas as listas "
+"armazenadas atualmente."
+
+#. Type: boolean
+#. Description
+#: ../mlmmj.templates:1001
+msgid ""
+"Accepting here basically means that everything under /var/spool/mlmmj and /"
+"etc/mlmmj/lists will be removed when this package is purged. Also please "
+"note that any changes you might have made to /etc/aliases will not be unmade "
+"automatically when this package is removed. (A notice will be displayed "
+"however, to remind you to clean up your aliases.)"
+msgstr ""
+"Aceitar aqui significa, basicamente, que tudo o que estiver abaixo de /var/"
+"spool/mlmmj e /etc/mlmmj/lists será removido quando esse pacote for "
+"expurgado. Note também, por favor, que quaisquer alterações que você possa "
+"ter feito em /etc/aliases não serão desfeitas automaticamente quando esse "
+"pacote for removido. (Entretanto, será exibido um aviso para lembrá-lo de "
+"limpar os seus \"aliases\".)"
diff -Nru mlmmj-1.2.18.0/depcomp mlmmj-1.2.18.1/depcomp
--- mlmmj-1.2.18.0/depcomp 2012-05-29 13:47:27.000000000 +0000
+++ mlmmj-1.2.18.1/depcomp 2014-02-05 06:12:38.000000000 +0000
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2012-03-27.16; # UTC
+scriptversion=2012-07-12.20; # UTC
# Copyright (C) 1999-2012 Free Software Foundation, Inc.
@@ -74,6 +74,9 @@
rm -f "$tmpdepfile"
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
@@ -108,7 +111,7 @@
fi
if test "$depmode" = xlc; then
- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
gccflag=-qmakedep=gcc,-MF
depmode=gcc
fi
@@ -142,13 +145,17 @@
;;
gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
+## -MM, not -M (despite what the docs say). Also, it might not be
+## supported by the other compilers which use the 'gcc' depmode.
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
@@ -334,6 +341,79 @@
rm -f "$tmpdepfile"
;;
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file. A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+ # Portland's C compiler understands '-MD'.
+ # Will always output deps to 'file.d' where file is the root name of the
+ # source file under compilation, even if file resides in a subdirectory.
+ # The object file name does not affect the name of the '.d' file.
+ # pgcc 10.2 will output
+ # foo.o: sub/foo.c sub/foo.h
+ # and will wrap long lines using '\' :
+ # foo.o: sub/foo.c ... \
+ # sub/foo.h ... \
+ # ...
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ # Use the source, not the object, to determine the base name, since
+ # that's sadly what pgcc will do too.
+ base=`echo "$source" | sed -e 's|^.*/||' -e 's/\.[-_a-zA-Z0-9]*$//'`
+ tmpdepfile="$base.d"
+
+ # For projects that build the same source file twice into different object
+ # files, the pgcc approach of using the *source* file root name can cause
+ # problems in parallel builds. Use a locking strategy to avoid stomping on
+ # the same $tmpdepfile.
+ lockdir="$base.d-lock"
+ trap "echo '$0: caught signal, cleaning up...' >&2; rm -rf $lockdir" 1 2 13 15
+ numtries=100
+ i=$numtries
+ while test $i -gt 0 ; do
+ # mkdir is a portable test-and-set.
+ if mkdir $lockdir 2>/dev/null; then
+ # This process acquired the lock.
+ "$@" -MD
+ stat=$?
+ # Release the lock.
+ rm -rf $lockdir
+ break
+ else
+ ## the lock is being held by a different process,
+ ## wait until the winning process is done or we timeout
+ while test -d $lockdir && test $i -gt 0; do
+ sleep 1
+ i=`expr $i - 1`
+ done
+ fi
+ i=`expr $i - 1`
+ done
+ trap - 1 2 13 15
+ if test $i -le 0; then
+ echo "$0: failed to acquire lock after $numtries attempts" >&2
+ echo "$0: check lockdir '$lockdir'" >&2
+ exit 1
+ fi
+
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ # Each line is of the form `foo.o: dependent.h',
+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+ sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
hp2)
# The "hp" stanza above does not work with aCC (C++) and HP's ia64
# compilers, which have integrated preprocessors. The correct option
diff -Nru mlmmj-1.2.18.0/listtexts/Makefile.in mlmmj-1.2.18.1/listtexts/Makefile.in
--- mlmmj-1.2.18.0/listtexts/Makefile.in 2012-05-29 13:47:27.000000000 +0000
+++ mlmmj-1.2.18.1/listtexts/Makefile.in 2014-02-05 06:12:38.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.12 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -Nru mlmmj-1.2.18.0/Makefile.in mlmmj-1.2.18.1/Makefile.in
--- mlmmj-1.2.18.0/Makefile.in 2012-05-29 13:47:27.000000000 +0000
+++ mlmmj-1.2.18.1/Makefile.in 2014-02-05 06:12:38.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.12 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -359,7 +358,7 @@
# (1) if the variable is set in 'config.status', edit 'config.status'
# (which will cause the Makefiles to be regenerated when you run 'make');
# (2) otherwise, pass the desired values on the 'make' command line.
-$(RECURSIVE_TARGETS):
+$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -369,7 +368,11 @@
done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -383,37 +386,6 @@
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
@@ -645,9 +617,9 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
diff -Nru mlmmj-1.2.18.0/README mlmmj-1.2.18.1/README
--- mlmmj-1.2.18.0/README 2012-05-29 13:44:59.000000000 +0000
+++ mlmmj-1.2.18.1/README 2014-02-05 06:11:02.000000000 +0000
@@ -1,4 +1,4 @@
-README mlmmj-1.2.18.0 May 29, 2012
+README mlmmj-1.2.18.1 Feb 5, 2014
This is an attempt at implementing a mailing list manager with the same
functionality as the brilliant ezmlm, but with a decent license and mail server
@@ -8,16 +8,16 @@
· Archive
· Custom headers / footer
- · Fully automated bouncehandling (similar to ezmlm)
+ · Fully automated bounce handling (similar to ezmlm)
· Complete requeueing functionality
· Moderation functionality
· Subject prefix
· Subscribers only posting
· Regular expression access control
· Functionality to retrieve old posts
- · Web-interface
+ · Web interface
· Digests
- · No mail delivery subscription
+ · No-mail subscription
· VERP support
· Delivery Status Notification (RFC1891) support
· Rich, customisable texts for automated operations
diff -Nru mlmmj-1.2.18.0/README.listtexts mlmmj-1.2.18.1/README.listtexts
--- mlmmj-1.2.18.0/README.listtexts 2012-04-20 00:40:44.000000000 +0000
+++ mlmmj-1.2.18.1/README.listtexts 2013-06-27 21:44:53.000000000 +0000
@@ -368,6 +368,11 @@
- %listsubs%
(available only in list---*)
the list of normal subscribers
+ DEPRECATED: use %normalsubs%
+
+- %normalsubs%
+ (available only in list---*)
+ the list of normal subscribers
- %digestsubs%
(available only in list---*)
diff -Nru mlmmj-1.2.18.0/src/Makefile.in mlmmj-1.2.18.1/src/Makefile.in
--- mlmmj-1.2.18.0/src/Makefile.in 2012-05-29 13:47:27.000000000 +0000
+++ mlmmj-1.2.18.1/src/Makefile.in 2014-02-05 06:12:38.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.12 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -Nru mlmmj-1.2.18.0/src/mlmmj-maintd.c mlmmj-1.2.18.1/src/mlmmj-maintd.c
--- mlmmj-1.2.18.0/src/mlmmj-maintd.c 2012-03-27 02:08:44.000000000 +0000
+++ mlmmj-1.2.18.1/src/mlmmj-maintd.c 2014-02-05 06:10:39.000000000 +0000
@@ -247,6 +247,7 @@
ch = strrchr(mailname, '.');
MY_ASSERT(ch);
*ch = '\0';
+ /* delete orphaned sidecar files */
if(stat(mailname, &st) < 0) {
if(errno == ENOENT) {
*ch = '.';
@@ -267,11 +268,19 @@
tofd = open(toname, O_RDONLY);
if((fromfd < 0 && err == ENOENT) ||
- (tofd < 0 && errno == ENOENT)) {
- unlink(mailname);
- unlink(fromname);
- unlink(toname);
- unlink(reptoname);
+ (tofd < 0 && errno == ENOENT)) {
+ /* only delete old files to avoid deleting
+ mail currently being sent */
+ t = time(NULL);
+ if(stat(mailname, &st) == 0) {
+ if(t - st.st_mtime > (time_t)36000) {
+ unlink(mailname);
+ /* avoid leaving orphans */
+ unlink(fromname);
+ unlink(toname);
+ unlink(reptoname);
+ }
+ }
myfree(mailname);
myfree(fromname);
myfree(toname);
diff -Nru mlmmj-1.2.18.0/src/send_list.c mlmmj-1.2.18.1/src/send_list.c
--- mlmmj-1.2.18.0/src/send_list.c 2012-03-27 02:08:44.000000000 +0000
+++ mlmmj-1.2.18.1/src/send_list.c 2013-06-27 21:58:23.000000000 +0000
@@ -56,14 +56,13 @@
static subs_list_state *init_subs_list(const char *dirname)
{
- /* We use a static variable rather than dynamic allocation as
- * there will never be two lists in use simultaneously */
- static subs_list_state s;
- s.dirname = mystrdup(dirname);
- s.dirp = NULL;
- s.fd = -1;
- s.used = 0;
- return &s;
+ subs_list_state *s = mymalloc(sizeof(subs_list_state));
+ s->dirname = mystrdup(dirname);
+ s->dirp = NULL;
+ s->fd = -1;
+ s->line = NULL;
+ s->used = 0;
+ return s;
}
@@ -135,6 +134,7 @@
if (s->fd != -1) close(s->fd);
if (s->dirp != NULL) closedir(s->dirp);
myfree(s->dirname);
+ myfree(s);
}
@@ -155,7 +155,7 @@
const char *mlmmjsend)
{
text *txt;
- subs_list_state *subsls, *digestsls, *nomailsls;
+ subs_list_state *normalsls, *digestsls, *nomailsls;
char *queuefilename, *listaddr, *listdelim, *listname, *listfqdn;
char *fromaddr, *subdir, *nomaildir, *digestdir;
int fd;
@@ -171,7 +171,7 @@
subdir = concatstr(2, listdir, "/subscribers.d/");
digestdir = concatstr(2, listdir, "/digesters.d/");
nomaildir = concatstr(2, listdir, "/nomailsubs.d/");
- subsls = init_subs_list(subdir);
+ normalsls = init_subs_list(subdir);
digestsls = init_subs_list(digestdir);
nomailsls = init_subs_list(nomaildir);
myfree(subdir);
@@ -181,8 +181,10 @@
txt = open_text(listdir, "list", NULL, NULL, subtype_strs[SUB_ALL],
"listsubs");
MY_ASSERT(txt);
- register_formatted(txt, "subs",
- rewind_subs_list, get_sub, subsls);
+ register_formatted(txt, "listsubs",
+ rewind_subs_list, get_sub, normalsls);
+ register_formatted(txt, "normalsubs",
+ rewind_subs_list, get_sub, normalsls);
register_formatted(txt, "digestsubs",
rewind_subs_list, get_sub, digestsls);
register_formatted(txt, "nomailsubs",
@@ -193,7 +195,7 @@
/* DEPRECATED */
/* Add lists manually if they weren't encountered in the list text */
- if (!subsls->used && !digestsls->used && !nomailsls->used) {
+ if (!normalsls->used && !digestsls->used && !nomailsls->used) {
fd = open(queuefilename, O_WRONLY);
if(fd < 0) {
log_error(LOG_ARGS, "Could not open sub list mail");
@@ -203,7 +205,7 @@
log_error(LOG_ARGS, "Could not seek to end of file");
exit(EXIT_FAILURE);
}
- print_subs(fd, subsls);
+ print_subs(fd, normalsls);
writen(fd, "\n-- \n", 5);
print_subs(fd, nomailsls);
writen(fd, "\n-- \n", 5);
@@ -212,7 +214,7 @@
close(fd);
}
- finish_subs_list(subsls);
+ finish_subs_list(normalsls);
finish_subs_list(digestsls);
finish_subs_list(nomailsls);
myfree(listaddr);
diff -Nru mlmmj-1.2.18.0/src/subscriberfuncs.c mlmmj-1.2.18.1/src/subscriberfuncs.c
--- mlmmj-1.2.18.0/src/subscriberfuncs.c 2012-03-27 02:08:44.000000000 +0000
+++ mlmmj-1.2.18.1/src/subscriberfuncs.c 2013-05-08 09:56:55.000000000 +0000
@@ -180,5 +180,5 @@
myfree(subddirname);
if (retval) return SUB_NOMAIL;
- return SUB_NONE;
+ return typesub;
}
diff -Nru mlmmj-1.2.18.0/VERSION mlmmj-1.2.18.1/VERSION
--- mlmmj-1.2.18.0/VERSION 2012-05-29 13:43:56.000000000 +0000
+++ mlmmj-1.2.18.1/VERSION 2014-02-05 06:10:49.000000000 +0000
@@ -1 +1 @@
-1.2.18.0
+1.2.18.1
Reply to: