* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ba4bb0af5a86b78e7b2b177ef58bbd9bd20c0bca
@ 2026-06-04 9:28 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-06-04 9:28 UTC (permalink / raw)
To: ipfire-scm
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, next has been updated
via ba4bb0af5a86b78e7b2b177ef58bbd9bd20c0bca (commit)
via 53cbdf00d96806d571a8d6d8cce049b899e2ac12 (commit)
via 787b7c2179daf8847e5225b67dc11ca310cc6499 (commit)
via c9a2ab43d1b9f8c560909a935e206106418b91ae (commit)
via 599f4dca383478e576afa083c9b1d9cd294e28b1 (commit)
via f5f126e5e5bfe7ff1768aed098e060ab9cb09ae4 (commit)
via f6f25bf0161f01ae73a0528a8b6db8f8218933a3 (commit)
via 36dee4a91c8fa2dd933c302118fd96ef5d91a2d7 (commit)
via 96efb58f36527682b7d0d333f33316ee9f23dfb0 (commit)
via 97fd321b8625ffc006427e5b3ebd847e3b74d0ca (commit)
via 1250ad82edc41e5c17b79116fb8862b2608a6f6b (commit)
via 0adcef56a6509f23d6ec471b5981074cb737272d (commit)
from af92e2e3d6a4ddc818a6d35dc36baa26621b6cb3 (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 ba4bb0af5a86b78e7b2b177ef58bbd9bd20c0bca
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Apr 29 19:49:34 2026 +0000
hostapd: Bump version
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 53cbdf00d96806d571a8d6d8cce049b899e2ac12
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Apr 29 19:49:33 2026 +0000
hostapd: Fix 40 MHz flags when manually chosing the channel
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 787b7c2179daf8847e5225b67dc11ca310cc6499
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Apr 29 19:49:32 2026 +0000
hostapd: Tell the AP that the antennas won't change
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit c9a2ab43d1b9f8c560909a935e206106418b91ae
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Apr 29 19:49:31 2026 +0000
hostapd: Disable 802.11n in 6 GHz band, too
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 599f4dca383478e576afa083c9b1d9cd294e28b1
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Apr 29 19:49:30 2026 +0000
hostapd: Configure as indoor AP and increase transmit power
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit f5f126e5e5bfe7ff1768aed098e060ab9cb09ae4
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Apr 29 19:49:29 2026 +0000
hostapd: Add support for the 6 GHz band
This is mainly adding any center frequencies when the user manually
choses a channel.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit f6f25bf0161f01ae73a0528a8b6db8f8218933a3
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Apr 29 19:49:28 2026 +0000
hostapd: Correctly parse capabilities for the 6 GHz band
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 36dee4a91c8fa2dd933c302118fd96ef5d91a2d7
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Apr 29 19:49:27 2026 +0000
wlanap.cgi: Add option to select 6 GHz band
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 96efb58f36527682b7d0d333f33316ee9f23dfb0
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Apr 29 19:49:26 2026 +0000
hostapd: Force setting reg domain before hostapd starts
When the system boots up, it could happen that hostapd didn't come up
the first time:
Apr 28 15:18:10 ipfire-test hostapd: green0: interface state UNINITIALIZED->COUNTRY_UPDATE
Apr 28 15:18:10 ipfire-test hostapd: ACS: Automatic channel selection started, this may take a bit
Apr 28 15:18:10 ipfire-test hostapd: ACS: No available channels found
Apr 28 15:18:10 ipfire-test hostapd: green0: IEEE 802.11 Configured channel (0) or frequency (0) (secondary_channel=1) not found from the channel list of the current mode (2) IEEE 802.11a
Apr 28 15:18:10 ipfire-test hostapd: green0: IEEE 802.11 Hardware does not support configured channel
Apr 28 15:18:10 ipfire-test hostapd: Could not select hw_mode and channel. (-3)
Apr 28 15:18:10 ipfire-test hostapd: green0: interface state COUNTRY_UPDATE->DISABLED
Apr 28 15:18:10 ipfire-test hostapd: green0: AP-DISABLED
Apr 28 15:18:10 ipfire-test hostapd: green0: interface state DISABLED->DISABLED
Apr 28 15:18:10 ipfire-test hostapd: green0: AP-DISABLED
Apr 28 15:18:10 ipfire-test hostapd: green0: CTRL-EVENT-TERMINATING
Apr 28 15:18:10 ipfire-test hostapd: hostapd_free_hapd_data: Interface green0 wasn't started
Apr 28 15:18:10 ipfire-test hostapd: nl80211: deinit ifname=green0 disabled_11b_rates=0
A second start always was successful. By explicitely setting the reg
domain this problem is being worked around.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 97fd321b8625ffc006427e5b3ebd847e3b74d0ca
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Mon May 25 14:25:03 2026 +0200
tmux: Update to version 3.6b
- Update from version 3.6a to 3.6b
- No change to rootfile
- Changelog
3.6b
* Remove images from the correct list when they are removed while in the
alternate screen (reported by xlabai at tencent dot com).
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 1250ad82edc41e5c17b79116fb8862b2608a6f6b
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Tue Jun 2 21:36:06 2026 +0200
core203: Ship libloc
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 0adcef56a6509f23d6ec471b5981074cb737272d
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Tue Jun 2 21:36:07 2026 +0200
libloc: Update to version 0.9.19
- Update from version 0.9.18 to 0.9.19
- No change in rootfile
- Two of the patches have been removed as ther are now built into the tarball
- Changelog
0.9.19
* jenkins: Publish Debian packages for all supported architectures
* address: Fix endianess problem when fetching octets in IPv4
addresses
* jenkins: Build for s390x again
* jenkins: Try building for Alma Linux 9
* jenkins: Fix installing development tools on Alma Linux
* jenkins: Alma Linux does not seem to understand Code Ready
* jenkins: Okay, drop Alma Linux again
* configure: Fix indentation
* configure: Fix passing custom LDFLAGS
* jenkins: Build Debian packages for riscv64, too
* Revert "jenkins: Build Debian packages for riscv64, too"
* jenkins: Fedora no longer seems to install awk by default
* python: Cleanup the switch statement
* database: Fix backtracking after no match was found at the end of
the tree
* jenkins: Explicitely install gettext/autopoint
* importer: Fix SyntaxWarning about regular expressions
* importer: Accept ASNs larger than PostgreSQL's integer
* po: Import the POT file and create a target to update it
* python: network: Add a new property "subnets" to fetch any subnets
* location: Add a command to export the database as a DNS zone file
* network: Refactor composing the reverse pointer
* export: Support exporting a zone with all bogons
* export: Give the origin zone the correct name
* export: Refactor writing zones
* exporter: Implement exporting AS names over DNS
* po: Add new translation strings
* exporter: Call the correct functions
* export: Support exporting a zone with country codes
* export: Support exporting a zone with the network prefixes
* export: Write the everything zone
* export: Write a SOA for all DNS zones
* export: Allow passing nameservers for a zone
* export: Write more metadata into the zone apex
* jenkins: Build for Ubuntu 25.10, but no longer for 24.10
* po: Update translation
* export: Improve the slightly broken header in DNS zones
* importer: Add some more AWS regions
* jenkins: Build for more recent version of Debian/Ubuntu/Fedora
* jenkins: Build packages for Debian Forky, too
* tests: Ensure loc_database_lookup finds a match
* configure: Explicitely configure Gettext
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/hostapd/config | 4 +-
.../{oldcore/148 => core/203}/filelists/libloc | 0
doc/language_issues.en | 1 +
doc/language_issues.es | 1 +
doc/language_issues.fr | 1 +
doc/language_issues.it | 1 +
doc/language_issues.nl | 1 +
doc/language_issues.pl | 1 +
doc/language_issues.ru | 1 +
doc/language_issues.tr | 1 +
doc/language_issues.tw | 1 +
doc/language_issues.zh | 1 +
doc/language_missings | 9 ++
html/cgi-bin/wlanap.cgi | 5 +-
langs/de/cgi-bin/de.pl | 1 +
langs/en/cgi-bin/en.pl | 1 +
lfs/hostapd | 2 +-
lfs/libloc | 24 ++-
lfs/tmux | 9 +-
src/initscripts/packages/hostapd | 177 +++++++++++++++++++--
...no_match_was_found_at_the_end_of_the_tree.patch | 31 ----
src/patches/libloc-0.9.18_gettext-0.25_fix.patch | 29 ----
22 files changed, 208 insertions(+), 94 deletions(-)
copy config/rootfiles/{oldcore/148 => core/203}/filelists/libloc (100%)
delete mode 100644 src/patches/libloc-0.9.18_Fix_backtracking_after_no_match_was_found_at_the_end_of_the_tree.patch
delete mode 100644 src/patches/libloc-0.9.18_gettext-0.25_fix.patch
Difference in files:
diff --git a/config/hostapd/config b/config/hostapd/config
index 8bf19375b..7bda725a7 100644
--- a/config/hostapd/config
+++ b/config/hostapd/config
@@ -375,9 +375,9 @@ CONFIG_MBO=y
CONFIG_TAXONOMY=y
# Fast Initial Link Setup (FILS) (IEEE 802.11ai)
-#CONFIG_FILS=y
+CONFIG_FILS=y
# FILS shared key authentication with PFS
-#CONFIG_FILS_SK_PFS=y
+CONFIG_FILS_SK_PFS=y
# Include internal line edit mode in hostapd_cli. This can be used to provide
# limited command line editing and history support.
diff --git a/config/rootfiles/core/203/filelists/libloc b/config/rootfiles/core/203/filelists/libloc
new file mode 120000
index 000000000..ff4a92429
--- /dev/null
+++ b/config/rootfiles/core/203/filelists/libloc
@@ -0,0 +1 @@
+../../../common/libloc
\ No newline at end of file
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 56350c178..2bbfef5b5 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -2429,6 +2429,7 @@ WARNING: untranslated string: wlanap auto = Automatic Channel Selection
WARNING: untranslated string: wlanap band = Band
WARNING: untranslated string: wlanap band 2.4ghz = 2.4 GHz
WARNING: untranslated string: wlanap band 5ghz = 5 GHz
+WARNING: untranslated string: wlanap band 6ghz = 6 GHz
WARNING: untranslated string: wlanap channel = Channel
WARNING: untranslated string: wlanap client isolation = Client Isolation
WARNING: untranslated string: wlanap clients = unknown string
diff --git a/doc/language_issues.es b/doc/language_issues.es
index e2b55a490..99941f8f3 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1281,6 +1281,7 @@ WARNING: untranslated string: wlanap 802.11be 80mhz = IEEE 802.11be @ 80 MHz
WARNING: untranslated string: wlanap band = Band
WARNING: untranslated string: wlanap band 2.4ghz = 2.4 GHz
WARNING: untranslated string: wlanap band 5ghz = 5 GHz
+WARNING: untranslated string: wlanap band 6ghz = 6 GHz
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap invalid band = Invalid band
WARNING: untranslated string: wlanap invalid mode = Invalid mode
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 52533f74b..79d276e4d 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1332,6 +1332,7 @@ WARNING: untranslated string: wlanap 802.11be 80mhz = IEEE 802.11be @ 80 MHz
WARNING: untranslated string: wlanap band = Band
WARNING: untranslated string: wlanap band 2.4ghz = 2.4 GHz
WARNING: untranslated string: wlanap band 5ghz = 5 GHz
+WARNING: untranslated string: wlanap band 6ghz = 6 GHz
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap hide ssid = Hide SSID
WARNING: untranslated string: wlanap invalid band = Invalid band
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 82f1bf67c..a03d4abf2 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1679,6 +1679,7 @@ WARNING: untranslated string: wlanap auto = Automatic Channel Selection
WARNING: untranslated string: wlanap band = Band
WARNING: untranslated string: wlanap band 2.4ghz = 2.4 GHz
WARNING: untranslated string: wlanap band 5ghz = 5 GHz
+WARNING: untranslated string: wlanap band 6ghz = 6 GHz
WARNING: untranslated string: wlanap client isolation = Client Isolation
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 16971ff77..19a67628d 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1669,6 +1669,7 @@ WARNING: untranslated string: wlan client method = Method
WARNING: untranslated string: wlan client password = Password
WARNING: untranslated string: wlan client tls cipher = TLS Cipher
WARNING: untranslated string: wlan client tls version = TLS Version
+WARNING: untranslated string: wlanap band 6ghz = 6 GHz
WARNING: untranslated string: wlanap client isolation = Client Isolation
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 52bf31f36..385e281ce 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1947,6 +1947,7 @@ WARNING: untranslated string: wlanap auto = Automatic Channel Selection
WARNING: untranslated string: wlanap band = Band
WARNING: untranslated string: wlanap band 2.4ghz = 2.4 GHz
WARNING: untranslated string: wlanap band 5ghz = 5 GHz
+WARNING: untranslated string: wlanap band 6ghz = 6 GHz
WARNING: untranslated string: wlanap client isolation = Client Isolation
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 5567ac637..819aba832 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1946,6 +1946,7 @@ WARNING: untranslated string: wlanap auto = Automatic Channel Selection
WARNING: untranslated string: wlanap band = Band
WARNING: untranslated string: wlanap band 2.4ghz = 2.4 GHz
WARNING: untranslated string: wlanap band 5ghz = 5 GHz
+WARNING: untranslated string: wlanap band 6ghz = 6 GHz
WARNING: untranslated string: wlanap client isolation = Client Isolation
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 146a5c7fe..12c38a7fa 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1549,6 +1549,7 @@ WARNING: untranslated string: wlanap auto = Automatic Channel Selection
WARNING: untranslated string: wlanap band = Band
WARNING: untranslated string: wlanap band 2.4ghz = 2.4 GHz
WARNING: untranslated string: wlanap band 5ghz = 5 GHz
+WARNING: untranslated string: wlanap band 6ghz = 6 GHz
WARNING: untranslated string: wlanap client isolation = Client Isolation
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap hide ssid = Hide SSID
diff --git a/doc/language_issues.tw b/doc/language_issues.tw
index d7e311deb..95d63140b 100644
--- a/doc/language_issues.tw
+++ b/doc/language_issues.tw
@@ -1299,6 +1299,7 @@ WARNING: untranslated string: wlanap 802.11be 80mhz = IEEE 802.11be @ 80 MHz
WARNING: untranslated string: wlanap band = Band
WARNING: untranslated string: wlanap band 2.4ghz = 2.4 GHz
WARNING: untranslated string: wlanap band 5ghz = 5 GHz
+WARNING: untranslated string: wlanap band 6ghz = 6 GHz
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap invalid band = Invalid band
WARNING: untranslated string: wlanap invalid mode = Invalid mode
diff --git a/doc/language_issues.zh b/doc/language_issues.zh
index d7e311deb..95d63140b 100644
--- a/doc/language_issues.zh
+++ b/doc/language_issues.zh
@@ -1299,6 +1299,7 @@ WARNING: untranslated string: wlanap 802.11be 80mhz = IEEE 802.11be @ 80 MHz
WARNING: untranslated string: wlanap band = Band
WARNING: untranslated string: wlanap band 2.4ghz = 2.4 GHz
WARNING: untranslated string: wlanap band 5ghz = 5 GHz
+WARNING: untranslated string: wlanap band 6ghz = 6 GHz
WARNING: untranslated string: wlanap clients = unknown string
WARNING: untranslated string: wlanap invalid band = Invalid band
WARNING: untranslated string: wlanap invalid mode = Invalid mode
diff --git a/doc/language_missings b/doc/language_missings
index 39e44cdee..34cfeaa25 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -250,6 +250,7 @@
< wlanap band
< wlanap band 2.4ghz
< wlanap band 5ghz
+< wlanap band 6ghz
< wlanap invalid band
< wlanap invalid mode
############################################################################
@@ -444,6 +445,7 @@
< wlanap band
< wlanap band 2.4ghz
< wlanap band 5ghz
+< wlanap band 6ghz
< wlanap hide ssid
< wlanap invalid band
< wlanap invalid mode
@@ -1103,6 +1105,7 @@
< wlanap band
< wlanap band 2.4ghz
< wlanap band 5ghz
+< wlanap band 6ghz
< wlanap client isolation
< wlanap configuration
< wlanap hide ssid
@@ -1801,6 +1804,7 @@
< winbind daemon
< wireguard
< wireless network
+< wlanap band 6ghz
< wlanap client isolation
< wlanap configuration
< wlanap hide ssid
@@ -2942,6 +2946,7 @@
< wlanap band
< wlanap band 2.4ghz
< wlanap band 5ghz
+< wlanap band 6ghz
< wlanap client isolation
< wlanap configuration
< wlanap country
@@ -4121,6 +4126,7 @@
< wlanap band
< wlanap band 2.4ghz
< wlanap band 5ghz
+< wlanap band 6ghz
< wlanap client isolation
< wlanap configuration
< wlanap country
@@ -4677,6 +4683,7 @@
< wlanap band
< wlanap band 2.4ghz
< wlanap band 5ghz
+< wlanap band 6ghz
< wlanap client isolation
< wlanap hide ssid
< wlanap invalid band
@@ -4822,6 +4829,7 @@
< wlanap band
< wlanap band 2.4ghz
< wlanap band 5ghz
+< wlanap band 6ghz
< wlanap invalid band
< wlanap invalid mode
< wlanap neighbor scan
@@ -4938,6 +4946,7 @@
< wlanap band
< wlanap band 2.4ghz
< wlanap band 5ghz
+< wlanap band 6ghz
< wlanap invalid band
< wlanap invalid mode
< wlanap neighbor scan
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index a02b58b6d..2bb5efe8c 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -97,7 +97,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") {
}
# Validate BAND
- unless ($cgiparams{'BAND'} =~ m/^[25]g$/) {
+ unless ($cgiparams{'BAND'} =~ m/^[256]g$/) {
$errormessage .= "$Lang::tr{'wlanap invalid band'}<br />";
}
@@ -357,6 +357,9 @@ print <<END;
<td>$Lang::tr{'wlanap band'}</td>
<td>
<select name='BAND'>
+ <option value="6g" $selected{'BAND'}{'6g'}>
+ $Lang::tr{'wlanap band 6ghz'}
+ </option>
<option value="5g" $selected{'BAND'}{'5g'}>
$Lang::tr{'wlanap band 5ghz'}
</option>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index c7f29eb45..a724f91d7 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -3109,6 +3109,7 @@
'wlanap band' => 'Band',
'wlanap band 2.4ghz' => '2.4 GHz',
'wlanap band 5ghz' => '5 GHz',
+'wlanap band 6ghz' => '6 GHz',
'wlanap channel' => 'Kanal',
'wlanap client isolation' => 'Client-Isolierung',
'wlanap configuration' => 'Access Point Konfiguration',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 7d74d531f..db3ce195f 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -3236,6 +3236,7 @@
'wlanap band' => 'Band',
'wlanap band 2.4ghz' => '2.4 GHz',
'wlanap band 5ghz' => '5 GHz',
+'wlanap band 6ghz' => '6 GHz',
'wlanap channel' => 'Channel',
'wlanap client isolation' => 'Client Isolation',
'wlanap configuration' => 'Wireless Access Point Configuration',
diff --git a/lfs/hostapd b/lfs/hostapd
index b5347df9d..74f3e1703 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 = 74
+PAK_VER = 75
DEPS =
diff --git a/lfs/libloc b/lfs/libloc
index 9bf08f28e..5aee8813f 100644
--- a/lfs/libloc
+++ b/lfs/libloc
@@ -24,8 +24,8 @@
include Config
-VER = 0.9.18
-DB_DATE = 2025-03-11
+VER = 0.9.19
+DB_DATE = 2026-06-02
DB_TIME = 03:45
THISAPP = libloc-$(VER)
@@ -44,8 +44,8 @@ objects = $(DL_FILE) \
$(DL_FILE) = https://source.ipfire.org/releases/libloc/$(DL_FILE)
location-$(DB_DATE).db.xz = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE)-$(DB_TIME).db.xz
-$(DL_FILE)_BLAKE2 = ccb730684c98756ef318f0cd5698b42ee4a997083811025ac5bf650798efb70dca97e1638b3f20da5d7b38a204fe5214a87fa7b61b8b70d71e6c8ad0577b0839
-location-$(DB_DATE).db.xz_BLAKE2 = adce971179f19c28906842ac08e5b90d55f73d91e0ffa27f98777c1ce8882dc9c4d1df1e9d45e06cf829e010a927f973d98830105c3aca58a86be7a172974861
+$(DL_FILE)_BLAKE2 = 1eb8cc427bfe7cf5c52640d725d3c564b61fab85190ac516f7ac6245ac05f3202841f9059b62acc9f68ba8c63687b03dc636ea58e0f2341b76e815445c0f347e
+location-$(DB_DATE).db.xz_BLAKE2 = 6def3003559dc1c6489ae4e9ea35cc69577687af26e7d0419f15daae1752d55137c855ed0397ed0c746255035c948f2e507db6543a4eaf1244e3bea9fab64742
install : $(TARGET)
@@ -81,17 +81,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# https://lists.ipfire.org/pipermail/development/2022-November/014763.html
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.18-Revert-Install-Perl-files-to-Perl-vendor-directory.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.18_gettext-0.25_fix.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.18_Fix_backtracking_after_no_match_was_found_at_the_end_of_the_tree.patch
cd $(DIR_APP) && ./autogen.sh
cd $(DIR_APP) && ./configure \
- --prefix=/usr \
- --libdir=/usr/lib \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-man-pages \
- --with-database-path=/var/lib/location/database.db \
- --without-systemd
+ --prefix=/usr \
+ --libdir=/usr/lib \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-man-pages \
+ --with-database-path=/var/lib/location/database.db \
+ --without-systemd
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/tmux b/lfs/tmux
index 4d7700670..169a7a4c6 100644
--- a/lfs/tmux
+++ b/lfs/tmux
@@ -26,7 +26,7 @@ include Config
SUMMARY = Terminal multiplexer
-VER = 3.6a
+VER = 3.6b
THISAPP = tmux-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tmux
-PAK_VER = 14
+PAK_VER = 15
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a2946fa9449fe40d94d1ab25e48c7faecedec8dce4372147a738a2c61443a8f430f37c252bb5ef9d5cb99041d4d928ea4389ec21da7247817a6238a46f6598d8
+$(DL_FILE)_BLAKE2 = 75e8470fb5c5f893e9f5488e5029ae9c3c77a4bdf1a6b7fab9daced048b1f31b7977344f39e97a53efbc28fb05a68d82676ddcb661cd5eb6fb6bd6acc9ab64ee
install : $(TARGET)
@@ -81,9 +81,8 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./autogen.sh
cd $(DIR_APP) && ./configure \
- --prefix=/usr
+ --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/src/initscripts/packages/hostapd b/src/initscripts/packages/hostapd
index 93ddae72f..3d6ea4f69 100644
--- a/src/initscripts/packages/hostapd
+++ b/src/initscripts/packages/hostapd
@@ -125,6 +125,7 @@ write_config() {
local he_phy_flags=0
local eht_mac_flags=0
local eht_phy_flags=0
+ local channel_offset
# Set some default BAND if none is set
if [ -z "${CONFIG["BAND"]}" ]; then
@@ -174,6 +175,12 @@ write_config() {
break
fi
;;
+
+ "* 7115.0 MHz"*)
+ if [ "${CONFIG["BAND"]}" = "6g" ]; then
+ break
+ fi
+ ;;
esac
done <<<"$(iw phy "${phy}" info)"
@@ -182,6 +189,9 @@ write_config() {
local he_caps=()
local eht_caps=()
+ # Clear [HT40+][HT40-]
+ ht_flags="$(( ht_flags & ~0x0002 ))"
+
# HT Capabilities
for flag in ${!HT_CAPS[@]}; do
if (( ${ht_flags} & ${flag} )); then
@@ -326,6 +336,16 @@ write_config() {
esac
fi
+ # Set channel offset
+ case "${CONFIG["BAND"]}" in
+ 6g)
+ channel_offset=1
+ ;;
+ *)
+ channel_offset=0
+ ;;
+ esac
+
# Header
echo "# Automatically generated configuration"
echo "# DO NOT EDIT"
@@ -364,9 +384,33 @@ write_config() {
local enable_n=0
case "${CONFIG["MODE"]}" in
- HT*|VHT*|HE*|EHT*)
+ HT20|VHT20|HE20|EHT20)
enable_n=1
;;
+
+ *40|*80|*160|*320)
+ enable_n=1
+
+ case "${CONFIG["BAND"]}" in
+ 6g|5g)
+ case "$(( ((${CONFIG["CHANNEL"]} / 4) + channel_offset) % 2 ))" in
+ 0)
+ ht_caps+=( "[HT40-]" )
+ ;;
+ 1)
+ ht_caps+=( "[HT40+]" )
+ ;;
+ esac
+ ;;
+ 2g)
+ if [ "${CONFIG["CHANNEL"]}" -lt 7 ]; then
+ ht_caps+=( "[HT40+]" )
+ else
+ ht_caps+=( "[HT40-]" )
+ fi
+ ;;
+ esac
+ ;;
esac
# 802.11ac
@@ -385,7 +429,7 @@ write_config() {
# Compute the channel segment index
if [ "${CONFIG["CHANNEL"]}" -gt 0 ]; then
- case "$(( (${CONFIG["CHANNEL"]} / 4) % 2 ))" in
+ case "$(( ((${CONFIG["CHANNEL"]} / 4) + channel_offset) % 2 ))" in
0)
vht_oper_centr_freq_seg0_idx="$(( ${CONFIG["CHANNEL"]} - 2 ))"
;;
@@ -403,7 +447,7 @@ write_config() {
# Compute the channel segment index
if [ "${CONFIG["CHANNEL"]}" -gt 0 ]; then
- case "$(( (${CONFIG["CHANNEL"]} / 4) % 4 ))" in
+ case "$(( ((${CONFIG["CHANNEL"]} / 4) + channel_offset) % 4 ))" in
0)
vht_oper_centr_freq_seg0_idx="$(( ${CONFIG["CHANNEL"]} - 6 ))"
;;
@@ -427,15 +471,46 @@ write_config() {
# Compute the channel segment index
if [ "${CONFIG["CHANNEL"]}" -gt 0 ]; then
- case "${CONFIG["CHANNEL"]}" in
- 36|40|44|48|52|56|60|64)
- vht_oper_centr_freq_seg0_idx=50
+ case "${CONFIG["BAND"]}" in
+ # 6 GHz
+ 6g)
+ case "${CONFIG["CHANNEL"]}" in
+ 1|5|9|13|17|21|25|29)
+ vht_oper_centr_freq_seg0_idx=15
+ ;;
+ 33|37|41|45|49|53|57|61)
+ vht_oper_centr_freq_seg0_idx=47
+ ;;
+ 65|69|73|77|81|85|89|93)
+ vht_oper_centr_freq_seg0_idx=79
+ ;;
+ 97|101|105|109|113|117|121|125)
+ vht_oper_centr_freq_seg0_idx=111
+ ;;
+ 129|133|137|141|145|149|153|157)
+ vht_oper_centr_freq_seg0_idx=143
+ ;;
+ 161|165|169|173|177|181|185|189)
+ vht_oper_centr_freq_seg0_idx=175
+ ;;
+ 193|197|201|205|209|213|217|221)
+ vht_oper_centr_freq_seg0_idx=207
+ ;;
+ esac
;;
- 100|104|108|112|116|120|124|128)
- vht_oper_centr_freq_seg0_idx=114
- ;;
- 149|153|157|161|165|169|173|177)
- vht_oper_centr_freq_seg0_idx=163
+ # 5 GHz
+ 5g)
+ case "${CONFIG["CHANNEL"]}" in
+ 36|40|44|48|52|56|60|64)
+ vht_oper_centr_freq_seg0_idx=50
+ ;;
+ 100|104|108|112|116|120|124|128)
+ vht_oper_centr_freq_seg0_idx=114
+ ;;
+ 149|153|157|161|165|169|173|177)
+ vht_oper_centr_freq_seg0_idx=163
+ ;;
+ esac
;;
esac
fi
@@ -459,6 +534,31 @@ write_config() {
local eht_oper_centr_freq_seg0_idx="${he_oper_centr_freq_seg0_idx}"
case "${CONFIG["MODE"]}" in
+ EHT320)
+ enable_be=1
+ eht_oper_chwidth=9
+
+ # Compute the channel segment index
+ case "${CONFIG["BAND"]}" in
+ 6g)
+ case "${CONFIG["CHANNEL"]}" in
+ 1|5|9|13|17|21|25|29|33|37|41|45|49|53|57|61)
+ eht_oper_centr_freq_seg0_idx=31
+ ;;
+ 65|69|73|77|81|85|89|93|97|101|105|109|113|117|121|125)
+ eht_oper_centr_freq_seg0_idx=95
+ ;;
+ 129|133|137|141|145|149|153|157|161|165|169|173|177|181|185|189)
+ eht_oper_centr_freq_seg0_idx=159
+ ;;
+ 193|197|201|205|209|213|217|221)
+ eht_oper_centr_freq_seg0_idx=191
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+
EHT*)
enable_be=1
;;
@@ -466,7 +566,7 @@ write_config() {
# Set hardware mode
case "${CONFIG["BAND"]}" in
- 5g)
+ 6g|5g)
echo "hw_mode=a"
;;
2g)
@@ -474,6 +574,50 @@ write_config() {
;;
esac
+ # Adjust settings for 6 GHz
+ case "${CONFIG["BAND"]}" in
+ 6g)
+ # Indoor AP
+ echo "he_6ghz_reg_pwr_type=0"
+
+ # Disable 802.11n/ac
+ enable_n=0
+ enable_ac=0
+
+ # Enable 802.11w management frame protection
+ CONFIG["IEEE80211W"]="on"
+
+ # Send FILS Discovery frames every 20 TUs (~20 ms)
+ # for faster AP detection by the clients
+ echo "fils_discovery_min_interval=20"
+ echo "fils_discovery_max_interval=20"
+ ;;
+ esac
+
+ local op_class=
+
+ # Configure global operating class
+ case "${CONFIG["BAND"]}" in
+ 6g)
+ case "${CONFIG["MODE"]}" in
+ EHT320)
+ op_class=137
+ ;;
+ HE20|EHT20)
+ op_class=131
+ ;;
+ HE*|EHT*)
+ op_class="$(( 132 + vht_oper_chwidth ))"
+ ;;
+ esac
+ ;;
+ esac
+
+ # Set global operating class
+ if [ -n "${op_class}" ]; then
+ echo "op_class=${op_class}"
+ fi
+
# Enable 802.11be?
if [ "${enable_be}" -eq 1 ]; then
echo "ieee80211be=1"
@@ -500,6 +644,10 @@ write_config() {
if [ ${#he_caps[@]} -gt 0 ]; then
printf "%s\n" "${he_caps[@]}"
fi
+
+ # The antenna patterns don't change
+ he_6ghz_rx_ant_pat=1
+ he_6ghz_tx_ant_pat=1
fi
# Enable 802.11ac?
@@ -685,6 +833,11 @@ case "${1}" in
exit 1
fi
+ # Force setting the regulatory domain
+ if [ -n "${CONFIG["COUNTRY"]}" ]; then
+ iw reg set "${CONFIG["COUNTRY"]}" &>/dev/null
+ fi
+
# Compose the command line
args=(
/usr/bin/hostapd
diff --git a/src/patches/libloc-0.9.18_Fix_backtracking_after_no_match_was_found_at_the_end_of_the_tree.patch b/src/patches/libloc-0.9.18_Fix_backtracking_after_no_match_was_found_at_the_end_of_the_tree.patch
deleted file mode 100644
index 6ac9acf3c..000000000
--- a/src/patches/libloc-0.9.18_Fix_backtracking_after_no_match_was_found_at_the_end_of_the_tree.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-X-Git-Url: http://git.ipfire.org/?p=location%2Flibloc.git;a=blobdiff_plain;f=src%2Fdatabase.c;h=c251061cc8a254879491ebe133b1b4f3b58ddf30;hp=0c8608542aaad6e82c4d8602bbeb388ab43225bb;hb=95d271bb90b4cebe81c288a95a2336aa63bac4d7;hpb=d1120513a30de43308d9ed848f7ef3c6ede6d767
-
-diff --git a/src/database.c b/src/database.c
-index 0c86085..c251061 100644
---- a/src/database.c
-+++ b/src/database.c
-@@ -907,13 +907,7 @@ static int __loc_database_lookup(struct loc_database* db, const struct in6_addr*
-
- // Move on to the next node
- r = __loc_database_lookup(db, address, network, network_address, node_index, level + 1);
--
-- // End here if a result was found
-- if (r == 0)
-- return r;
--
-- // Raise any errors
-- else if (r < 0)
-+ if (r < 0)
- return r;
-
- DEBUG(db->ctx, "No match found below level %u\n", level);
-@@ -922,7 +916,7 @@ static int __loc_database_lookup(struct loc_database* db, const struct in6_addr*
- }
-
- // If this node has a leaf, we will check if it matches
-- if (__loc_database_node_is_leaf(node_v1)) {
-+ if (!*network && __loc_database_node_is_leaf(node_v1)) {
- r = __loc_database_lookup_handle_leaf(db, address, network, network_address, level, node_v1);
- if (r < 0)
- return r;
-
diff --git a/src/patches/libloc-0.9.18_gettext-0.25_fix.patch b/src/patches/libloc-0.9.18_gettext-0.25_fix.patch
deleted file mode 100644
index ad8d3c92a..000000000
--- a/src/patches/libloc-0.9.18_gettext-0.25_fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur libloc-0.9.18.orig/autogen.sh libloc-0.9.18/autogen.sh
---- libloc-0.9.18.orig/autogen.sh 2025-03-10 12:07:35.000000000 +0100
-+++ libloc-0.9.18/autogen.sh 2025-05-14 11:24:52.602116647 +0200
-@@ -8,8 +8,9 @@
- echo "Activated pre-commit hook."
- fi
-
-+autopoint
- intltoolize --force --automake
--autoreconf --install --symlink
-+autoreconf --force --install --symlink
-
- libdir() {
- echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
-diff -Naur libloc-0.9.18.orig/configure.ac libloc-0.9.18/configure.ac
---- libloc-0.9.18.orig/configure.ac 2025-03-10 12:07:35.000000000 +0100
-+++ libloc-0.9.18/configure.ac 2025-05-14 11:25:45.712783931 +0200
-@@ -30,7 +30,10 @@
- AC_PREFIX_DEFAULT([/usr])
- gl_LD_VERSION_SCRIPT
-
--IT_PROG_INTLTOOL([0.40.0])
-++AM_GNU_GETTEXT_VERSION(0.25)
-++AM_GNU_GETTEXT([external])
-+
-+IT_PROG_INTLTOOL([0.51.0])
-
- # Interpret embedded Python in HTML files
- XGETTEXT="${XGETTEXT} -L Python --keyword=_:1,2 --keyword=N_:1,2 --no-location"
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-04 9:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-04 9:28 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ba4bb0af5a86b78e7b2b177ef58bbd9bd20c0bca Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox