Hey,

I'm attaching a couple patches so they can be considered:

0001-Make-MU_SIEVE_MODDIR-configurable.patch is being applied to Debian
as part of the effort to make libmailutilsX coinstallable, to ease
upgrades and so on, by versioning the mailutils subdirectories in
libdir.

0002-Add-missing-mbdel.at-to-TESTSUITE_AT.patch adds a missing at file
to TESTSUITE_AT, so that it gets included in tarballs.

Unfortunately the IMAP tests fail regardless this fix (but this is no
regression, it's been like this for a long time), more on that when I
get full debug output.


-- 
Jordi Mallach <jo...@debian.org>
Debian Project
From 1a613886e5a2b9b6fb9118cf9037b21cb9733b34 Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jo...@debian.org>
Date: Mon, 7 Sep 2020 20:09:46 +0200
Subject: [PATCH 1/2] Make MU_SIEVE_MODDIR configurable.

---
 configure.ac | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index fa5baa031..174ee017a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,14 @@ AC_SUBST(MU_LIB_PY)
 
 dnl Other variables
 AC_SUBST(mu_aux_dir,'$(top_srcdir)/mu-aux')
-AC_SUBST(MU_SIEVE_MODDIR,'$(libdir)/$(PACKAGE)')
+
+AC_ARG_VAR([MU_SIEVE_MODDIR],
+           [Set the location for the sieve modules. Default is \$libdir/$(PACKAGE)])
+
+AC_SUBST(MU_SIEVE_MODDIR)
+if test -z "$MU_SIEVE_MODDIR"; then
+  MU_SIEVE_MODDIR='$(libdir)/$(PACKAGE)'
+fi
 
 AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)')
 AC_SUBST(MU_APP_LIBRARIES,'${top_builddir}/lib/libmuaux.la ${UNISTRING_LIBS}')
-- 
2.28.0

From 3ebecb706b2d5b840d4d18f5e975beafb3ee379e Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jo...@debian.org>
Date: Mon, 7 Sep 2020 20:11:02 +0200
Subject: [PATCH 2/2] Add missing mbdel.at to TESTSUITE_AT.

---
 libtests/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libtests/Makefile.am b/libtests/Makefile.am
index 03192e350..3cb7b3580 100644
--- a/libtests/Makefile.am
+++ b/libtests/Makefile.am
@@ -21,6 +21,7 @@ TESTSUITE_AT += \
  lstuid00.at\
  lstuid01.at\
  lstuid02.at\
+ mbdel.at\
  mime.at\
  mime01.at
 
-- 
2.28.0

Reply via email to