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

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

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3969 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  9e65aa9ed6d7a3a489c58a6f966eac34972c68f8 (commit)
       via  c25a386523c305615641a1810bcc3b009bc3cf07 (commit)
       via  64aed99df6ba3b057c35ebb6b9278a13ae5e575d (commit)
      from  5fa063f8590dcd85867935fd6d1a6bd570ac61c6 (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 9e65aa9ed6d7a3a489c58a6f966eac34972c68f8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Apr 17 19:15:44 2019 +0100

    Revert "hostapd: Always enable 80 MHz channel width for 802.11ac"
    
    This reverts commit c31c8078cffcf3f933f567cb02a366ceedd6d5da.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit c25a386523c305615641a1810bcc3b009bc3cf07
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Apr 17 07:38:27 2019 +0100

    unbound: Drop unused function
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 64aed99df6ba3b057c35ebb6b9278a13ae5e575d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Apr 17 05:16:05 2019 +0100

    suricata: Change runmode to workers
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/suricata/suricata.yaml  |  2 +-
 html/cgi-bin/wlanap.cgi        |  2 --
 src/initscripts/system/unbound | 24 ------------------------
 3 files changed, 1 insertion(+), 27 deletions(-)

Difference in files:
diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml
index 3fe78cb2f..e7e27c731 100644
--- a/config/suricata/suricata.yaml
+++ b/config/suricata/suricata.yaml
@@ -317,7 +317,7 @@ max-pending-packets: 1024
 # Runmode the engine should use. Please check --list-runmodes to get the available
 # runmodes for each packet acquisition method. Defaults to "autofp" (auto flow pinned
 # load balancing).
-#runmode: autofp
+runmode: workers
 
 # Specifies the kind of flow load balancer used by the flow pinned autofp mode.
 #
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 93366a38f..44b0b4053 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -600,8 +600,6 @@ ieee80211n=1
 wmm_enabled=1
 ht_capab=$wlanapsettings{'HTCAPS'}
 vht_capab=$wlanapsettings{'VHTCAPS'}
-vht_oper_chwidth=1
-vht_oper_centr_freq_seg0_idx=42
 END
 ;
 
diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index e87f9e10d..fbb096e0d 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -24,30 +24,6 @@ EDNS_DEFAULT_BUFFER_SIZE=4096
 # Load optional configuration
 [ -e "/etc/sysconfig/unbound" ] && . /etc/sysconfig/unbound
 
-function cidr() {
-    local cidr nbits IFS;
-    IFS=. read -r i1 i2 i3 i4 <<< ${1}
-    IFS=. read -r m1 m2 m3 m4 <<< ${2}
-    cidr=$(printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$((i2 & m2))" "$((i3 & m3))" "$((i4 & m4))")
-    nbits=0
-    IFS=.
-    for dec in $2 ; do
-        case $dec in
-            255) let nbits+=8;;
-            254) let nbits+=7;;
-            252) let nbits+=6;;
-            248) let nbits+=5;;
-            240) let nbits+=4;;
-            224) let nbits+=3;;
-            192) let nbits+=2;;
-            128) let nbits+=1;;
-            0);;
-            *) echo "Error: $dec is not recognised"; exit 1
-        esac
-    done
-    echo "${cidr}/${nbits}"
-}
-
 ip_address_revptr() {
 	local addr=${1}
 


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