From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4fH2Fm2sspz2xXQ for ; Thu, 19 Feb 2026 18:38:36 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4fH2Fm2fMvz2xSL for ; Thu, 19 Feb 2026 18:38:36 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [IPv6:2001:678:b28::161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "people01.haj.ipfire.org", Issuer "E7" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4fH2Fl6ftfz9P for ; Thu, 19 Feb 2026 18:38:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1771526315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=KKEzSiEaNoUikJKtjvgf7gU2x3vW9ePdQ/3ThKnD05I=; b=rF6WgVoBxpj70bHSrtyeA/19qL66r5RZsnoRRXWpjWfm1IaLkV7JKVc50RUkLo1x93bEn1 RBM7JYAbucHVrYzrbUPhOK+Wim7/+5K+SdrcE1WhJ5MsPBUs49uhh8s/JkDsBVZwW9+2fs /+clFpVPp3siVwBN7Xy75OSY/Flb1seqJqDLU2qmjAjwUepNDG2wGDZzixADpBRoFxOwKF gqTLwaoaD2YYCf9wHBQD0LFLbZyy6+zi6MfhbmaCDS04HiqyfK0vtDlHn5p8f1rojFDXXM Xb/RI7iMoeqsAgjdlu/Z/B+O+dX/dH++0cVF/gNI22kKPe+W7EQ/7QBpb/CDvQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1771526315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=KKEzSiEaNoUikJKtjvgf7gU2x3vW9ePdQ/3ThKnD05I=; b=w5MchxymNsHI4UsrtzDJq83makgRJgSUTeVxMdEALIf/FpFMS3whJLC7GM1HNK/vAGuzT8 xH2QYwFSsH7ZoZDw== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4fH2Fl6B0Vz2xwn; Thu, 19 Feb 2026 18:38:35 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. df036e10b4503032476d85e2a09d170d317e4c18 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 9d79c854d65bf2e75385ee3b8a837954020add04 X-Git-Newrev: df036e10b4503032476d85e2a09d170d317e4c18 Message-Id: <4fH2Fl6B0Vz2xwn@people01.haj.ipfire.org> Date: Thu, 19 Feb 2026 18:38:35 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 df036e10b4503032476d85e2a09d170d317e4c18 (commit) via ce0189c9ec4ffd78386fdc5af0e487217110ac98 (commit) via 5b97316a4eae8a96c43c7737639d862571c8243f (commit) via b08e5775a2da42c73379cbe258519c4267ed72ce (commit) via f7c80e81f64653148b834a137cb08043ef021a8a (commit) via ff0daa1660e064a51a26dbf0098bce0d25c11a5c (commit) via bee138720596ce50f82075e411f857cdd9f04344 (commit) via fe9d3554182d541996af8df59acaf8a66cca0d81 (commit) from 9d79c854d65bf2e75385ee3b8a837954020add04 (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 df036e10b4503032476d85e2a09d170d317e4c18 Merge: 9d79c854d ce0189c9e Author: Michael Tremer Date: Thu Feb 19 18:38:27 2026 +0000 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 6 ++---- config/rootfiles/oldcore/200/filelists/files | 1 + doc/language_missings | 10 ++++++++++ langs/en/cgi-bin/en.pl | 1 + lfs/dhcpcd | 4 ++-- lfs/hostapd | 2 +- src/initscripts/system/functions | 6 ------ src/paks/hostapd/update.sh | 4 +++- 8 files changed, 20 insertions(+), 14 deletions(-) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 1c3374d86..bcc8942c3 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -1058,11 +1058,9 @@ sub GetCoreUpdateVersion() { my $core_update; open(FILE, "/opt/pakfire/db/core/mine"); - while () { - $core_update = $_; - last; - } + $core_update = ; close(FILE); + chomp($core_update); return $core_update; } diff --git a/config/rootfiles/oldcore/200/filelists/files b/config/rootfiles/oldcore/200/filelists/files index 1437bb18b..d36e32626 100644 --- a/config/rootfiles/oldcore/200/filelists/files +++ b/config/rootfiles/oldcore/200/filelists/files @@ -5,5 +5,6 @@ srv/web/ipfire/cgi-bin/dns.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi usr/local/bin/filesystem-cleanup var/ipfire/backup/exclude +var/ipfire/general-functions.pl var/ipfire/ids-functions.pl var/ipfire/urlfilter/autoupdate/autoupdate.urls diff --git a/doc/language_missings b/doc/language_missings index 19c8182ad..9fc6e75ab 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -77,6 +77,7 @@ < ids subscription code required < insert removable device < invalid input for subscription code +< ipfire dbl < ipsec dns server address is invalid < ipsec invalid ip address or fqdn for rw endpoint < ipsec roadwarrior endpoint @@ -180,6 +181,7 @@ < ids reports weekly < ids send email on alert < indirect target selection +< ipfire dbl < lldp < lldp invalid description < lldp neighbors @@ -294,6 +296,7 @@ < invalid ip address < invalid keepalive interval < invalid network +< ipfire dbl < ips throughput < last updated < lldp @@ -768,6 +771,7 @@ < ipblocklist name < ipblocklist output < ipblocklist use ipblocklists +< ipfire dbl < ip info for < ipsec connection < ipsec dns server address is invalid @@ -1467,6 +1471,7 @@ < ipblocklist name < ipblocklist output < ipblocklist use ipblocklists +< ipfire dbl < ip info for < ipsec connection < ipsec dns server address is invalid @@ -2441,6 +2446,7 @@ < ipblocklist name < ipblocklist output < ipblocklist use ipblocklists +< ipfire dbl < ip info for < ipsec < ipsec connection @@ -3609,6 +3615,7 @@ < ipblocklist name < ipblocklist output < ipblocklist use ipblocklists +< ipfire dbl < ip info for < ipsec < ipsec connection @@ -4358,6 +4365,7 @@ < ipblocklist name < ipblocklist output < ipblocklist use ipblocklists +< ipfire dbl < ip info for < ipsec connection < ipsec dns server address is invalid @@ -4664,6 +4672,7 @@ < ids reports weekly < ids send email on alert < indirect target selection +< ipfire dbl < lldp < lldp invalid description < lldp neighbors @@ -4769,6 +4778,7 @@ < ids reports weekly < ids send email on alert < indirect target selection +< ipfire dbl < lldp < lldp invalid description < lldp neighbors diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 010473af9..1e72788e7 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1652,6 +1652,7 @@ 'ipblocklist name' => 'Name', 'ipblocklist output' => 'Packets dropped (OUT)', 'ipblocklist use ipblocklists' => 'Enable IP Blocklists', +'ipfire dbl' => 'IPFire DBL domain blocklists', 'ipfire has now rebooted' => 'IPFire is rebooting now.', 'ipfire has now shutdown' => 'IPFire is shutting down now.', 'ipfire side' => 'IPFire side:', diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 80a15072e..6d15caad2 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -24,7 +24,7 @@ include Config -VER = 10.3.0 +VER = 10.2.4 THISAPP = dhcpcd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 657d20b5b92769615035b5d8792c77280a2ef34a96f64f4c5a70d3ee51a24b9dec48f2a4f59b75d3e5505685eece0a4f163518fd1f027b09945287a30b075f8a +$(DL_FILE)_BLAKE2 = cdc5c345c58f24852ecf7e6655446f9385c860d9095cca8fa40eaae27a1d05dfad667e1e39af6ace2bd73acaa799210d6345462c90a88f89839912416263fdef install : $(TARGET) 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