From 659ef7566437106efd4896aa3521159c560710fe Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Sun, 17 Apr 2022 09:10:47 -0400
Subject: [PATCH 1/2] Adjust brightness to use larger increments.

---
 packages/jelos/sources/scripts/brightness | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/jelos/sources/scripts/brightness b/packages/jelos/sources/scripts/brightness
index f5ea4b91c..7e141f49d 100755
--- a/packages/jelos/sources/scripts/brightness
+++ b/packages/jelos/sources/scripts/brightness
@@ -2,11 +2,18 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2020-present Fewtarius
 
+
 MIN=1
-MAX=100
-STEP=1
-if [[ -n "$2" ]]; then                               
-  STEP=$2                                               
+MAX=$(cat /sys/class/backlight/backlight/max_brightness)
+if [ "${MAX}" = 255 ]
+then
+  STEP=17
+else
+  STEP=6
+fi
+
+if [[ -n "$2" ]]; then
+  STEP=$2
 fi
 
 # Ensure set_setting exists in all contexts

From 7203fc16770c2af809872f727c551d00c888e745 Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Sun, 17 Apr 2022 10:27:49 -0400
Subject: [PATCH 2/2] Updates wpa_supplicant and fixes an issue with some AC
 adapters that do not detect 5GHz networks.

---
 packages/jelos/sources/scripts/wifictl        |  1 -
 packages/network/wpa_supplicant/package.mk    | 24 +++++++++----------
 .../wpa_supplicant-2.4-libnl3-includes.patch  | 12 ----------
 3 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 packages/network/wpa_supplicant/patches/wpa_supplicant-2.4-libnl3-includes.patch

diff --git a/packages/jelos/sources/scripts/wifictl b/packages/jelos/sources/scripts/wifictl
index fdba561a2..1e03a54e1 100755
--- a/packages/jelos/sources/scripts/wifictl
+++ b/packages/jelos/sources/scripts/wifictl
@@ -25,7 +25,6 @@ Passphrase=${PSK}
 EOF
 
       connmanctl enable wifi 2>/dev/null
-      iw wlan0 set power_save off 2>/dev/null
       connmanctl scan wifi 2>/dev/null
     ;;
     "disable")
diff --git a/packages/network/wpa_supplicant/package.mk b/packages/network/wpa_supplicant/package.mk
index 09bdbd4b3..7270a1af1 100644
--- a/packages/network/wpa_supplicant/package.mk
+++ b/packages/network/wpa_supplicant/package.mk
@@ -1,13 +1,13 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
+# Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="wpa_supplicant"
-PKG_VERSION="2.9"
-PKG_SHA256="fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17"
+PKG_VERSION="2.10"
 PKG_LICENSE="GPL"
 PKG_SITE="https://w1.fi/wpa_supplicant/"
-PKG_URL="https://w1.fi/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://w1.fi/releases/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain dbus libnl openssl"
 PKG_LONGDESC="A free software implementation of an IEEE 802.11i supplicant."
 PKG_TOOLCHAIN="make"
@@ -17,20 +17,20 @@ PKG_MAKE_OPTS_TARGET="-C wpa_supplicant V=1 LIBDIR=/usr/lib BINDIR=/usr/bin"
 PKG_MAKEINSTALL_OPTS_TARGET="-C wpa_supplicant V=1 LIBDIR=/usr/lib BINDIR=/usr/bin"
 
 configure_target() {
-  LDFLAGS="$LDFLAGS -lpthread -lm"
+  LDFLAGS="${LDFLAGS} -lpthread -lm"
 
-  cp $PKG_DIR/config/makefile.config wpa_supplicant/.config
+  cp ${PKG_DIR}/config/makefile.config wpa_supplicant/.config
 }
 
 post_makeinstall_target() {
-  rm -r $INSTALL/usr/bin/wpa_cli
+  rm -r ${INSTALL}/usr/bin/wpa_cli
 
-  mkdir -p $INSTALL/etc/dbus-1/system.d
-    cp wpa_supplicant/dbus/dbus-wpa_supplicant.conf $INSTALL/etc/dbus-1/system.d
+  mkdir -p ${INSTALL}/etc/dbus-1/system.d
+    cp wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${INSTALL}/etc/dbus-1/system.d
 
-  mkdir -p $INSTALL/usr/lib/systemd/system
-    cp wpa_supplicant/systemd/wpa_supplicant.service $INSTALL/usr/lib/systemd/system
+  mkdir -p ${INSTALL}/usr/lib/systemd/system
+    cp wpa_supplicant/systemd/wpa_supplicant.service ${INSTALL}/usr/lib/systemd/system
 
-  mkdir -p $INSTALL/usr/share/dbus-1/system-services
-    cp wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service $INSTALL/usr/share/dbus-1/system-services
+  mkdir -p ${INSTALL}/usr/share/dbus-1/system-services
+    cp wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service ${INSTALL}/usr/share/dbus-1/system-services
 }
diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-2.4-libnl3-includes.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-2.4-libnl3-includes.patch
deleted file mode 100644
index f3dce5172..000000000
--- a/packages/network/wpa_supplicant/patches/wpa_supplicant-2.4-libnl3-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur wpa_supplicant-2.4/src/drivers/drivers.mk wpa_supplicant-2.4.patch/src/drivers/drivers.mk
---- wpa_supplicant-2.4/src/drivers/drivers.mk	2015-03-15 18:30:39.000000000 +0100
-+++ wpa_supplicant-2.4.patch/src/drivers/drivers.mk	2015-03-17 13:16:01.390789977 +0100
-@@ -35,7 +35,7 @@
- ifdef CONFIG_LIBNL32
-   DRV_LIBS += -lnl-3
-   DRV_LIBS += -lnl-genl-3
--  DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
-+  DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0`
- ifdef CONFIG_LIBNL3_ROUTE
-   DRV_LIBS += -lnl-route-3
-   DRV_CFLAGS += -DCONFIG_LIBNL3_ROUTE