public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: "Peter Müller" <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 694b0f05280bc452f3ea00f473d598a05f82024b
Date: Wed, 17 Aug 2022 21:23:49 +0000	[thread overview]
Message-ID: <4M7Lc5502Cz2xp5@people01.haj.ipfire.org> (raw)

[-- 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

                 reply	other threads:[~2022-08-17 21:23 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4M7Lc5502Cz2xp5@people01.haj.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox