aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2014-05-23 09:14:04 -0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-05-23 14:46:09 +0200
commitb19399cc1de0d27543ed97efad5dd9adfd04f7c0 (patch)
treee89017adfd89ea3e842524a9b70ab6696bbc6317
parent7467fbead7cf87ee96449014fd37720c64bc3966 (diff)
downloadbuildroot-b19399cc1de0d27543ed97efad5dd9adfd04f7c0.tar.gz
buildroot-b19399cc1de0d27543ed97efad5dd9adfd04f7c0.tar.bz2
rdesktop: security bump to version 1.8.2
Long overdue, fixes CVE-2008-1801, CVE-2008-1802, CVE-2008-1803 and CVE-2011-1595. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/rdesktop/rdesktop-01-8bit-colors.patch (renamed from package/rdesktop/rdesktop-8bit-colors.patch)0
-rw-r--r--package/rdesktop/rdesktop.mk17
2 files changed, 13 insertions, 4 deletions
diff --git a/package/rdesktop/rdesktop-8bit-colors.patch b/package/rdesktop/rdesktop-01-8bit-colors.patch
index 710f8debef..710f8debef 100644
--- a/package/rdesktop/rdesktop-8bit-colors.patch
+++ b/package/rdesktop/rdesktop-01-8bit-colors.patch
diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
index 94e02829d4..6829709fc8 100644
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -4,11 +4,20 @@
#
################################################################################
-RDESKTOP_VERSION = 1.5.0
+RDESKTOP_VERSION = 1.8.2
RDESKTOP_SITE = http://downloads.sourceforge.net/project/rdesktop/rdesktop/$(RDESKTOP_VERSION)
-RDESKTOP_DEPENDENCIES = openssl xlib_libX11 xlib_libXt
-RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr
-RDESKTOP_LICENSE = GPLv2+ with exceptions
+RDESKTOP_DEPENDENCIES = host-pkgconf openssl xlib_libX11 xlib_libXt \
+ $(if $(BR2_PACKAGE_ALSA_LIB_PCM),alsa-lib) \
+ $(if $(BR2_PACKAGE_LIBAO),libao) \
+ $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate)
+RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr --disable-credssp
+RDESKTOP_LICENSE = GPLv3+
RDESKTOP_LICENSE_FILES = COPYING
+ifeq ($(BR2_PACKAGE_PCSC_LITE),y)
+RDESKTOP_DEPENDENCIES += pcsc-lite
+else
+RDESKTOP_CONF_OPT += --disable-smartcard
+endif
+
$(eval $(autotools-package))