Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 net/wpa_supplicant/DETAILS   |   11 +----------
 net/wpa_supplicant/HISTORY   |    3 +++
 net/wpa_supplicant/INSTALL   |   14 ++++----------
 net/wpa_supplicant/PREPARE   |    5 +----
 net/wpa_supplicant/PRE_BUILD |   15 +--------------
 5 files changed, 10 insertions(+), 38 deletions(-)

New commits:
commit 63560508494e9da37429be90bdaadb66527f2736
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    wpa_supplicant: Add Watch line

commit 104454ff0b4b91ec9b02c1bcc95b8efd1b3e72c1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    wpa_supplicant: Remove old releases
    
    Both 0.6.10 and 0.7.3 are over ten years old and contain vulnerabilities, 
so
    it's better to remove them.

diff --git a/net/wpa_supplicant/DETAILS b/net/wpa_supplicant/DETAILS
index 7a9b954..dc5e6eb 100755
--- a/net/wpa_supplicant/DETAILS
+++ b/net/wpa_supplicant/DETAILS
@@ -1,18 +1,9 @@
+# Watch: http://w1.fi/releases/
            SPELL=wpa_supplicant
-if [[ $WPA_RELEASE == legacy ]]; then
-         VERSION=0.6.10
-          SOURCE=$SPELL-$VERSION.tar.gz
-      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
-elif [[ $WPA_RELEASE == devel ]]; then
-         VERSION=0.7.3
-          SOURCE=$SPELL-$VERSION.tar.gz
-      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
-else
          VERSION=2.10
      
SOURCE_HASH=sha512:021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1
   SECURITY_PATCH=6
           SOURCE=$SPELL-$VERSION.tar.gz
-fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://w1.fi/releases/$SOURCE
       LICENSE[0]=GPL
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 5850cdc..f2b90e9 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,6 @@
+2024-04-09 Ismael Luceno <ismael AT iodev.co.uk>
+       * DETAILS, INSTALL, PREPARE, PRE_BUILD: removed old releases
+
 2022-11-12 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.10
        * DEPENDS, init.d/wpa_supplicant: use iw
diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 6f70572..a775d3f 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -24,16 +24,10 @@ if is_depends_enabled $SPELL dbus; then
     install -vm 755 -d "$DBUS_CONFIG_DIR"
   fi &&
 
-  DBUS_FILE="$DBUS_SYSTEM_DIR/fi.epitest.hostap.WPASupplicant.service" &&
-  DBUS_FILE2="$DBUS_SYSTEM_DIR/fi.w1.wpa_supplicant1.service" &&
-
-  if [[ $WPA_RELEASE == legacy ]]; then
-    install -Tvm 644 dbus-wpa_supplicant.service "$DBUS_FILE" &&
-    install_config_file dbus-wpa_supplicant.conf 
"$DBUS_CONFIG_DIR/wpa_supplicant.conf"
-  else
-    install -Tvm 644 dbus/fi.w1.wpa_supplicant1.service "$DBUS_FILE2" &&
-    install_config_file dbus/dbus-wpa_supplicant.conf 
"$DBUS_CONFIG_DIR/wpa_supplicant.conf"
-  fi
+  DBUS_FILE="$DBUS_SYSTEM_DIR/fi.w1.wpa_supplicant1.service" &&
+
+  install -Tvm 644 dbus/fi.w1.wpa_supplicant1.service "$DBUS_FILE" &&
+  install_config_file dbus/dbus-wpa_supplicant.conf 
"$DBUS_CONFIG_DIR/wpa_supplicant.conf"
 fi &&
 
 if [[ ! -f "$INSTALL_ROOT/etc/wpa_supplicant.conf" ]] && \
diff --git a/net/wpa_supplicant/PREPARE b/net/wpa_supplicant/PREPARE
index 163a08e..9c362a9 100755
--- a/net/wpa_supplicant/PREPARE
+++ b/net/wpa_supplicant/PREPARE
@@ -1,4 +1 @@
-config_query_list WPA_RELEASE "Select which release to build:" \
-                  stable \
-                  legacy \
-                  devel
+persistent_remove WPA_RELEASE
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index ab33299..acc41d3 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -1,20 +1,7 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-cd wpa_supplicant &&
-
-sed -i "s|/usr/local|$INSTALL_ROOT/usr|g" Makefile &&
-
-if is_depends_enabled $SPELL dbus; then
-  if [[ $WPA_RELEASE == legacy ]]; then
-    sed -i "s|=/sbin|=$INSTALL_ROOT/sbin|g" dbus-wpa_supplicant.service
-  elif [[ $WPA_RELEASE == devel ]]; then
-    sed -i "s|=/sbin|=$INSTALL_ROOT/sbin|g" \
-           dbus/fi.epitest.hostap.WPASupplicant.service
-  fi
-fi &&
-
-cd "$SOURCE_DIRECTORY" &&
+sed -i "s|/usr/local|$INSTALL_ROOT/usr|g" wpa_supplicant/Makefile &&
 
 if [[ -z $QTDIR ]] && is_depends_enabled $SPELL qt-x11; then
   . "$INSTALL_ROOT/etc/profile.d/qt.sh"