msmtp: Move to extra

5 files changed, 0 insertions, 110 deletions

diff --git a/core/gen.rc b/core/gen.rc
index 76284cfe..3d6371ee 100644
--- a/core/gen.rc
+++ b/core/gen.rc
@@ -8,7 +8,6 @@ subgen kbd
 subgen libressl
 subgen loksh
 subgen mdocml
-subgen msmtp
 subgen ninja
 subgen openbsd
 subgen openssh
diff --git a/core/msmtp/config.h b/core/msmtp/config.h
deleted file mode 100644
index c2a7fc78..00000000
--- a/core/msmtp/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#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/core/msmtp/gen.rc b/core/msmtp/gen.rc
deleted file mode 100644
index 9734dfe9..00000000
--- a/core/msmtp/gen.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-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/core/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch b/core/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch
deleted file mode 100644
index 1ffded8c..00000000
--- a/core/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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/core/msmtp/src b/core/msmtp/src
deleted file mode 160000
-Subproject 6c693ffea3dcc1ed6cc3f7a7ae1d5bf34990935