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, 0 insertions, 109 deletions

diff --git a/extra/msmtp/config.h b/extra/msmtp/config.h
deleted file mode 100644
index 09c3d9c3..00000000
--- a/extra/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.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/extra/msmtp/gen.rc b/extra/msmtp/gen.rc
deleted file mode 100644
index c5f0aac3..00000000
--- a/extra/msmtp/gen.rc
+++ /dev/null
@@ -1,29 +0,0 @@
-cflags\
-	-D HAVE_CONFIG_H\
-	-D 'SYSCONFDIR=\"/etc\"' \
-	-isystem '$builddir'/core/libressl/include\
-	-I include\
-	-I '$dir' \
-
-exe msmtp -d core/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'/core/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/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
deleted file mode 100644
index f2488fc9..00000000
--- a/extra/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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/extra/msmtp/rev b/extra/msmtp/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/extra/msmtp/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/extra/msmtp/src b/extra/msmtp/src
deleted file mode 160000
-Subproject 2fa66d2b7fd417b024f48addb2dae0432475187