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

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

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 2462 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  694b0f05280bc452f3ea00f473d598a05f82024b (commit)
       via  85bfecc0bae35ffe176d7c20dde7188594477787 (commit)
      from  149d8e83e5f547241a450ea0a68d8afac1e107fa (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 694b0f05280bc452f3ea00f473d598a05f82024b
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Wed Aug 17 21:22:34 2022 +0000

    Core Update 170: Ship getipstat
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 85bfecc0bae35ffe176d7c20dde7188594477787
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date:   Wed Aug 17 14:58:48 2022 +0200

    Fix bug 12908 - Correct getipstat pcount

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

Summary of changes:
 config/rootfiles/core/170/filelists/files | 1 +
 src/misc-progs/getipstat.c                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/170/filelists/files b/config/rootfiles/core/170/filelists/files
index 01b02c2ab..df8020847 100644
--- a/config/rootfiles/core/170/filelists/files
+++ b/config/rootfiles/core/170/filelists/files
@@ -14,6 +14,7 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromblocklist.dat
 srv/web/ipfire/html/themes/ipfire/include/functions.pl
 usr/lib/firewall/rules.pl
+usr/local/bin/getipstat
 usr/local/bin/setaliases
 usr/local/bin/update-ipblocklists
 usr/share/terminfo/t/tmux
diff --git a/src/misc-progs/getipstat.c b/src/misc-progs/getipstat.c
index 66d5b5a92..c4c7faf75 100644
--- a/src/misc-progs/getipstat.c
+++ b/src/misc-progs/getipstat.c
@@ -29,7 +29,7 @@ int main(int argc, char** argv)
 	// argument.
 	char *args[] = {"--list", "--verbose", "--numeric", "--wait", "5", NULL, NULL, NULL, NULL};
 	char *usage = "getipstat [-x][-f|-n|-m]";
-	unsigned int pcount = 6;
+	unsigned int pcount = 5;
 	unsigned int table_set = 0;
 
 	int opt;


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