[git.ipfire.org] IPFire 2.x development tree branch, master, updated. bee138720596ce50f82075e411f857cdd9f04344

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. bee138720596ce50f82075e411f857cdd9f04344

[Michael Tremer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  bee138720596ce50f82075e411f857cdd9f04344 (commit)
       via  fe9d3554182d541996af8df59acaf8a66cca0d81 (commit)
      from  e2d8be3b950f3119964ade54a62b72555c9b32e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bee138720596ce50f82075e411f857cdd9f04344
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Feb 3 10:15:51 2026 +0000

    initscripts: Don't perform value filtering in readhash
    
    Since we now have a safe way to parse values from the configuration
    file, we should no longer require filtering any more. We will have to be
    very careful with working with these values.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit fe9d3554182d541996af8df59acaf8a66cca0d81
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Feb 3 10:14:43 2026 +0000

    hostapd: Remove any previous HTCAPS/VHTCAPS settings
    
    These are no longer used and generate warnings from the configuration
    file parser.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/hostapd                      | 2 +-
 src/initscripts/system/functions | 6 ------
 src/paks/hostapd/update.sh       | 4 +++-
 3 files changed, 4 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/lfs/hostapd b/lfs/hostapd
index 27c6006e4..1ccc4d14a 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 72
+PAK_VER    = 73
 
 DEPS       =
 
diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions
index c0c40e986..52c3545e5 100644
--- a/src/initscripts/system/functions
+++ b/src/initscripts/system/functions
@@ -922,12 +922,6 @@ readhash() {
 		local key="${line%%=*}"
 		local val="${line#*=}"
 
-		# Skip lines with invalid values
-		if ! [[ ${val} =~ ^[\'][\ A-Za-z0-9=/,.:%_@#+-\\!]*[\']$ ]] && ! [[ ${val} =~ ^[A-Za-z0-9=/,.:%_@#+-\\!]*$ ]]; then
-			echo "Invalid value '${val}' for key '${key}'" >&2
-			continue
-		fi
-
 		# strip leading and trailing single quotes
 		case "${val}" in
 			\'*\')
diff --git a/src/paks/hostapd/update.sh b/src/paks/hostapd/update.sh
index 05d197603..fc67b2500 100644
--- a/src/paks/hostapd/update.sh
+++ b/src/paks/hostapd/update.sh
@@ -26,7 +26,9 @@ exctract_backup_includes
 
 # Remove any previous DEBUG= statements
 if [ -e "/var/ipfire/wlanap/settings" ]; then
-	sed -e "/^DEBUG=/d" -i /var/ipfire/wlanap/settings
+	sed -i /var/ipfire/wlanap/settings \
+		-e "/^DEBUG=/d" \
+		-e "/^V?HTCAPS=/d"
 fi
 
 ./uninstall.sh


hooks/post-receive
--
IPFire 2.x development tree