From cbc060db2130111ade024c10d33cf74fca2d3e41 Mon Sep 17 00:00:00 2001
From: git-bruh <e817509a-8ee9-4332-b0ad-3a6bdf9ab63f@aleeas.com>
Date: Fri, 30 Sep 2022 13:23:21 +0530
Subject: [PATCH] wpa_supplicant: unbundle libnl-tiny

---
 extra/libnl-tiny/build         |  3 +++
 extra/libnl-tiny/checksums     |  1 +
 extra/libnl-tiny/sources       |  1 +
 extra/libnl-tiny/version       |  1 +
 extra/wpa_supplicant/build     | 19 +------------------
 extra/wpa_supplicant/checksums |  1 -
 extra/wpa_supplicant/depends   |  2 ++
 extra/wpa_supplicant/sources   |  1 -
 8 files changed, 9 insertions(+), 20 deletions(-)
 create mode 100755 extra/libnl-tiny/build
 create mode 100644 extra/libnl-tiny/checksums
 create mode 100644 extra/libnl-tiny/sources
 create mode 100644 extra/libnl-tiny/version

diff --git a/extra/libnl-tiny/build b/extra/libnl-tiny/build
new file mode 100755
index 00000000..d2fc5f24
--- /dev/null
+++ b/extra/libnl-tiny/build
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+make ALL_LIBS=libnl-tiny.a DESTDIR="$1" prefix=/usr install
diff --git a/extra/libnl-tiny/checksums b/extra/libnl-tiny/checksums
new file mode 100644
index 00000000..274ccb1d
--- /dev/null
+++ b/extra/libnl-tiny/checksums
@@ -0,0 +1 @@
+a80020e61e68285d4e285ecaef22d87915ad550053b18be5694ed7a7b93ffe30
diff --git a/extra/libnl-tiny/sources b/extra/libnl-tiny/sources
new file mode 100644
index 00000000..0feada7e
--- /dev/null
+++ b/extra/libnl-tiny/sources
@@ -0,0 +1 @@
+https://github.com/sabotage-linux/libnl-tiny/archive/39ec78bb012edc2739c3d3d0058e4076411068b1.tar.gz
diff --git a/extra/libnl-tiny/version b/extra/libnl-tiny/version
new file mode 100644
index 00000000..147d0df6
--- /dev/null
+++ b/extra/libnl-tiny/version
@@ -0,0 +1 @@
+28c44ca97cd546ef8168e7476472a0da022b3421 1
diff --git a/extra/wpa_supplicant/build b/extra/wpa_supplicant/build
index 42d50492..4983a96e 100755
--- a/extra/wpa_supplicant/build
+++ b/extra/wpa_supplicant/build
@@ -1,23 +1,6 @@
 #!/bin/sh -e
 
-# The wpa_supplicant package is built statically using
-# libnl-tiny which is a minimal version of libnl maintained
-# by OpenWRT.
-mv libnl-tiny* libnl.tar.gz
-tar xf libnl.tar.gz
-mv libnl-tiny* libnl
-
-export CFLAGS="$CFLAGS -D_GNU_SOURCE -I$PWD/libnl/include"
-export LDFLAGS="$LDFLAGS -L$PWD/libnl"
-
-(
-    cd libnl
-
-    # CFLAGS must expand to individual arguments.
-    # shellcheck disable=2086
-    ${CC:-cc} $CFLAGS $CPPFLAGS -c ./*.c
-    ${AR:-ar} rc libnl-tiny.a ./*.o
-)
+export CFLAGS="$CFLAGS $(pkg-config --cflags libnl-tiny)"
 
 cd wpa_supplicant
 
diff --git a/extra/wpa_supplicant/checksums b/extra/wpa_supplicant/checksums
index 6fe3c2da..b7ddae27 100644
--- a/extra/wpa_supplicant/checksums
+++ b/extra/wpa_supplicant/checksums
@@ -1,4 +1,3 @@
 20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f
-60c1ea251398be80667c3a77622abe862e2e1e61390e4484500351592f5f5e83
 ea81361a44cede64fb42309e783f26ca1d0a4f6677a21550aad925b25405eeb0
 1f3fe30e9470467bc05a6cf782eab68c7c851953d412b01dd622f4aa35c48abc
diff --git a/extra/wpa_supplicant/depends b/extra/wpa_supplicant/depends
index c32737c2..ff8c4b11 100644
--- a/extra/wpa_supplicant/depends
+++ b/extra/wpa_supplicant/depends
@@ -1,2 +1,4 @@
+libnl-tiny make
 linux-headers make
 openssl
+pkgconf make
diff --git a/extra/wpa_supplicant/sources b/extra/wpa_supplicant/sources
index 8491cbd2..b9692356 100644
--- a/extra/wpa_supplicant/sources
+++ b/extra/wpa_supplicant/sources
@@ -1,4 +1,3 @@
 https://w1.fi/releases/wpa_supplicant-VERSION.tar.gz
-https://git.openwrt.org/?p=project/libnl-tiny.git;a=snapshot;h=8e0555fb39f51a5d6436b4f1370850caa03611ea;sf=tgz
 files/.config wpa_supplicant
 files/wpa_supplicant.run wpa_supplicant