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

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

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2341 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  26dc79a6fe16c83c5b57f4b6c7c3f73281a03d6c (commit)
       via  e96adc77972108de9cb8b4b6c0f7fbad07b76035 (commit)
      from  e91c83490be8d248796d50b0c9bca3976199551c (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 26dc79a6fe16c83c5b57f4b6c7c3f73281a03d6c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Apr 17 21:24:25 2019 +0100

    suricata: Do not let oinkmaster be too verbose
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit e96adc77972108de9cb8b4b6c0f7fbad07b76035
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Apr 17 20:59:55 2019 +0100

    suricata: Redirect oinkmaster output to perl function
    
    The output was written to stderr before and landed in apache's
    error log where we do not want it.
    
    Fixes: #12004
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/cfgroot/ids-functions.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Difference in files:
diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index 016c0e49d..5496df1a9 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -324,7 +324,7 @@ sub oinkmaster () {
 	openlog('oinkmaster', 'cons,pid', 'user');
 
 	# Call oinkmaster to generate ruleset.
-	open(OINKMASTER, "/usr/local/bin/oinkmaster.pl -v -s -u file://$rulestarball -C $settingsdir/oinkmaster.conf -o $rulespath|") or die "Could not execute oinkmaster $!\n";
+	open(OINKMASTER, "/usr/local/bin/oinkmaster.pl -s -u file://$rulestarball -C $settingsdir/oinkmaster.conf -o $rulespath 2>&1 |") or die "Could not execute oinkmaster $!\n";
 
 	# Log output of oinkmaster to syslog.
 	while(<OINKMASTER>) {


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