[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bbfa373e84793f95eb4a0a79daa65de120daf95e

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2687 bytes --]

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  bbfa373e84793f95eb4a0a79daa65de120daf95e (commit)
       via  b5caa9261288be44bb386d9a18ab2aabb9af9a89 (commit)
      from  9b113b4f2c9397faf4b946e6bb74f455e84fe9fe (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 bbfa373e84793f95eb4a0a79daa65de120daf95e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Sep 21 13:33:07 2024 +0200

    wlanap.cgi: Fix listing channels
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b5caa9261288be44bb386d9a18ab2aabb9af9a89
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Sep 21 12:24:58 2024 +0000

    Config: Fix determining the package size
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 html/cgi-bin/wlanap.cgi | 4 ++--
 lfs/Config              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 2691496ab..3226c5893 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -61,7 +61,7 @@ my %cgiparams = ();
 &Header::getcgihash(\%cgiparams);
 
 # Find the selected interface
-my $INTF = &Network::get_intf_by_address($cgiparams{'INTERFACE'});
+my $INTF = &Network::get_intf_by_address($wlanapsettings{'INTERFACE'});
 
 delete $wlanapsettings{'__CGI__'};
 delete $wlanapsettings{'x'};
@@ -281,7 +281,7 @@ print <<END;
 END
 
 foreach my $channel (@channellist){
-	print "<option $selected{'CHANNEL'}{$channel}>";
+	print "<option value='$channel' $selected{'CHANNEL'}{$channel}>";
 	if ($channel eq 0) {
 		print "- $Lang::tr{'wlanap auto'} -";
 	} else {
diff --git a/lfs/Config b/lfs/Config
index 9fabe790c..ea7804298 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -425,7 +425,7 @@ define CREATE_META
 	echo "Summary: $(SUMMARY)"						>> $(2)
 	echo "ProgVersion: $(VER)"						>> $(2)
 	echo "Release: $(PAK_VER)"						>> $(2)
-	echo "Size: $(shell stat --format=%s $(1))"			>> $(2)
+	echo "Size: $$(stat --format=%s $(1))"			>> $(2)
 	echo "Dependencies: $(DEPS)"					>> $(2)
 	echo "File: $(PROG)-$(VER)-$(PAK_VER).ipfire"	>> $(2)
 	echo "Services: $(SERVICES)"					>> $(2)


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