Move to flat package hierarchy

Note to self: never try to move submodules again

To migrate your existing submodules (more or less):

	set -x
	set -e

	mkdir .git/modules/pkg
	for old in */*/src ; do
	        new="pkg/${old#*/}"
	        if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
			continue
		fi
		git -C ".git/modules/$old" config core.worktree "../../../../../$new"
		rmdir "$new"
		mv "$old" "$new"
	        sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
	        mv "$new/.git.tmp" "$new/.git"
		mkdir ".git/modules/${new%/src}"
	        mv ".git/modules/$old" ".git/modules/$new"

		rm "${old%/src}"/*.ninja
		mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
		rmdir "${old%/src}" || true
	done
	sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
	mv .git/config.tmp .git/config

5 files changed, 109 insertions, 0 deletions

diff --git a/pkg/msmtp/config.h b/pkg/msmtp/config.h
new file mode 100644
index 00000000..09c3d9c3
--- /dev/null
+++ b/pkg/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.6"
+#define PACKAGE_TARNAME "msmtp"
+#define PACKAGE_URL "http://msmtp.sourceforge.net/"
+#define PACKAGE_VERSION "1.6.6"
+#define PLATFORM "linux"
+#define VERSION "1.6.6"
diff --git a/pkg/msmtp/gen.rc b/pkg/msmtp/gen.rc
new file mode 100644
index 00000000..03fd38dc
--- /dev/null
+++ b/pkg/msmtp/gen.rc
@@ -0,0 +1,29 @@
+cflags\
+	-D HAVE_CONFIG_H\
+	-D 'SYSCONFDIR=\"/etc\"' \
+	-isystem '$builddir'/pkg/libressl/include\
+	-I include\
+	-I '$dir' \
+
+exe msmtp -d pkg/libressl/headers 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'/pkg/libressl/^(libssl.a.d libcrypto.a.d)
+
+file bin/msmtp '$outdir'/msmtp 755
+file share/man/man1/msmtp.1 '$srcdir'/doc/msmtp.1 644
+
+fetch git
diff --git a/pkg/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch b/pkg/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch
new file mode 100644
index 00000000..f2488fc9
--- /dev/null
+++ b/pkg/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch
@@ -0,0 +1,40 @@
+From 5384637142de4c43b19ff069248f95e4b4d0ed8d 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 33ae887..db4b59c 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.10.2
+
diff --git a/pkg/msmtp/rev b/pkg/msmtp/rev
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/pkg/msmtp/rev
@@ -0,0 +1 @@
+2
diff --git a/pkg/msmtp/src b/pkg/msmtp/src
new file mode 160000
+Subproject 2fa66d2b7fd417b024f48addb2dae0432475187