=== modified file 'debian/changelog' --- debian/changelog 2016-07-13 01:22:18 +0000 +++ debian/changelog 2016-07-13 02:34:13 +0000 @@ -1,11 +1,96 @@ -freerdp (1.1.0~git20140921.1.440916e+dfsg1-5ubuntu1) wily; urgency=medium - - * Merge with Debian unstable, remaining changes - - Disable ffmpeg support - - Disable gstreamer support, this relies on gstreamer 0.10 and we don't - want to add any more deps on that. - - -- Robert Ancell Mon, 05 Oct 2015 14:33:15 +1300 +freerdp (1.1.0~git20140921.1.440916e+dfsg1-10ubuntu1) UNRELEASED; urgency=medium + + * Merge with Debian (LP: #1602480). Remaining change: + - Disable ffmpeg support (it's in universe) + + -- Jeremy Bicha Tue, 12 Jul 2016 21:30:01 -0400 + +freerdp (1.1.0~git20140921.1.440916e+dfsg1-10) unstable; urgency=medium + + * debian/rules: + + Fix more DEB_HOST_* vs. DEB_BUILD_* issues. (Closes: #822842). + + -- Mike Gabriel Thu, 28 Apr 2016 23:01:32 +0200 + +freerdp (1.1.0~git20140921.1.440916e+dfsg1-9) unstable; urgency=medium + + * debian/rules: + + Regression fix for usage of DEB_HOST_ARCH vs. DEB_BUILD_ARCH. Switching + back to DEB_HOST_ARCH to not break cross-builds. Thanks to Guillem Jover + for teaching me about the difference between those two options. + (Closes: #822842). + + -- Mike Gabriel Thu, 28 Apr 2016 12:58:12 +0200 + +freerdp (1.1.0~git20140921.1.440916e+dfsg1-8) unstable; urgency=medium + + * debian/rules: + + Use DEB_BUILD_ARCH, rather than DEB_HOST_ARCH when detecting armhf build + system. + * debian/{control,rules}: + + Build with -DCHANNEL_URBDRC_CLIENT=on only on Linux OSes. (Closes: + #815614). + * debian/control: + + Bump Standards: to 3.9.7. No changes needed. + + Add recent MS Windows releases to LONG_DESCRIPTION (of bin:pkg + freerdp-x11). + + -- Mike Gabriel Wed, 27 Apr 2016 21:35:58 +0200 + +freerdp (1.1.0~git20140921.1.440916e+dfsg1-7) unstable; urgency=medium + + * debian/rules: + + Fix missing backslash in list of configure arguments. (Closes: #815317). + Thanks to Emilio Pozuelo Monfort for spotting this. + + -- Mike Gabriel Sat, 20 Feb 2016 22:41:45 +0100 + +freerdp (1.1.0~git20140921.1.440916e+dfsg1-6) unstable; urgency=medium + + [ Sriram Raghunathan ] + * debian/control: + + Fix typo in control file which is used to show package info. (Closes: + #768855). + + [ Lionel Elie Mamane ] + * Enable URBDRC (USB redirection) channel. (Closes: #788005). + + [ Alex 'AdUser' Z ] + * debian/patches: + + Add 1010_libudev-link.patch. Fix linking against libudev if building + USB redirection channel is enabled. + + [ Mike Gabriel ] + * debian/{control,rules}: + + Drop B-D: libgstreamer-plugins-base0.10-dev. This requires disabling + gstreamer support and is a wanted and temporary regression. With + upcoming freerdp2 upload to Debian, gstreamer1.0 support will be + (re-)introduced. (Closes: #785898). + * debian/control: + + Add B-Ds: libusb-1.0-0-dev, libudev-dev, libdbus-glib-1-dev, uuid-dev. + + Use encrypted URLs for Vcs-*: field. + + Versioned B-D on dpkg-dev (>= 1.16.1.1). + * debian/rules: + + Enable all hardening flags. + * debian/patches: + + Add 0005_release-keys-when-xfreerdp-is-unfocused-to-prevent-s.patch. + Prevent Alt key from getting "stuck" with -grab-keyboard option when + using Alt-Tab to switch between local X windows. Thanks to Petr + Vorel for providing the patch. (Closes: #778650). + + Add 0006_fix-null-cert-that-is-not-an-error.patch. Fix null certificate + that is not an error. Thanks to Nathan Schulte for referencing the + upstream commit. Patch backported by myself to this freerdp Git snapshot. + (Closes: #803891). + + Add 0007_Fix-build-failure-on-x32.patch. Fix FTBFS on x32 architecture. + Thanks to Adam Borowski for providing this patch. (Closes: #808503). + + Add 1012_typo-fix.patch. Fix spelling of the work "occurred". + + [ Andreas Cadhalpun ] + * debian/patches: + + Add 1011_ffmpeg-2.9.patch. Fix FTBFS against ffmpeg-2.9. (Closes: + #803814). + + -- Mike Gabriel Fri, 19 Feb 2016 09:02:00 +0100 freerdp (1.1.0~git20140921.1.440916e+dfsg1-5) unstable; urgency=medium @@ -19,15 +104,6 @@ -- Mike Gabriel Wed, 19 Aug 2015 23:26:17 +0200 -freerdp (1.1.0~git20140921.1.440916e+dfsg1-4ubuntu1) wily; urgency=low - - * Merge with Debian unstable, remaining changes - - Disable ffmpeg support - - Disable gstreamer support, this relies on gstreamer 0.10 and we don't - want to add any more deps on that. - - -- Iain Lane Fri, 15 May 2015 11:09:36 +0100 - freerdp (1.1.0~git20140921.1.440916e+dfsg1-4) unstable; urgency=medium * debian/patches: @@ -54,15 +130,6 @@ -- Mike Gabriel Fri, 13 Feb 2015 05:30:13 +0100 -freerdp (1.1.0~git20140921.1.440916e+dfsg1-2ubuntu1) vivid; urgency=medium - - * Merge with Debian unstable, remaining changes - - Disable ffmpeg support - * Disable gstreamer support, this relies on gstreamer 0.10 and we don't want - to add any more deps on that. - - -- Iain Lane Tue, 11 Nov 2014 12:20:50 +0000 - freerdp (1.1.0~git20140921.1.440916e+dfsg1-2) unstable; urgency=medium * debian/control: === modified file 'debian/control' --- debian/control 2016-07-13 01:22:18 +0000 +++ debian/control 2016-07-13 02:34:22 +0000 @@ -1,7 +1,8 @@ Source: freerdp Section: x11 Priority: optional -Maintainer: Mike Gabriel +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Mike Gabriel Uploaders: Otavio Salvador , Laszlo Boszormenyi (GCS) , @@ -10,6 +11,7 @@ cdbs, autotools-dev, cmake, + dpkg-dev (>= 1.16.1.1), libasound2-dev, libcups2-dev, libpcsclite-dev, @@ -26,11 +28,16 @@ libjpeg-dev, pkg-config, xmlto, - libxi-dev -Standards-Version: 3.9.6 +# libavcodec-dev, + libxi-dev, + libusb-1.0-0-dev [linux-any], + libudev-dev [linux-any], + libdbus-glib-1-dev, + uuid-dev, +Standards-Version: 3.9.7 Homepage: http://www.freerdp.com/ -Vcs-Browser: http://anonscm.debian.org/gitweb?p=collab-maint/freerdp.git -Vcs-Git: git://anonscm.debian.org/collab-maint/freerdp.git +Vcs-Browser: https://anonscm.debian.org/git/collab-maint/freerdp.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/freerdp.git Package: freerdp-x11 Architecture: any @@ -50,8 +57,9 @@ * Windows Vista * Windows 2008/2008r2/2011SBS Server * Windows 7 - * Windows 2012 Server + * Windows 2012/2012r2 Server * Windows 8 + * Windows 10 . This package contains the X11 based client. @@ -554,7 +562,7 @@ used instead of the equivalent WinPR implementation, without having to modify the code using it. . - This package contains the winor-library shared library. + This package contains the winpr-library shared library. Package: libwinpr-path0.1 Architecture: any === added file 'debian/patches/0005_release-keys-when-xfreerdp-is-unfocused-to-prevent-s.patch' --- debian/patches/0005_release-keys-when-xfreerdp-is-unfocused-to-prevent-s.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/0005_release-keys-when-xfreerdp-is-unfocused-to-prevent-s.patch 2016-07-13 02:34:13 +0000 @@ -0,0 +1,42 @@ +>From ffa7f0363fa4f0770d0f1ac451d7a5e87d415d7b Mon Sep 17 00:00:00 2001 +From: Seray Rosh +Date: Fri, 27 Feb 2015 16:02:40 +0100 +Subject: [PATCH] fix #778650: release keys when xfreerdp is unfocused to prevent stuck keys + +This fixes https://bugs.debian.org/778650 +Originated from https://github.com/FreeRDP/FreeRDP/pull/2430 +Cherry picked from upstream commit ffa7f0363fa4f0770d0f1ac451d7a5e87d415d7b, ported for debian/1.1.0~git20140921.1.440916e+dfsg1-5 + +--- + +Signed-off-by: Petr Vorel +--- + client/X11/xf_event.c | 1 + + client/X11/xf_keyboard.c | 6 ++++++ + 2 files changed, 7 insertions(+) + +--- a/client/X11/xf_event.c ++++ b/client/X11/xf_event.c +@@ -456,6 +456,7 @@ + if (event->xfocus.mode == NotifyWhileGrabbed) + XUngrabKeyboard(xfc->display, CurrentTime); + ++ xf_kbd_release_all_keypress(xfc); + xf_kbd_clear(xfc); + + if (app) +--- a/client/X11/xf_keyboard.c ++++ b/client/X11/xf_keyboard.c +@@ -75,6 +75,12 @@ + if (xfc->pressed_keys[keycode] != NoSymbol) + { + rdp_scancode = freerdp_keyboard_get_rdp_scancode_from_x11_keycode(keycode); ++ ++ // release tab before releasing the windows key. ++ // this stops the start menu from opening on unfocus event. ++ if (rdp_scancode == RDP_SCANCODE_LWIN) ++ freerdp_input_send_keyboard_event_ex(xfc->instance->input, FALSE, RDP_SCANCODE_TAB); ++ + freerdp_input_send_keyboard_event_ex(xfc->instance->input, FALSE, rdp_scancode); + xfc->pressed_keys[keycode] = NoSymbol; + } === added file 'debian/patches/0006_fix-null-cert-that-is-not-an-error.patch' --- debian/patches/0006_fix-null-cert-that-is-not-an-error.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/0006_fix-null-cert-that-is-not-an-error.patch 2016-07-13 02:34:13 +0000 @@ -0,0 +1,29 @@ +From 603a6378fffd43a67e14ead860bcf9196be6979e Mon Sep 17 00:00:00 2001 +From: Hardening +Date: Wed, 7 May 2014 16:12:38 +0200 +Subject: [PATCH] Fix null certificate that is not an error + +v2: Backported to 1.1.0~git20140921.1.440916e+dfsg1-5 by Mike Gabriel +--- + libfreerdp/core/certificate.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/libfreerdp/core/certificate.c ++++ b/libfreerdp/core/certificate.c +@@ -568,15 +568,12 @@ + UINT32 dwVersion; + int status = 1; + +- if (length < 1) ++ if (length < 4) + { + DEBUG_CERTIFICATE("null server certificate\n"); + return 0; + } + +- if (length < 4) +- return -1; +- + s = Stream_New(server_cert, length); + + Stream_Read_UINT32(s, dwVersion); /* dwVersion (4 bytes) */ === added file 'debian/patches/0007_Fix-build-failure-on-x32.patch' --- debian/patches/0007_Fix-build-failure-on-x32.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/0007_Fix-build-failure-on-x32.patch 2016-07-13 02:34:13 +0000 @@ -0,0 +1,32 @@ +>From 15d5037df438e60f2c5439184dbe7ea232cbd100 Mon Sep 17 00:00:00 2001 +From: Adam Borowski +Date: Thu, 29 Jan 2015 05:50:12 +0100 +Subject: [PATCH] Fix build failure on x32. + +Unlike i386, x32 can't accept -march=i686 but wants -fPIC, same as amd64 +(both are x86_64 ABIs after all). Thus, check for the __x86_64__ define +instead of pointer width. +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,6 +33,7 @@ + # Include cmake modules + include(CheckIncludeFiles) + include(CheckLibraryExists) ++include(CheckSymbolExists) + include(CheckStructHasMember) + include(CMakeDetermineSystem) + include(FindPkgConfig) +@@ -112,7 +113,8 @@ + # Compiler-specific flags + if(CMAKE_COMPILER_IS_GNUCC) + if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "i686") +- if(CMAKE_SIZEOF_VOID_P EQUAL 8) ++ CHECK_SYMBOL_EXISTS(__x86_64__ "" IS_X86_64) ++ if(IS_X86_64) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") + else() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i686") === added file 'debian/patches/1009_libusb-debug.patch' --- debian/patches/1009_libusb-debug.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/1009_libusb-debug.patch 2016-07-13 02:34:13 +0000 @@ -0,0 +1,14 @@ +Description: fixup libusb subchannel to use libusb_debug, not urbdrc_debug +Author: Lionel Elie Mamane + +--- freerdp-1.1.0~git20140921.1.440916e+dfsg1.orig/channels/urbdrc/client/libusb/libusb_udevman.c ++++ freerdp-1.1.0~git20140921.1.440916e+dfsg1/channels/urbdrc/client/libusb/libusb_udevman.c +@@ -550,7 +550,7 @@ static void urbdrc_udevman_parse_addin_a + + CommandLineSwitchCase(arg, "dbg") + { +- urbdrc_debug = 0; ++ libusb_debug = 0; + } + CommandLineSwitchCase(arg, "dev") + { === added file 'debian/patches/1010_libudev-link.patch' --- debian/patches/1010_libudev-link.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/1010_libudev-link.patch 2016-07-13 02:34:13 +0000 @@ -0,0 +1,13 @@ +Description: Fix linking against UDEV libraries +Author: Alex 'AdUser' Z + +--- a/channels/urbdrc/client/libusb/CMakeLists.txt 2016-01-26 15:25:32.979436442 +1000 ++++ b/channels/urbdrc/client/libusb/CMakeLists.txt 2016-01-26 15:25:45.767436886 +1000 +@@ -39,6 +39,7 @@ + set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} + ${DBUS_GLIB_LIBRARIES} + ${UUID_LIBRARIES} ++ ${UDEV_LIBRARIES} + ${LIBUSB_1_LIBRARIES} + ) + === added file 'debian/patches/1011_ffmpeg-2.9.patch' --- debian/patches/1011_ffmpeg-2.9.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/1011_ffmpeg-2.9.patch 2016-07-13 02:34:13 +0000 @@ -0,0 +1,69 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun +Last-Update: <2015-11-02> + +--- freerdp-1.1.0~git20140921.1.440916e+dfsg1.orig/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c ++++ freerdp-1.1.0~git20140921.1.440916e+dfsg1/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +@@ -107,7 +107,7 @@ static BOOL tsmf_ffmpeg_init_video_strea + mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator; + mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator; + +- mdecoder->frame = avcodec_alloc_frame(); ++ mdecoder->frame = av_frame_alloc(); + + return TRUE; + } +@@ -342,7 +342,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS + mdecoder->codec_context->width, mdecoder->codec_context->height); + mdecoder->decoded_data = malloc(mdecoder->decoded_size); + ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size); +- frame = avcodec_alloc_frame(); ++ frame = av_frame_alloc(); + avpicture_fill((AVPicture*) frame, mdecoder->decoded_data, + mdecoder->codec_context->pix_fmt, + mdecoder->codec_context->width, mdecoder->codec_context->height); +@@ -351,7 +351,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS + mdecoder->codec_context->pix_fmt, + mdecoder->codec_context->width, mdecoder->codec_context->height); + +- av_free(frame); ++ av_frame_free(&frame); + } + + return ret; +@@ -412,7 +412,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS + (int16_t*) dst, &frame_size, src, src_size); + #else + { +- AVFrame* decoded_frame = avcodec_alloc_frame(); ++ AVFrame* decoded_frame = av_frame_alloc(); + int got_frame = 0; + AVPacket pkt; + av_init_packet(&pkt); +@@ -427,7 +427,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS + memcpy(dst, decoded_frame->data[0], frame_size); + } + +- av_free(decoded_frame); ++ av_frame_free(&decoded_frame); + } + #endif + if (len <= 0 || frame_size <= 0) +@@ -501,7 +501,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_fo + + switch (mdecoder->codec_context->pix_fmt) + { +- case PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUV420P: + return RDP_PIXFMT_I420; + + default: +@@ -532,7 +532,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode + TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; + + if (mdecoder->frame) +- av_free(mdecoder->frame); ++ av_frame_free(&mdecoder->frame); + + if (mdecoder->decoded_data) + free(mdecoder->decoded_data); === added file 'debian/patches/1012_typo-fix.patch' --- debian/patches/1012_typo-fix.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/1012_typo-fix.patch 2016-07-13 02:34:13 +0000 @@ -0,0 +1,14 @@ +Description: Fix spelling of "occurred" in an error msg." +Author: Mike Gabriel + +--- a/channels/urbdrc/client/urbdrc_main.c ++++ b/channels/urbdrc/client/urbdrc_main.c +@@ -648,7 +648,7 @@ + } + else + { +- fprintf(stderr, "No Device from receive_device(). An error occured.\n"); ++ fprintf(stderr, "No Device from receive_device(). An error occurred.\n"); + } + } + } === modified file 'debian/patches/series' --- debian/patches/series 2016-07-13 01:22:18 +0000 +++ debian/patches/series 2016-07-13 02:34:13 +0000 @@ -6,8 +6,15 @@ 1006_test-unicode-endianess.patch 1007_detect-arm-arch-correctly.patch 1008_gcc-fPIC-on-arm64.patch +1009_libusb-debug.patch 2001_detect-ffmpeg-on-Debian.patch 0001_fix-cmdline-parser.patch 0002_handle-old-style-cmdline-options.patch 0003_copy-data-when-adding-glyph-to-cache.patch 0004_build-cmake-3.1-compatibility.patch +1010_libudev-link.patch +1011_ffmpeg-2.9.patch +0005_release-keys-when-xfreerdp-is-unfocused-to-prevent-s.patch +0006_fix-null-cert-that-is-not-an-error.patch +0007_Fix-build-failure-on-x32.patch +1012_typo-fix.patch === modified file 'debian/rules' --- debian/rules 2016-07-13 01:22:18 +0000 +++ debian/rules 2016-07-13 02:34:13 +0000 @@ -1,9 +1,8 @@ #!/usr/bin/make -f -export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk NULL = @@ -14,13 +13,20 @@ ARM_FLOAT_ABI = endif +DEB_HOST_ARCH_OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS))) +LINUX_URBDRC_CLIENT = -DCHANNEL_URBDRC_CLIENT=on +else +LINUX_URBDRC_CLIENT = -DCHANNEL_URBDRC_CLIENT=off +endif + include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/utils.mk DEB_DH_INSTALL_ARGS += --fail-missing -DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) \ +DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) \ -DCMAKE_SKIP_RPATH=FALSE \ -DCMAKE_SKIP_INSTALL_RPATH=TRUE \ -DBUILD_TESTING=ON \ @@ -33,6 +39,7 @@ -DWITH_CUPS=on \ -DWITH_PCSC=on \ -DWITH_JPEG=on \ + $(LINUX_URBDRC_CLIENT) \ $(ARM_FLOAT_ABI) \ $(NULL) @@ -92,8 +99,8 @@ DEB_DH_STRIP_ARGS_libxfreerdp-client1.1 = --dbg-package=libxfreerdp-client-dbg remove-cruft:: - rm -f debian/tmp/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/libwinpr-makecert-tool.a - rm -f debian/tmp/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/freerdp/cliprdr-client.a + rm -f debian/tmp/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/libwinpr-makecert-tool.a + rm -f debian/tmp/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/freerdp/cliprdr-client.a tweak-install:: @echo "Nothing to tweak after installation."