groups/241.native_packages_inet.group: mailutils: bump to v3.15

Signed-off-by: Ørjan Malde <red@foxi.me>

3 files changed, 16 insertions, 78 deletions

diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 9522fc60..862fbe0b 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -140,14 +140,13 @@ gl_cv_ld_output_def=no"};
 : ${PKG_LYNX_CONFIGURE_ARGS_EXTRA:=--with-gnutls};
 : ${PKG_LYNX_SUBDIR:=lynx2-8-8};
 : ${PKG_LYNX_DISABLED:=1};
-: ${PKG_MAILUTILS_DEPENDS:="gnutls ncurses"};
-: ${PKG_MAILUTILS_SHA256SUM:=f39f528cf6eebc9a045658bd98c86619002f06df4664647e4f78e27e90c62173};
-: ${PKG_MAILUTILS_VERSION:=3.4};
+: ${PKG_MAILUTILS_DEPENDS:="gnutls ncurses libunistring"};
+: ${PKG_MAILUTILS_SHA256SUM:=b7d0c286c352fcc7da7978cfd617cc66736b21fa891aa4f88855f516354f2ddb};
+: ${PKG_MAILUTILS_VERSION:=3.15};
 : ${PKG_MAILUTILS_URL:=https://ftp.gnu.org/gnu/mailutils/mailutils-${PKG_MAILUTILS_VERSION}.tar.xz};
 : ${PKG_MAILUTILS_CONFIGURE_ARGS_EXTRA:="mu_cv_lib_gnutls=yes --disable-python --with-gnutls --without-fribidi"};
-: ${PKG_MAILUTILS_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib -lgnutls"};
+: ${PKG_MAILUTILS_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib -lgnutls -lunistring"};
 : ${PKG_MAILUTILS_IN_TREE=1};
-: ${PKG_MAILUTILS_DISABLED:=1};
 : ${PKG_MICROSOCKS_URLS_GIT:=microsocks=https://github.com/rofl0r/microsocks.git@master};
 : ${PKG_MICROSOCKS_BUILD_DIR:=microsocks};
 : ${PKG_MUTT_DEPENDS:="gnutls libz ncursesw"};
diff --git a/patches/mailutils-3.15.local.patch b/patches/mailutils-3.15.local.patch
new file mode 100644
index 00000000..e9dc8300
--- /dev/null
+++ b/patches/mailutils-3.15.local.patch
@@ -0,0 +1,12 @@
+diff -ru mailutils-3.15.orig/lib/Makefile.in mailutils-3.15/lib/Makefile.in
+--- mailutils-3.15.orig/lib/Makefile.in	2022-04-17 20:20:37.000000000 +0200
++++ mailutils-3.15/lib/Makefile.in	2022-09-23 01:00:08.964321598 +0200
+@@ -1031,7 +1031,7 @@
+ noinst_LIBRARIES = libmuscript.a libmutcpwrap.a
+ libmuaux_la_SOURCES = mailcap.c manlock.c mdecode.c signal.c strexit.c \
+ 	mu_umaxtostr.c mu_umaxtostr.h $(am__append_3) $(am__append_4)
+-libmuaux_la_LIBADD = gnu/libgnu.la
++libmuaux_la_LIBADD = gnu/libgnu.la ../libmailutils/libmailutils.la
+ libmuaux_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
+ libmutcpwrap_a_SOURCES = tcpwrap.c
+ noinst_HEADERS = \
diff --git a/patches/mailutils-3.4.local.patch b/patches/mailutils-3.4.local.patch
deleted file mode 100644
index 85148894..00000000
--- a/patches/mailutils-3.4.local.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -ru mailutils-3.4.orig/imap4d/Makefile.in mailutils-3.4/imap4d/Makefile.in
---- mailutils-3.4.orig/imap4d/Makefile.in	2017-11-02 12:21:12.000000000 +0100
-+++ mailutils-3.4/imap4d/Makefile.in	2018-05-21 13:21:33.429204950 +0200
-@@ -1048,8 +1048,9 @@
-  ${MU_LIB_MAILDIR}\
-  ${MU_LIB_AUTH}\
-  @MU_AUTHLIBS@ \
-+ @MU_TCPWRAP_LIBRARIES@\
-  ${MU_LIB_MAILUTILS}\
-- @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@ @MU_TCPWRAP_LIBRARIES@
-+ @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@
- 
- imap4d_DEPENDENCIES = \
-  @MU_AUTHLIBS_DEPENDENCY@\
-diff -ru mailutils-3.4.orig/lib/Makefile.in mailutils-3.4/lib/Makefile.in
---- mailutils-3.4.orig/lib/Makefile.in	2017-11-02 12:21:13.000000000 +0100
-+++ mailutils-3.4/lib/Makefile.in	2018-05-21 13:30:13.216744220 +0200
-@@ -183,7 +183,7 @@
-   }
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lispdir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libmuaux_la_DEPENDENCIES = gnu/libgnu.la
-+libmuaux_la_DEPENDENCIES = gnu/libgnu.la ../libmailutils/libmailutils.la
- am_libmuaux_la_OBJECTS = daemon.lo mailcap.lo manlock.lo signal.lo \
- 	strexit.lo mu_umaxtostr.lo
- libmuaux_la_OBJECTS = $(am_libmuaux_la_OBJECTS)
-@@ -1019,7 +1019,7 @@
-  mu_umaxtostr.c\
-  mu_umaxtostr.h
- 
--libmuaux_la_LIBADD = gnu/libgnu.la
-+libmuaux_la_LIBADD = gnu/libgnu.la ../libmailutils/libmailutils.la
- libmuaux_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
- libmutcpwrap_a_SOURCES = tcpwrap.c
- noinst_HEADERS = \
-diff -ru mailutils-3.4.orig/maidag/Makefile.in mailutils-3.4/maidag/Makefile.in
---- mailutils-3.4.orig/maidag/Makefile.in	2017-11-02 12:21:19.000000000 +0100
-+++ mailutils-3.4/maidag/Makefile.in	2018-05-21 13:25:16.403865751 +0200
-@@ -1022,6 +1022,7 @@
-  ${MU_LIB_AUTH}\
-  ${MU_LIB_MAILER}\
-  @MU_AUTHLIBS@\
-+ @MU_TCPWRAP_LIBRARIES@\
-  ${MU_LIB_MAILUTILS} \
-  @MU_COMMON_LIBRARIES@\
-  @LIBMU_SCM@\
-@@ -1030,8 +1031,7 @@
-  $(LIBMU_DBM)\
-  @GUILE_LIBS@\
-  @PYTHON_LIBS@\
-- @DBMLIBS@\
-- @MU_TCPWRAP_LIBRARIES@
-+ @DBMLIBS@
- 
- AM_CPPFLAGS = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@ \
-  @PYTHON_INCLUDES@
-diff -ru mailutils-3.4.orig/pop3d/Makefile.in mailutils-3.4/pop3d/Makefile.in
---- mailutils-3.4.orig/pop3d/Makefile.in	2017-11-02 12:21:22.000000000 +0100
-+++ mailutils-3.4/pop3d/Makefile.in	2018-05-21 13:25:05.807995953 +0200
-@@ -1019,11 +1019,11 @@
-  ${MU_LIB_MAILDIR}\
-  ${MU_LIB_AUTH}\
-  @MU_AUTHLIBS@ \
-+ @MU_TCPWRAP_LIBRARIES@\
-  ${MU_LIB_MAILUTILS}\
-  @MU_COMMON_LIBRARIES@\
-  ${LIBMU_DBM}\
-- @DBMLIBS@\
-- @MU_TCPWRAP_LIBRARIES@
-+ @DBMLIBS@
- 
- popauth_SOURCES = popauth.c
- popauth_LDADD = \