From b2f40d5c887cfd214fb930b6e5f99250d284d472 Mon Sep 17 00:00:00 2001 From: Oleksii Shevchuk Date: Sun, 17 Jun 2018 21:52:01 +0300 Subject: [PATCH] Fix requirements 1. Add dnslib to client 2. Freeze rpyc to version < 4 for now --- client/android_sources/buildozer-docker.spec | 2 +- client/requirements.txt | 3 ++- client/sources-linux/build-docker.sh | 4 ++-- client/sources-linux/buildenv-sunos.sh | 4 ++-- client/sources/build-docker.sh | 2 +- pupy/requirements.txt | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/client/android_sources/buildozer-docker.spec b/client/android_sources/buildozer-docker.spec index 9d52f3f6..93966afd 100644 --- a/client/android_sources/buildozer-docker.spec +++ b/client/android_sources/buildozer-docker.spec @@ -11,7 +11,7 @@ source.exclude_dirs = python-for-android, bin #source.exclude_patterns = license,images/*/*.jpg version = 0.1 -requirements = pycrypto,plyer,psutil,tinyec,netaddr,rpyc,pyjnius,pyuv,cryptography,kcp,msgpack-python +requirements = pycrypto,plyer,psutil,tinyec,netaddr,rpyc==3.4.4,dnslib,pyjnius,pyuv,cryptography,kcp,msgpack-python #presplash.filename = %(source.dir)s/data/presplash.png #icon.filename = %(source.dir)s/data/icon.png orientation = all diff --git a/client/requirements.txt b/client/requirements.txt index 11a47991..4eef3f15 100644 --- a/client/requirements.txt +++ b/client/requirements.txt @@ -1,4 +1,4 @@ -rpyc +rpyc==3.4.4 pycryptodome psutil rsa @@ -7,3 +7,4 @@ tinyec poster u-msgpack-python win_inet_pton +dnslib diff --git a/client/sources-linux/build-docker.sh b/client/sources-linux/build-docker.sh index e68f54b2..ce0a1d61 100755 --- a/client/sources-linux/build-docker.sh +++ b/client/sources-linux/build-docker.sh @@ -25,10 +25,10 @@ CC=/gccwrap CFLAGS_FILTER="-Wno-error=sign-conversion" \ python -m pip install --upgrade -q cryptography --no-binary :all: python -m pip install --upgrade \ - rpyc pycryptodome pyaml rsa netaddr tinyec pyyaml ecdsa \ + rpyc==3.4.4 pycryptodome pyaml rsa netaddr tinyec pyyaml ecdsa \ paramiko pylzma pydbus python-ptrace psutil scandir \ scapy impacket colorama pyOpenSSL python-xlib msgpack-python \ - u-msgpack-python poster \ + u-msgpack-python poster dnslib \ --no-binary :all: python -m pip install --upgrade --force-reinstall pycparser==2.17 diff --git a/client/sources-linux/buildenv-sunos.sh b/client/sources-linux/buildenv-sunos.sh index c6d4d507..5cf38674 100755 --- a/client/sources-linux/buildenv-sunos.sh +++ b/client/sources-linux/buildenv-sunos.sh @@ -133,10 +133,10 @@ python -m pip install --upgrade six packaging appdirs setuptools export CFLAGS_FILTER="-Wno-error=sign-conversion" python -m pip install \ - rpyc pycryptodome pyaml rsa netaddr tinyec pyyaml ecdsa \ + rpyc==3.4.4 pycryptodome pyaml rsa netaddr tinyec pyyaml ecdsa \ paramiko uptime cryptography cffi pylzma pydbus python-ptrace scandir \ scapy colorama pyOpenSSL python-xlib msgpack-python \ - u-msgpack-python poster \ + u-msgpack-python poster dnslib \ --upgrade --no-binary :all: python -m pip install --force-reinstall pycparser==2.17 diff --git a/client/sources/build-docker.sh b/client/sources/build-docker.sh index 2059ef9b..8a5c2716 100755 --- a/client/sources/build-docker.sh +++ b/client/sources/build-docker.sh @@ -1,6 +1,6 @@ #!/bin/sh -PACKAGES="rpyc rsa pefile rsa netaddr win_inet_pton netaddr tinyec pypiwin32 poster win_inet_pton" +PACKAGES="rpyc==3.4.4 rsa pefile rsa netaddr win_inet_pton netaddr tinyec pypiwin32 poster win_inet_pton dnslib" PACKAGES_BUILD="pycryptodome cryptography netifaces msgpack-python u-msgpack-python scandir construct" PACKAGES="$PACKAGES pyaudio https://github.com/secdev/scapy/archive/master.zip pyOpenSSL colorama pyuv" PACKAGES="$PACKAGES https://github.com/CoreSecurity/impacket/archive/master.zip" diff --git a/pupy/requirements.txt b/pupy/requirements.txt index 23d50b4b..1e940675 100644 --- a/pupy/requirements.txt +++ b/pupy/requirements.txt @@ -1,4 +1,4 @@ -rpyc +rpyc==3.4.4 pycryptodome pefile pyyaml