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

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

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3891 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  f27bac491a8012b8dc014dfcf1bc5e11248692c2 (commit)
       via  68d7ae338e7b509fe00b42c3c44634cf18872056 (commit)
       via  2dd5e64592021460a7797340124b1f106ce1d486 (commit)
      from  e967871e8f2f585feff7c42786815ff6e8784774 (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 f27bac491a8012b8dc014dfcf1bc5e11248692c2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Apr 23 20:20:14 2019 +0100

    core132: Ship updated list of mime types
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 68d7ae338e7b509fe00b42c3c44634cf18872056
Author: Alexander Koch <ipfire(a)starkstromkonsument.de>
Date:   Thu Apr 18 01:54:18 2019 +0200

    apache / WPAD: Add correct MIME type for wpad.dat and proxy.pac
    
    Some clients require the correct MIME type to be set for accepting/handling the Proxy-Settings properly.
    
    See: http://findproxyforurl.com/deploying-wpad/
    
    Signed-off-by: Alexander Koch <ipfire(a)starkstromkonsument.de>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 2dd5e64592021460a7797340124b1f106ce1d486
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Apr 21 01:32:07 2019 +0100

    suricata: Do not always convert rules to be bi-directional
    
    This creates some overhead that we do not need and rules need to
    be adjusted to match any direction they are supposed to match.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/cfgroot/ids-functions.pl           | 3 ---
 config/etc/mime.types                     | 2 ++
 config/rootfiles/core/132/filelists/files | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index 5496df1a9..deb287bb7 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -742,9 +742,6 @@ sub write_modify_sids_file($) {
 	# Write file header.
 	print FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
 
-	# Tune rules to monitor in both directions.
-	print FILE "modifysid \* \"\-\>\" \| \"\<\>\"\n";
-
 	# Check if the traffic only should be monitored.
 	unless($ruleaction eq "alert") {
 		# Tell oinkmaster to switch all rules from alert to drop.
diff --git a/config/etc/mime.types b/config/etc/mime.types
index bf088b010..af82d4886 100644
--- a/config/etc/mime.types
+++ b/config/etc/mime.types
@@ -168,6 +168,8 @@ application/x-javascript	js
 application/x-koan		skp skd skt skm
 application/x-latex		latex
 application/x-netcdf		nc cdf
+application/x-ns-proxy-autoconfig       pac
+application/x-ns-proxy-autoconfig       dat
 # The standard is that rpm is audio/x-pn-realaudio-plugin... oh well...
 application/x-rpm		rpm
 application/x-sh		sh
diff --git a/config/rootfiles/core/132/filelists/files b/config/rootfiles/core/132/filelists/files
index 52e26c375..402ced7ca 100644
--- a/config/rootfiles/core/132/filelists/files
+++ b/config/rootfiles/core/132/filelists/files
@@ -1,6 +1,8 @@
 etc/system-release
 etc/issue
+etc/mime.types
 etc/suricata/suricata.yaml
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
+var/ipfire/ids-functions.pl
 var/ipfire/lang


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