From 8e2945b9b24f5dd3dfb6d9a3bcb2c7e07e8e1222 Mon Sep 17 00:00:00 2001 From: Jocelyn Le Sage Date: Fri, 5 May 2017 09:35:59 -0400 Subject: [PATCH] Fixed x11vnc crash: back-ported 2 buffer overflow fixes from the master branch. --- Dockerfile.alpine | 4 ++-- Dockerfile.alpine-glibc | 4 ++-- Dockerfile.debian | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.alpine b/Dockerfile.alpine index e50bde2..4df1a84 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -9,13 +9,13 @@ FROM ${BASEIMAGE} # Define software versions. ARG LIBVNCSERVER_VERSION=0.9.11 -ARG X11VNC_VERSION=0.9.14 +ARG X11VNC_VERSION=0.9.14-fixes ARG NOVNC_VERSION=0.6.2-fixes ARG S6_OVERLAY_VERSION=1.19.1.1 # Define software download URLs. ARG LIBVNCSERVER_URL=https://github.com/jlesage/libvncserver/archive/LibVNCServer-${LIBVNCSERVER_VERSION}-fixes.tar.gz -ARG X11VNC_URL=https://github.com/LibVNC/x11vnc/archive/${X11VNC_VERSION}.tar.gz +ARG X11VNC_URL=https://github.com/jlesage/x11vnc/archive/${X11VNC_VERSION}.tar.gz ARG NOVNC_URL=https://github.com/jlesage/novnc/archive/v${NOVNC_VERSION}.tar.gz ARG S6_OVERLAY_URL=https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz diff --git a/Dockerfile.alpine-glibc b/Dockerfile.alpine-glibc index 95ba4d4..b22cce2 100644 --- a/Dockerfile.alpine-glibc +++ b/Dockerfile.alpine-glibc @@ -9,13 +9,13 @@ FROM ${BASEIMAGE} # Define software versions. ARG LIBVNCSERVER_VERSION=0.9.11 -ARG X11VNC_VERSION=0.9.14 +ARG X11VNC_VERSION=0.9.14-fixes ARG NOVNC_VERSION=0.6.2-fixes ARG S6_OVERLAY_VERSION=1.19.1.1 # Define software download URLs. ARG LIBVNCSERVER_URL=https://github.com/jlesage/libvncserver/archive/LibVNCServer-${LIBVNCSERVER_VERSION}-fixes.tar.gz -ARG X11VNC_URL=https://github.com/LibVNC/x11vnc/archive/${X11VNC_VERSION}.tar.gz +ARG X11VNC_URL=https://github.com/jlesage/x11vnc/archive/${X11VNC_VERSION}.tar.gz ARG NOVNC_URL=https://github.com/jlesage/novnc/archive/v${NOVNC_VERSION}.tar.gz ARG S6_OVERLAY_URL=https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz diff --git a/Dockerfile.debian b/Dockerfile.debian index d026d6b..cfb6871 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -9,13 +9,13 @@ FROM ${BASEIMAGE} # Define software versions. ARG LIBVNCSERVER_VERSION=0.9.11 -ARG X11VNC_VERSION=0.9.14 +ARG X11VNC_VERSION=0.9.14-fixes ARG NOVNC_VERSION=0.6.2-fixes ARG S6_OVERLAY_VERSION=1.19.1.1 # Define software download URLs. ARG LIBVNCSERVER_URL=https://github.com/jlesage/libvncserver/archive/LibVNCServer-${LIBVNCSERVER_VERSION}-fixes.tar.gz -ARG X11VNC_URL=https://github.com/LibVNC/x11vnc/archive/${X11VNC_VERSION}.tar.gz +ARG X11VNC_URL=https://github.com/jlesage/x11vnc/archive/${X11VNC_VERSION}.tar.gz ARG NOVNC_URL=https://github.com/jlesage/novnc/archive/v${NOVNC_VERSION}.tar.gz ARG S6_OVERLAY_URL=https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz