Switch to bionic64

pull/130/head
lanjelot 4 years ago
parent f5b161a389
commit 98bd95bd5e

4
Vagrantfile vendored

@ -13,7 +13,7 @@ apt-get install -y tmux git wget build-essential vim
# requirements.txt deps # requirements.txt deps
apt-get install -y libcurl4-openssl-dev python3-dev libssl-dev # pycurl apt-get install -y libcurl4-openssl-dev python3-dev libssl-dev # pycurl
apt-get install -y ldap-utils # ldapsearch apt-get install -y ldap-utils # ldapsearch
apt-get install -y libmysqlclient-dev # mysqlclient-python apt-get install -y libmariadbclient-dev # mysqlclient-python
apt-get install -y ike-scan unzip default-jdk apt-get install -y ike-scan unzip default-jdk
apt-get install -y libsqlite3-dev libsqlcipher-dev # pysqlcipher apt-get install -y libsqlite3-dev libsqlcipher-dev # pysqlcipher
apt-get install -y libpq-dev # psycopg2 apt-get install -y libpq-dev # psycopg2
@ -33,7 +33,7 @@ pip install patator
SCRIPT SCRIPT
Vagrant.configure(2) do |config| Vagrant.configure(2) do |config|
config.vm.box = "ubuntu/xenial64" config.vm.box = "ubuntu/bionic64"
config.vm.box_check_update = false config.vm.box_check_update = false
# prevent TTY error messages # prevent TTY error messages

@ -2522,10 +2522,12 @@ class SMTP_Base(TCP_Cache):
def connect(self, host, port, ssl, helo, starttls, timeout): def connect(self, host, port, ssl, helo, starttls, timeout):
if ssl == '0': if ssl == '0':
if not port: port = 25 if not port:
port = 25
fp = SMTP(timeout=int(timeout)) fp = SMTP(timeout=int(timeout))
else: else:
if not port: port = 465 if not port:
port = 465
fp = SMTP_SSL(timeout=int(timeout)) fp = SMTP_SSL(timeout=int(timeout))
resp = fp.connect(host, int(port)) resp = fp.connect(host, int(port))
@ -3235,7 +3237,7 @@ class VMauthd_login(TCP_Cache):
# MySQL {{{ # MySQL {{{
try: try:
import _mysql from MySQLdb import _mysql
except ImportError: except ImportError:
notfound.append('mysqlclient') notfound.append('mysqlclient')

@ -1,7 +1,7 @@
paramiko paramiko
pycurl pycurl
ajpy ajpy
#impacket # no python3 compatibility impacket
pyopenssl pyopenssl
cx_Oracle cx_Oracle
mysqlclient mysqlclient

Loading…
Cancel
Save