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

diff --git a/pkg/hostap/config.h b/pkg/hostap/config.h
new file mode 100644
index 00000000..75c66698
--- /dev/null
+++ b/pkg/hostap/config.h
@@ -0,0 +1,17 @@
+#define CONFIG_BACKEND_FILE
+#define CONFIG_CTRL_IFACE
+#define CONFIG_CTRL_IFACE_DIR "/run/wpa_supplicant"
+#define CONFIG_CTRL_IFACE_UNIX
+#define CONFIG_DRIVER_NL80211
+#define CONFIG_ELOOP_POLL
+#define CONFIG_IBSS_RSN
+#define CONFIG_LIBNL20
+#define CONFIG_LIBNL32
+#define CONFIG_NO_CONFIG_BLOBS
+#define CONFIG_NO_CONFIG_WRITE
+#define CONFIG_NO_RADIUS
+#define CONFIG_NO_VLAN
+#define CONFIG_PEERKEY
+#define CONFIG_SHA256
+#define CONFIG_SME
+#define CONFIG_TDLS
diff --git a/pkg/hostap/gen.rc b/pkg/hostap/gen.rc
new file mode 100644
index 00000000..5c53f336
--- /dev/null
+++ b/pkg/hostap/gen.rc
@@ -0,0 +1,88 @@
+cflags\
+	-include '$dir'/config.h\
+	-isystem '$builddir'/pkg/libressl/include\
+	-isystem '$builddir'/pkg/libnl/include\
+	-I '$srcdir'/src/utils\
+	-I '$srcdir'/src
+
+phony deps pkg/^(libressl libnl)^/headers
+
+lib libcommon.a -d '$dir'/deps src/utils/^(common.c eloop.c os_unix.c wpa_debug.c)
+
+exe bin/wpa_supplicant -d '$dir'/deps\
+	src/ap/^(\
+		wpa_auth.c\
+		wpa_auth_ie.c\
+		pmksa_cache_auth.c\
+		peerkey_auth.c\
+	)\
+	src/common/^(\
+		ctrl_iface_common.c\
+		hw_features_common.c\
+		ieee802_11_common.c\
+		wpa_common.c\
+	)\
+	src/crypto/^(\
+		aes-omac1.c\
+		crypto_openssl.c\
+		random.c\
+		sha1-prf.c\
+		sha256-prf.c\
+		tls_none.c\
+	)\
+	src/drivers/^(\
+		driver_common.c\
+		driver_nl80211.c\
+		driver_nl80211_capa.c\
+		driver_nl80211_event.c\
+		driver_nl80211_monitor.c\
+		driver_nl80211_scan.c\
+		drivers.c\
+		linux_ioctl.c\
+		netlink.c\
+		rfkill.c\
+	)\
+	src/l2_packet/l2_packet_linux.c\
+	src/rsn_supp/^(\
+		peerkey.c\
+		pmksa_cache.c\
+		preauth.c\
+		tdls.c\
+		wpa.c\
+		wpa_ie.c\
+	)\
+	src/utils/^(radiotap.c wpabuf.c)\
+	wpa_supplicant/^(\
+		blacklist.c\
+		bss.c\
+		config.c\
+		config_file.c\
+		ctrl_iface.c\
+		ctrl_iface_unix.c\
+		eap_register.c\
+		events.c\
+		ibss_rsn.c\
+		main.c\
+		notify.c\
+		scan.c\
+		sme.c\
+		wmm_ac.c\
+		wpa_supplicant.c\
+		wpas_glue.c\
+	)\
+	libcommon.a\
+	'$builddir'/pkg/^(\
+		libressl/libcrypto.a\
+		openbsd/libbsd.a\
+		libnl/^(libnl-3.a libnl-genl-3.a)\
+	)
+file bin/wpa_supplicant '$outdir'/bin/wpa_supplicant 755
+
+exe bin/wpa_cli -d '$dir'/deps\
+	src/common/^(cli.c wpa_ctrl.c)\
+	src/utils/edit_simple.c\
+	wpa_supplicant/wpa_cli.c\
+	libcommon.a
+file bin/wpa_cli '$outdir'/bin/wpa_cli 755
+
+fetch git
diff --git a/pkg/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch b/pkg/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch
new file mode 100644
index 00000000..4477adb3
--- /dev/null
+++ b/pkg/hostap/patch/0001-LibreSSL-Fix-dh5-code.patch
@@ -0,0 +1,38 @@
+From ae1639dc00fe116c88403c7c23bdd76181191c7a Mon Sep 17 00:00:00 2001
+From: Christian Neukirchen <chneukirchen@gmail.com>
+Date: Wed, 5 Oct 2016 16:35:48 +0200
+Subject: [PATCH] LibreSSL: Fix dh5 code
+
+Add LibreSSL check to old OpenSSL #ifdef guard as DH_{get0,set0}_key()
+is not implemented in LibreSSL.
+
+Signed-off-by: Christian Neukirchen <chneukirchen@gmail.com>
+---
+ src/crypto/crypto_openssl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/crypto/crypto_openssl.c b/src/crypto/crypto_openssl.c
+index 19e0e2b..b3d1b07 100644
+--- a/src/crypto/crypto_openssl.c
++++ b/src/crypto/crypto_openssl.c
+@@ -611,7 +611,7 @@ void crypto_cipher_deinit(struct crypto_cipher *ctx)
+ 
+ void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	DH *dh;
+ 	struct wpabuf *pubkey = NULL, *privkey = NULL;
+ 	size_t publen, privlen;
+@@ -712,7 +712,7 @@ err:
+ 
+ void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	DH *dh;
+ 
+ 	dh = DH_new();
+-- 
+2.10.1
+
diff --git a/pkg/hostap/rev b/pkg/hostap/rev
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/pkg/hostap/rev
@@ -0,0 +1 @@
+2
diff --git a/pkg/hostap/src b/pkg/hostap/src
new file mode 160000
+Subproject 2462f347bca0a7cce7e06ff88adbe3aa47c52d5