Merge branch 'openssl-11' into next

diff --combined html/cgi-bin/ovpnmain.cgi
index 0fa1d046e5afd77d1ece2d64be8fc0600d010320,424a5c98445cea88724f298a152035e60ceebe68..c52e8bae91973b1a5fdd598b8a6fa51ac61912cc
--- 1/html/cgi-bin/ovpnmain.cgi
--- 2/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@@ -216,7 -216,7 +216,7 @@@ sub writeserverconf 
      print CONF "dev tun\n";
      print CONF "proto $sovpnsettings{'DPROTOCOL'}\n";
      print CONF "port $sovpnsettings{'DDEST_PORT'}\n";
-     print CONF "script-security 3 system\n";
+     print CONF "script-security 3\n";
      print CONF "ifconfig-pool-persist /var/ipfire/ovpn/ovpn-leases.db 3600\n";
      print CONF "client-config-dir /var/ipfire/ovpn/ccd\n";
      print CONF "tls-server\n";
@@@ -289,6 -289,7 +289,7 @@@
      } 
      print CONF "status-version 1\n";
      print CONF "status /var/run/ovpnserver.log 30\n";
+     print CONF "ncp-disable\n";
      print CONF "cipher $sovpnsettings{DCIPHER}\n";
      if ($sovpnsettings{'DAUTH'} eq '') {
          print CONF "";
@@@ -2002,7 -2003,7 +2003,7 @@@ EN
            </select></td>
        <tr><td class='base'>$Lang::tr{'ovpn dh'}:</td>
                <td class='base'><select name='DHLENGHT'>
 -                              <option value='1024' $selected{'DHLENGHT'}{'1024'}>1024 $Lang::tr{'bit'}</option>
 +                              <option value='1024' $selected{'DHLENGHT'}{'1024'}>1024 $Lang::tr{'bit'} ($Lang::tr{'vpn weak'}</option>
                                <option value='2048' $selected{'DHLENGHT'}{'2048'}>2048 $Lang::tr{'bit'}</option>
                                <option value='3072' $selected{'DHLENGHT'}{'3072'}>3072 $Lang::tr{'bit'}</option>
                                <option value='4096' $selected{'DHLENGHT'}{'4096'}>4096 $Lang::tr{'bit'}</option>
@@@ -4713,12 -4714,12 +4714,12 @@@ if ($cgiparams{'TYPE'} eq 'net') 
                                <option value='AES-256-CBC'             $selected{'DCIPHER'}{'AES-256-CBC'}>AES-CBC (256 $Lang::tr{'bit'}, $Lang::tr{'default'})</option>
                                <option value='AES-192-CBC'             $selected{'DCIPHER'}{'AES-192-CBC'}>AES-CBC (192 $Lang::tr{'bit'})</option>
                                <option value='AES-128-CBC'             $selected{'DCIPHER'}{'AES-128-CBC'}>AES-CBC (128 $Lang::tr{'bit'})</option>
 -                              <option value='DES-EDE3-CBC'            $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC (192 $Lang::tr{'bit'})</option>
 -                              <option value='DESX-CBC'                $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC (192 $Lang::tr{'bit'})</option>
 -                              <option value='SEED-CBC'                $selected{'DCIPHER'}{'SEED-CBC'}>SEED-CBC (128 $Lang::tr{'bit'})</option>
 -                              <option value='DES-EDE-CBC'             $selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC (128 $Lang::tr{'bit'})</option>
 -                              <option value='BF-CBC'                  $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC (128 $Lang::tr{'bit'})</option>
 -                              <option value='CAST5-CBC'               $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC (128 $Lang::tr{'bit'})</option>
 +                              <option value='SEED-CBC'                        $selected{'DCIPHER'}{'SEED-CBC'}>SEED-CBC (128 $Lang::tr{'bit'})</option>
 +                              <option value='DES-EDE3-CBC'            $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC (192 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
 +                              <option value='DESX-CBC'                        $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC (192 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
 +                              <option value='DES-EDE-CBC'             $selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
 +                              <option value='BF-CBC'                          $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
 +                              <option value='CAST5-CBC'                       $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
                        </select>
                </td>
  
@@@ -5210,12 -5211,12 +5211,12 @@@ EN
                                <option value='AES-256-CBC' $selected{'DCIPHER'}{'AES-256-CBC'}>AES-CBC (256 $Lang::tr{'bit'})</option>
                                <option value='AES-192-CBC' $selected{'DCIPHER'}{'AES-192-CBC'}>AES-CBC (192 $Lang::tr{'bit'})</option>
                                <option value='AES-128-CBC' $selected{'DCIPHER'}{'AES-128-CBC'}>AES-CBC (128 $Lang::tr{'bit'})</option>
 -                              <option value='DES-EDE3-CBC' $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC (192 $Lang::tr{'bit'})</option>
 -                              <option value='DESX-CBC' $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC (192 $Lang::tr{'bit'})</option>
                                <option value='SEED-CBC' $selected{'DCIPHER'}{'SEED-CBC'}>SEED-CBC (128 $Lang::tr{'bit'})</option>
 -                              <option value='DES-EDE-CBC' $selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC (128 $Lang::tr{'bit'})</option>
 -                              <option value='BF-CBC' $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC (128 $Lang::tr{'bit'})</option>
 -                              <option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC (128 $Lang::tr{'bit'})</option>
 +                              <option value='DES-EDE3-CBC' $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC (192 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
 +                              <option value='DESX-CBC' $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC (192 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
 +                              <option value='DES-EDE-CBC' $selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
 +                              <option value='BF-CBC' $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
 +                              <option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
                        </select>
                </td>
      <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td>

diff --combined make.sh
index 44c18fee78a4128497ae0b61b468a742667ac7e6,0fac40d8b6bfd701bb96e60c90f92fa1f8a59635..ef4bf7a7d858e4baf1710451f5997b509fe1e1cf
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.19"                                                        # Version number
 -CORE="118"                                                    # Core Level (Filename)
 -PAKFIRE_CORE="118"                                            # Core Level (PAKFIRE)
 +CORE="120"                                                    # Core Level (Filename)
 +PAKFIRE_CORE="119"                                            # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -37,7 -37,7 +37,7 @@@ KVER=`grep --max-count=1 VER lfs/linux 
  GIT_TAG=$(git tag | tail -1)                                  # Git Tag
  GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)        # Last commit
  
 -TOOLCHAINVER=20180210
 +TOOLCHAINVER=20180213
  
  ###############################################################################
  #
@@@ -928,7 -928,6 +928,7 @@@ buildtoolchain() 
        lfsmake1 gcc                    PASS=L
        lfsmake1 binutils                       PASS=2
        lfsmake1 gcc                    PASS=2
 +      lfsmake1 zlib
        lfsmake1 ccache                 PASS=2
        lfsmake1 tcl
        lfsmake1 expect
@@@ -1125,6 -1124,7 +1125,7 @@@ buildipfire() 
    lfsmake2 xtables-addons                     USPACE="1"
    lfsmake2 openssl
    [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
+   lfsmake2 openssl-compat
    lfsmake2 libgpg-error
    lfsmake2 libgcrypt
    lfsmake2 libassuan
@@@ -1175,6 -1175,7 +1176,6 @@@
    lfsmake2 libxml2
    lfsmake2 libxslt
    lfsmake2 BerkeleyDB
 -  lfsmake2 mysql
    lfsmake2 cyrus-sasl
    lfsmake2 openldap
    lfsmake2 apache2
@@@ -1210,6 -1211,8 +1211,6 @@@
    lfsmake2 ipaddr
    lfsmake2 iputils
    lfsmake2 l7-protocols
 -  lfsmake2 mISDNuser
 -  lfsmake2 capi4k-utils
    lfsmake2 hwdata
    lfsmake2 logrotate
    lfsmake2 logwatch
@@@ -1282,6 -1285,7 +1283,6 @@@
    lfsmake2 lz4
    lfsmake2 lzo
    lfsmake2 openvpn
 -  lfsmake2 pammysql
    lfsmake2 mpage
    lfsmake2 dbus
    lfsmake2 intltool
@@@ -1331,6 -1335,7 +1332,6 @@@
    lfsmake2 cmake
    lfsmake2 gnump3d
    lfsmake2 rsync
 -  lfsmake2 tcpwrapper
    lfsmake2 libtirpc
    lfsmake2 rpcbind
    lfsmake2 nfs
@@@ -1412,6 -1417,7 +1413,6 @@@
    lfsmake2 vdradmin
    lfsmake2 miau
    lfsmake2 perl-DBI
 -  lfsmake2 perl-DBD-mysql
    lfsmake2 perl-DBD-SQLite
    lfsmake2 perl-File-ReadBackwards
    lfsmake2 openvmtools
@@@ -1434,6 -1440,7 +1435,7 @@@
    lfsmake2 powertop
    lfsmake2 parted
    lfsmake2 swig
+   lfsmake2 python-typing
    lfsmake2 python-m2crypto
    lfsmake2 wireless-regdb
    lfsmake2 crda
@@@ -1512,7 -1519,6 +1514,7 @@@
    lfsmake2 wio
    lfsmake2 iftop
    lfsmake2 mdns-repeater
 +  lfsmake2 i2c-tools
  }
  
  buildinstaller() {