diff options
| -rw-r--r-- | patches/mailutils-3.4_pre.local.patch | 64 | ||||
| -rw-r--r-- | vars/build.vars | 8 | ||||
| -rw-r--r-- | vars/mailutils.vars | 9 |
3 files changed, 80 insertions, 1 deletions
diff --git a/patches/mailutils-3.4_pre.local.patch b/patches/mailutils-3.4_pre.local.patch new file mode 100644 index 00000000..fc1cb49c --- /dev/null +++ b/patches/mailutils-3.4_pre.local.patch @@ -0,0 +1,64 @@ +diff -ru mailutils-3.4.orig/imap4d/Makefile.am mailutils-3.4/imap4d/Makefile.am +--- mailutils-3.4.orig/imap4d/Makefile.am 2017-06-08 15:08:20.000000000 +0200 ++++ mailutils-3.4/imap4d/Makefile.am 2018-05-18 18:00:06.234274714 +0200 +@@ -78,8 +78,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@ + + ## This kludge is necessary to correctly establish imap4d -> MU_AUTHLIBS + ## dependencies. Automake stupidly refuses to include them. +diff -ru mailutils-3.4.orig/lib/Makefile.am mailutils-3.4/lib/Makefile.am +--- mailutils-3.4.orig/lib/Makefile.am 2017-06-08 15:08:20.000000000 +0200 ++++ mailutils-3.4/lib/Makefile.am 2018-05-18 17:47:07.863936646 +0200 +@@ -35,7 +35,7 @@ + strexit.c\ + 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 +diff -ru mailutils-3.4.orig/maidag/Makefile.am mailutils-3.4/maidag/Makefile.am +--- mailutils-3.4.orig/maidag/Makefile.am 2017-06-08 15:08:22.000000000 +0200 ++++ mailutils-3.4/maidag/Makefile.am 2018-05-18 18:03:29.831157165 +0200 +@@ -44,6 +44,7 @@ + ${MU_LIB_AUTH}\ + ${MU_LIB_MAILER}\ + @MU_AUTHLIBS@\ ++ @MU_TCPWRAP_LIBRARIES@\ + ${MU_LIB_MAILUTILS} \ + @MU_COMMON_LIBRARIES@\ + @LIBMU_SCM@\ +@@ -52,8 +53,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.am mailutils-3.4/pop3d/Makefile.am +--- mailutils-3.4.orig/pop3d/Makefile.am 2017-06-08 15:08:22.000000000 +0200 ++++ mailutils-3.4/pop3d/Makefile.am 2018-05-18 17:55:20.005420723 +0200 +@@ -57,11 +57,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 = \ diff --git a/vars/build.vars b/vars/build.vars index 599e323b..964aeeb8 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1116,7 +1116,7 @@ p7zip procps_ng qpdf rw rxvt_unicode st tmux vim xeyes xorriso xterm xwd"; # Packages list native_packages_inet NATIVE_PACKAGES_INET_PACKAGES=" apk_tools aria2 bind dropbear git gnupg httpd inetutils irssi ldns lighttpd lynx -mtr nginx openlitespeed openssh pacman rsync socat thttpd weechat wget whois"; +mailutils mtr nginx openlitespeed openssh pacman rsync socat thttpd weechat wget whois"; : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b}; : ${PKG_APK_TOOLS_VERSION:=2.6.8}; : ${PKG_APK_TOOLS_URL:=http://git.alpinelinux.org/cgit/apk-tools/snapshot/apk-tools-${PKG_APK_TOOLS_VERSION}.tar.bz2}; @@ -1171,6 +1171,12 @@ mtr nginx openlitespeed openssh pacman rsync socat thttpd weechat wget whois"; : ${PKG_LYNX_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include -I${PREFIX_NATIVE}/include/ncursesw"}; : ${PKG_LYNX_CONFIGURE_ARGS_EXTRA:=--with-ssl}; : ${PKG_LYNX_SUBDIR:=lynx2-8-8}; +: ${PKG_MAILUTILS_SHA256SUM:=f39f528cf6eebc9a045658bd98c86619002f06df4664647e4f78e27e90c62173}; +: ${PKG_MAILUTILS_VERSION:=3.4}; +: ${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"}; +: ${PKG_MAILUTILS_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib -lgnutls"}; +: ${PKG_MAILUTILS_IN_TREE=1}; : ${PKG_MTR_SHA256SUM:=f2979db9e2f41aa8e6574e7771767c9afe111d9213814eb47f5e1e71876e4382}; : ${PKG_MTR_VERSION:=0.92}; : ${PKG_MTR_URL:=ftp://ftp.bitwizard.nl/mtr/mtr-${PKG_MTR_VERSION}.tar.gz}; diff --git a/vars/mailutils.vars b/vars/mailutils.vars new file mode 100644 index 00000000..1e5a25ef --- /dev/null +++ b/vars/mailutils.vars @@ -0,0 +1,9 @@ +# +# set -o errexit -o noglob are assumed. +# + +pkg_mailutils_configure_autotools_pre() { + autoreconf -fiv; +}; + +# vim:filetype=sh |