msmtp: Move to extra

5 files changed, 110 insertions, 0 deletions

diff --git a/extra/gen.rc b/extra/gen.rc
index b0282fd2..43ecef82 100644
--- a/extra/gen.rc
+++ b/extra/gen.rc
@@ -1,5 +1,6 @@
 subgen libevent
 subgen libfuse
+subgen msmtp
 subgen pcre
 subgen sshfs
 subgen the_silver_searcher
diff --git a/extra/msmtp/config.h b/extra/msmtp/config.h
new file mode 100644
index 00000000..c2a7fc78
--- /dev/null
+++ b/extra/msmtp/config.h
@@ -0,0 +1,39 @@
+#include <config-posix.h>
+
+/* features */
+#define HAVE_LIBSSL 1
+#define HAVE_TLS 1
+/* #undef ENABLE_NLS */
+/* #undef HAVE_GAI_IDN */
+/* #undef HAVE_LIBGNUTLS */
+/* #undef HAVE_LIBGSASL */
+/* #undef HAVE_LIBIDN */
+/* #undef HAVE_LIBSECRET */
+/* #undef HAVE_MACOSXKEYRING */
+
+/* headers */
+#define HAVE_MEMORY_H
+#define HAVE_SYSEXITS_H 1
+
+/* types */
+/* #undef SIZEOF_LONG_LONG */ /* not needed after _Static_assert patch */
+
+/* functions */
+#define HAVE_DCGETTEXT 1
+#define HAVE_GETPASS 1
+#define HAVE_GETTEXT 1
+#define HAVE_VASPRINTF 1
+/* #undef HAVE_CFLOCALECOPYCURRENT */
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
+/* #undef HAVE_FSEEKO64 */
+
+/* misc */
+#define PACKAGE "msmtp"
+#define PACKAGE_BUGREPORT "marlam@marlam.de"
+#define PACKAGE_NAME "msmtp"
+#define PACKAGE_STRING "msmtp 1.6.4"
+#define PACKAGE_TARNAME "msmtp"
+#define PACKAGE_URL "http://msmtp.sourceforge.net/"
+#define PACKAGE_VERSION "1.6.4"
+#define PLATFORM "linux"
+#define VERSION "1.6.4"
diff --git a/extra/msmtp/gen.rc b/extra/msmtp/gen.rc
new file mode 100644
index 00000000..9734dfe9
--- /dev/null
+++ b/extra/msmtp/gen.rc
@@ -0,0 +1,30 @@
+cflags\
+	-D HAVE_CONFIG_H\
+	-D 'SYSCONFDIR=\"/etc\"' \
+	-I include\
+	-I '$builddir'/core/libressl/include\
+	-I '$dir' \
+
+exe msmtp src/^(\
+	conf.c\
+	list.c\
+	msmtp.c\
+	net.c\
+	netrc.c\
+	readbuf.c\
+	smtp.c\
+	stream.c\
+	tools.c\
+	xalloc.c\
+	aliases.c\
+	\
+	tls.c\
+	\
+	base64.c md5.c md5-apps.c\
+) '$builddir'/core/^(\
+	libressl/^(libssl.a libcrypto.a)\
+	openbsd/libbsd.a\
+)
+
+file bin/msmtp '$outdir'/msmtp 755
+file share/man/man1/msmtp.1 '$srcdir'/doc/msmtp.1 644
diff --git a/extra/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch b/extra/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch
new file mode 100644
index 00000000..1ffded8c
--- /dev/null
+++ b/extra/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch
@@ -0,0 +1,40 @@
+From 9e2788dc2cb13d7ef57447c2470adf3b1977d6fc Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Fri, 13 May 2016 23:01:44 -0700
+Subject: [PATCH] Use _Static_assert instead of checking for size of long long
+
+---
+ configure.ac | 1 -
+ src/conf.c   | 4 +---
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 868062a..f00a42e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -49,7 +49,6 @@ AC_CHECK_HEADERS([sysexits.h netdb.h arpa/inet.h sys/socket.h sys/wait.h])
+ AC_CHECK_FUNCS([fmemopen fseeko fseeko64 getpass getservbyname link mkstemp strndup syslog vasprintf])
+ AC_SEARCH_LIBS([nanosleep], [rt posix4])
+ AC_SEARCH_LIBS([socket], [socket])
+-AC_CHECK_SIZEOF([long long])
+ 
+ dnl pkg-config (required to detect libraries)
+ PKG_PROG_PKG_CONFIG([])
+diff --git a/src/conf.c b/src/conf.c
+index 875e51e..e471bea 100644
+--- a/src/conf.c
++++ b/src/conf.c
+@@ -36,9 +36,7 @@
+ #include <ctype.h>
+ #include <errno.h>
+ 
+-#if (SIZEOF_LONG_LONG * CHAR_BIT) < 64
+-# error "long long has fewer than 64 bits"
+-#endif
++_Static_assert(sizeof(long long) * CHAR_BIT >= 64, "long long has fewer than 64 bits");
+ 
+ #include "gettext.h"
+ #define _(string) gettext(string)
+-- 
+2.8.1
+
diff --git a/extra/msmtp/src b/extra/msmtp/src
new file mode 160000
+Subproject 6c693ffea3dcc1ed6cc3f7a7ae1d5bf34990935