Index | Thread | Search

From:
Stefan Hagen <sh+openbsd-ports@codevoid.de>
Subject:
[maint-update] mail/mu 1.10.8 -> 1.12.6
To:
ports@openbsd.org
Date:
Sat, 24 Aug 2024 16:56:17 +0200

Download raw body.

Thread 
Hello,

this is a major update to mail/mu.

There are a lot of changes. Please read /usr/local/share/doc/mu/NEWS.org
or its online equivalent https://github.com/djcb/mu/blob/master/NEWS.org

The test target has one test failing for mu, and two failing for
mu-guile. That's expected as they both access paths not allowed with
enabled privsep in ports. When executed manually outside the ports 
infrastructure, they run fine.

I'm mainly using "mu" with mutt, therefore I'm looking for people that
use the mu4e and the guile part for some tests and OKs / comments.

Best Regards,
Stefan

Index: mail/mu/Makefile
===================================================================
RCS file: /cvs/ports/mail/mu/Makefile,v
diff -u -p -u -p -r1.44 Makefile
--- mail/mu/Makefile	10 Nov 2023 09:59:14 -0000	1.44
+++ mail/mu/Makefile	24 Aug 2024 14:53:04 -0000
@@ -18,7 +18,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB += ${COMPILER_LIBCXX} c gio-2.0 glib-2.0 gmime-3.0 gobject-2.0
 WANTLIB += m xapian
 
-DIST_TUPLE =	github djcb mu v1.10.8 .
+DIST_TUPLE =	github djcb mu v1.12.6 .
 
 EXTRACT_SUFX =	.tar.xz
 
@@ -41,7 +41,7 @@ CONFIGURE_ARGS +=	-Dguile=disabled
 .endif
 
 # needs readline >= 8.0
-CONFIGURE_ARGS +=	-Dreadline=disabled
+CONFIGURE_ARGS +=	-Dreadline=disabled -Dcld2=disabled
 
 pre-configure:
 	sed -e 's/exec guile/exec guile${GUILE_V}/' -i \
Index: mail/mu/distinfo
===================================================================
RCS file: /cvs/ports/mail/mu/distinfo,v
diff -u -p -u -p -r1.28 distinfo
--- mail/mu/distinfo	10 Nov 2023 09:59:14 -0000	1.28
+++ mail/mu/distinfo	24 Aug 2024 14:53:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (djcb-mu-v1.10.8.tar.gz) = dh4HSuS7+ZXJMVB1O+VchJDz6XwZox5CiYMpZKh5G7E=
-SIZE (djcb-mu-v1.10.8.tar.gz) = 768318
+SHA256 (djcb-mu-v1.12.6.tar.gz) = E9VapW++h0ZQSlhYEXuAkmYMXL1ZxIybGmA4+ZstErA=
+SIZE (djcb-mu-v1.12.6.tar.gz) = 963258
Index: mail/mu/patches/patch-lib_mu-store-worker_hh
===================================================================
RCS file: mail/mu/patches/patch-lib_mu-store-worker_hh
diff -N mail/mu/patches/patch-lib_mu-store-worker_hh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mail/mu/patches/patch-lib_mu-store-worker_hh	24 Aug 2024 14:53:04 -0000
@@ -0,0 +1,12 @@
+Index: lib/mu-store-worker.hh
+--- lib/mu-store-worker.hh.orig
++++ lib/mu-store-worker.hh
+@@ -159,7 +159,7 @@ class StoreWorker { (private)
+ 	size_t cleanup_orphans();
+ 
+ 	QueueType q_;
+-	Store& store_;;
++	Store& store_;
+ 	std::thread runner_;
+ 	std::atomic<bool> running_{};
+ 	SexpCommandHandler sexp_handler_{};
Index: mail/mu/patches/patch-lib_mu-store_cc
===================================================================
RCS file: mail/mu/patches/patch-lib_mu-store_cc
diff -N mail/mu/patches/patch-lib_mu-store_cc
--- mail/mu/patches/patch-lib_mu-store_cc	5 Sep 2023 11:04:50 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-fix time_t format specifier
-
-Index: lib/mu-store.cc
---- lib/mu-store.cc.orig
-+++ lib/mu-store.cc
-@@ -699,7 +699,7 @@ Store::set_dirstamp(const std::string& path, time_t ts
- {
- 	std::array<char, 2 * sizeof(tstamp) + 1> data{};
- 	const auto len = static_cast<size_t>(
--	    g_snprintf(data.data(), data.size(), "%zx", tstamp));
-+	    g_snprintf(data.data(), data.size(), "%lld", (long long)tstamp));
- 
- 	set_metadata(path, std::string{data.data(), len});
- }
Index: mail/mu/patches/patch-lib_utils_mu-readline_cc
===================================================================
RCS file: /cvs/ports/mail/mu/patches/patch-lib_utils_mu-readline_cc,v
diff -u -p -u -p -r1.3 patch-lib_utils_mu-readline_cc
--- mail/mu/patches/patch-lib_utils_mu-readline_cc	31 Jul 2022 11:43:48 -0000	1.3
+++ mail/mu/patches/patch-lib_utils_mu-readline_cc	24 Aug 2024 14:53:04 -0000
@@ -3,7 +3,7 @@
 Index: lib/utils/mu-readline.cc
 --- lib/utils/mu-readline.cc.orig
 +++ lib/utils/mu-readline.cc
-@@ -74,7 +74,7 @@ Mu::have_readline()
+@@ -73,7 +73,7 @@ Mu::have_readline()
  void
  Mu::setup_readline(const std::string& histpath, size_t maxlines)
  {
Index: mail/mu/patches/patch-lib_utils_mu-utils-format_hh
===================================================================
RCS file: mail/mu/patches/patch-lib_utils_mu-utils-format_hh
diff -N mail/mu/patches/patch-lib_utils_mu-utils-format_hh
--- mail/mu/patches/patch-lib_utils_mu-utils-format_hh	19 Dec 2022 18:38:39 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: lib/utils/mu-utils-format.hh
---- lib/utils/mu-utils-format.hh.orig
-+++ lib/utils/mu-utils-format.hh
-@@ -52,7 +52,7 @@ std::string format(const char* frm, ...) __attribute__
-  *
-  * @return a formatted string
-  */
--std::string vformat(const char* frm, va_list args) __attribute__((format(printf, 1, 0)));
-+std::string vformat(const char* frm, __va_list args) __attribute__((format(printf, 1, 0)));
- 
- 
- } // namepace Mu
Index: mail/mu/patches/patch-mu_mu-cmd-server_cc
===================================================================
RCS file: /cvs/ports/mail/mu/patches/patch-mu_mu-cmd-server_cc,v
diff -u -p -u -p -r1.4 patch-mu_mu-cmd-server_cc
--- mail/mu/patches/patch-mu_mu-cmd-server_cc	5 Sep 2023 11:04:51 -0000	1.4
+++ mail/mu/patches/patch-mu_mu-cmd-server_cc	24 Aug 2024 14:53:04 -0000
@@ -3,9 +3,9 @@
 Index: mu/mu-cmd-server.cc
 --- mu/mu-cmd-server.cc.orig
 +++ mu/mu-cmd-server.cc
-@@ -125,7 +125,7 @@ Mu::mu_cmd_server(const Mu::Options& opts) try {
- 		  opts.debug ? "yes" : "no",
- 		  have_readline() ? "yes" : "no");
+@@ -120,7 +120,7 @@ Mu::mu_cmd_server(const Mu::Options& opts) try {
+ 		   opts.debug ? "yes" : "no",
+ 		   have_readline() ? "yes" : "no");
  
 -	tty = ::isatty(::fileno(stdout));
 +	tty = ::isatty(fileno(stdout));
Index: mail/mu/patches/patch-mu_mu-options_cc
===================================================================
RCS file: /cvs/ports/mail/mu/patches/patch-mu_mu-options_cc,v
diff -u -p -u -p -r1.1 patch-mu_mu-options_cc
--- mail/mu/patches/patch-mu_mu-options_cc	5 Sep 2023 11:04:51 -0000	1.1
+++ mail/mu/patches/patch-mu_mu-options_cc	24 Aug 2024 14:53:04 -0000
@@ -2,7 +2,7 @@
 Index: mu/mu-options.cc
 --- mu/mu-options.cc.orig
 +++ mu/mu-options.cc
-@@ -630,8 +630,8 @@ bool
+@@ -746,8 +746,8 @@ bool
  Options::default_no_color()
  {
  	static const auto no_color =
Index: mail/mu/pkg/PFRAG.guile
===================================================================
RCS file: /cvs/ports/mail/mu/pkg/PFRAG.guile,v
diff -u -p -u -p -r1.5 PFRAG.guile
--- mail/mu/pkg/PFRAG.guile	5 Sep 2023 11:04:51 -0000	1.5
+++ mail/mu/pkg/PFRAG.guile	24 Aug 2024 14:53:04 -0000
@@ -1,8 +1,8 @@
 info/mu-guile.info
 @lib lib/guile/3.0/extensions/libguile-mu.so.${LIBguile-mu_VERSION}
 share/guile/site/3.0/mu/
+share/guile/site/3.0/mu.scm
 share/guile/site/3.0/mu/message.scm
-share/guile/site/3.0/mu/mu.scm
 share/guile/site/3.0/mu/plot.scm
 share/guile/site/3.0/mu/script.scm
 share/guile/site/3.0/mu/stats.scm
Index: mail/mu/pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/mu/pkg/PLIST,v
diff -u -p -u -p -r1.12 PLIST
--- mail/mu/pkg/PLIST	10 Nov 2023 09:59:14 -0000	1.12
+++ mail/mu/pkg/PLIST	24 Aug 2024 14:53:04 -0000
@@ -3,13 +3,13 @@
 @man man/man1/mu-add.1
 @man man/man1/mu-cfind.1
 @man man/man1/mu-extract.1
-@man man/man1/mu-fields.1
 @man man/man1/mu-find.1
 @man man/man1/mu-help.1
 @man man/man1/mu-index.1
 @man man/man1/mu-info.1
 @man man/man1/mu-init.1
 @man man/man1/mu-mkdir.1
+@man man/man1/mu-move.1
 @man man/man1/mu-remove.1
 @man man/man1/mu-server.1
 @man man/man1/mu-verify.1
@@ -27,6 +27,7 @@ share/emacs/site-lisp/
 share/emacs/site-lisp/mu4e/
 share/emacs/site-lisp/mu4e/mu4e-actions.el
 share/emacs/site-lisp/mu4e/mu4e-actions.elc
+share/emacs/site-lisp/mu4e/mu4e-autoloads.el
 share/emacs/site-lisp/mu4e/mu4e-bookmarks.el
 share/emacs/site-lisp/mu4e/mu4e-bookmarks.elc
 share/emacs/site-lisp/mu4e/mu4e-compose.el
@@ -56,6 +57,8 @@ share/emacs/site-lisp/mu4e/mu4e-mark.el
 share/emacs/site-lisp/mu4e/mu4e-mark.elc
 share/emacs/site-lisp/mu4e/mu4e-message.el
 share/emacs/site-lisp/mu4e/mu4e-message.elc
+share/emacs/site-lisp/mu4e/mu4e-mime-parts.el
+share/emacs/site-lisp/mu4e/mu4e-mime-parts.elc
 share/emacs/site-lisp/mu4e/mu4e-modeline.el
 share/emacs/site-lisp/mu4e/mu4e-modeline.elc
 share/emacs/site-lisp/mu4e/mu4e-notification.el
@@ -64,6 +67,7 @@ share/emacs/site-lisp/mu4e/mu4e-obsolete
 share/emacs/site-lisp/mu4e/mu4e-obsolete.elc
 share/emacs/site-lisp/mu4e/mu4e-org.el
 share/emacs/site-lisp/mu4e/mu4e-org.elc
+share/emacs/site-lisp/mu4e/mu4e-pkg.el
 share/emacs/site-lisp/mu4e/mu4e-query-items.el
 share/emacs/site-lisp/mu4e/mu4e-query-items.elc
 share/emacs/site-lisp/mu4e/mu4e-search.el
@@ -72,6 +76,8 @@ share/emacs/site-lisp/mu4e/mu4e-server.e
 share/emacs/site-lisp/mu4e/mu4e-server.elc
 share/emacs/site-lisp/mu4e/mu4e-speedbar.el
 share/emacs/site-lisp/mu4e/mu4e-speedbar.elc
+share/emacs/site-lisp/mu4e/mu4e-thread.el
+share/emacs/site-lisp/mu4e/mu4e-thread.elc
 share/emacs/site-lisp/mu4e/mu4e-update.el
 share/emacs/site-lisp/mu4e/mu4e-update.elc
 share/emacs/site-lisp/mu4e/mu4e-vars.el