From 20e800adb4153695ab0a1be466de2e8a6922cc18 Mon Sep 17 00:00:00 2001 From: lanjelot Date: Fri, 5 Jan 2024 11:45:32 +1100 Subject: [PATCH] Fix #205: pin FreeRDP version 2.9.0 --- Dockerfile | 9 ++++----- patator.py | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index df53652..31e9971 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,11 +39,10 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends ninja-build build-essential git-core debhelper cdbs dpkg-dev autotools-dev cmake pkg-config xmlto libssl-dev docbook-xsl xsltproc libxkbfile-dev libx11-dev libwayland-dev libxrandr-dev libxi-dev libxrender-dev libxext-dev libxinerama-dev libxfixes-dev libxcursor-dev libxv-dev libxdamage-dev libxtst-dev libcups2-dev libpcsclite-dev libasound2-dev libpulse-dev libjpeg-dev libgsm1-dev libusb-1.0-0-dev libudev-dev libdbus-glib-1-dev uuid-dev libxml2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libfaad-dev libfaac-dev libsdl2-dev libcjson-dev libpkcs11-helper1-dev \ && apt-get install -y --no-install-recommends libavutil-dev libavcodec-dev libswresample-dev \ && rm -rf /var/lib/apt/lists/* \ - && git clone https://github.com/FreeRDP/FreeRDP/ . \ - && cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_CLIENT_SDL=OFF -DWITH_KRB5=OFF -DWITH_SWSCALE=OFF -DWITTH_SSE2=ON -DWITH_FUSE=OFF . \ - && cmake --build . \ - && cmake --build . --target install \ - && cmake --build . --target clean \ + && git clone --depth 1 --branch 2.9.0 https://github.com/freerdp/freerdp.git \ + && cmake -B freerdp-build -S freerdp -DCMAKE_BUILD_TYPE=Debug -DWITH_CLIENT_SDL=OFF -DWITH_KRB5=OFF -DWITH_SWSCALE=OFF -DWITTH_SSE2=ON -DWITH_FUSE=OFF \ + && cmake --build freerdp-build \ + && cmake --install freerdp-build \ && rm -rf /opt/FreeRDP # patator diff --git a/patator.py b/patator.py index 7cb27f5..606bbe1 100755 --- a/patator.py +++ b/patator.py @@ -18,7 +18,7 @@ __email__ = 'patator@hsc.fr' __url__ = 'http://www.hsc.fr/ressources/outils/patator/' __git__ = 'https://github.com/lanjelot/patator' __twitter__ = 'https://twitter.com/lanjelot' -__version__ = '1.0' +__version__ = '1.1-dev' __license__ = 'GPLv2' __pyver__ = '%d.%d.%d' % sys.version_info[0:3] __banner__ = 'Patator %s (%s) with python-%s' % (__version__, __git__, __pyver__) @@ -4243,7 +4243,7 @@ class RDP_login: def execute(self, host, port='3389', user=None, password=None): - cmd = ['xfreerdp', '/v:%s:%d' % (host, int(port)), '/u:%s' % user, '/p:%s' % password, '/cert:ignore', '/tls:seclevel:0', '+auth-only', '/sec:nla', '/log-level:error'] + cmd = ['xfreerdp', '/v:%s:%d' % (host, int(port)), '/u:%s' % user, '/p:%s' % password, '/cert:ignore', '/tls-seclevel:0', '+auth-only', '/sec:nla', '/log-level:error'] with Timing() as timing: p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)