From 64c24e59e3209e3bc7378cb23533a2405b013a8c Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Jan 09 2017 17:58:01 +0000 Subject: Update to 0.9.10 --- diff --git a/guacamole-server-0.9.5-clipboard-id-update.patch b/guacamole-server-0.9.5-clipboard-id-update.patch deleted file mode 100644 index 4191479..0000000 --- a/guacamole-server-0.9.5-clipboard-id-update.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- guacamole-server-0.9.5/src/protocols/rdp/rdp_cliprdr.c.orig 2015-03-17 12:39:58.316549546 +0000 -+++ guacamole-server-0.9.5/src/protocols/rdp/rdp_cliprdr.c 2015-03-17 12:40:57.059229957 +0000 -@@ -104,8 +104,8 @@ void guac_rdp_process_cb_monitor_ready(g - - /* Respond with supported format list */ - format_list->formats = (UINT32*) malloc(sizeof(UINT32)*2); -- format_list->formats[0] = CB_FORMAT_TEXT; -- format_list->formats[1] = CB_FORMAT_UNICODETEXT; -+ format_list->formats[0] = CF_TEXT; -+ format_list->formats[1] = CF_UNICODETEXT; - format_list->num_formats = 2; - - freerdp_channels_send_event(channels, (wMessage*) format_list); -@@ -147,22 +147,22 @@ void guac_rdp_process_cb_format_list(gua - for (i=0; inum_formats; i++) { - - /* If plain text available, request it */ -- if (event->formats[i] == CB_FORMAT_TEXT) -+ if (event->formats[i] == CF_TEXT) - formats |= GUAC_RDP_CLIPBOARD_FORMAT_CP1252; -- else if (event->formats[i] == CB_FORMAT_UNICODETEXT) -+ else if (event->formats[i] == CF_UNICODETEXT) - formats |= GUAC_RDP_CLIPBOARD_FORMAT_UTF16; - - } - - /* Prefer Unicode to plain text */ - if (formats & GUAC_RDP_CLIPBOARD_FORMAT_UTF16) { -- __guac_rdp_cb_request_format(client, CB_FORMAT_UNICODETEXT); -+ __guac_rdp_cb_request_format(client, CF_UNICODETEXT); - return; - } - - /* Use plain text if Unicode unavailable */ - if (formats & GUAC_RDP_CLIPBOARD_FORMAT_CP1252) { -- __guac_rdp_cb_request_format(client, CB_FORMAT_TEXT); -+ __guac_rdp_cb_request_format(client, CF_TEXT); - return; - } - -@@ -186,11 +186,11 @@ void guac_rdp_process_cb_data_request(gu - /* Determine output encoding */ - switch (event->format) { - -- case CB_FORMAT_TEXT: -+ case CF_TEXT: - writer = GUAC_WRITE_CP1252; - break; - -- case CB_FORMAT_UNICODETEXT: -+ case CF_UNICODETEXT: - writer = GUAC_WRITE_UTF16; - break; - -@@ -232,12 +232,12 @@ void guac_rdp_process_cb_data_response(g - switch (client_data->requested_clipboard_format) { - - /* Non-Unicode */ -- case CB_FORMAT_TEXT: -+ case CF_TEXT: - reader = GUAC_READ_CP1252; - break; - - /* Unicode (UTF-16) */ -- case CB_FORMAT_UNICODETEXT: -+ case CF_UNICODETEXT: - reader = GUAC_READ_UTF16; - break; - ---- guacamole-server-0.9.5/src/protocols/rdp/client.c.orig 2015-03-17 12:40:07.079651048 +0000 -+++ guacamole-server-0.9.5/src/protocols/rdp/client.c 2015-03-17 12:40:57.064230015 +0000 -@@ -722,7 +722,7 @@ int guac_client_init(guac_client* client - guac_client_data->rdp_inst = rdp_inst; - guac_client_data->mouse_button_mask = 0; - guac_client_data->clipboard = guac_common_clipboard_alloc(GUAC_RDP_CLIPBOARD_MAX_LENGTH); -- guac_client_data->requested_clipboard_format = CB_FORMAT_TEXT; -+ guac_client_data->requested_clipboard_format = CF_TEXT; - guac_client_data->audio = NULL; - guac_client_data->filesystem = NULL; - guac_client_data->available_svc = guac_common_list_alloc(); ---- guacamole-server-0.9.5/src/protocols/rdp/rdp_stream.c.orig 2015-03-17 12:40:13.952730659 +0000 -+++ guacamole-server-0.9.5/src/protocols/rdp/rdp_stream.c 2015-03-17 12:40:57.066230038 +0000 -@@ -289,8 +289,8 @@ int guac_rdp_clipboard_end_handler(guac_ - - /* Notify server that text data is now available */ - format_list->formats = (UINT32*) malloc(sizeof(UINT32)); -- format_list->formats[0] = CB_FORMAT_TEXT; -- format_list->formats[1] = CB_FORMAT_UNICODETEXT; -+ format_list->formats[0] = CF_TEXT; -+ format_list->formats[1] = CF_UNICODETEXT; - format_list->num_formats = 2; - - freerdp_channels_send_event(channels, (wMessage*) format_list); ---- guacamole-server-0.9.5/src/protocols/rdp/client.h.orig 2015-03-17 12:40:22.535830076 +0000 -+++ guacamole-server-0.9.5/src/protocols/rdp/client.h 2015-03-17 12:40:57.067230050 +0000 -@@ -143,7 +143,7 @@ typedef struct rdp_guac_client_data { - * The format of the clipboard which was requested. Data received from - * the RDP server should conform to this format. This will be one of - * several legal clipboard format values defined within FreeRDP, such as -- * CB_FORMAT_TEXT. -+ * CF_TEXT. - */ - int requested_clipboard_format; - diff --git a/guacamole-server-0.9.5-glyph-order.patch b/guacamole-server-0.9.5-glyph-order.patch deleted file mode 100644 index 70bba86..0000000 --- a/guacamole-server-0.9.5-glyph-order.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.c~ 2015-02-04 05:58:22.000000000 +0000 -+++ guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.c 2015-03-17 14:04:45.549617112 +0000 -@@ -126,7 +126,8 @@ void guac_rdp_glyph_free(rdpContext* con - } - - void guac_rdp_glyph_begindraw(rdpContext* context, -- int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor) { -+ int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor, -+ BOOL fOpRedundant) { - - guac_client* client = ((rdp_freerdp_context*) context)->client; - rdp_guac_client_data* guac_client_data = ---- guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.h~ 2015-02-04 05:58:22.000000000 +0000 -+++ guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.h 2015-03-17 14:05:27.929142981 +0000 -@@ -53,7 +53,8 @@ void guac_rdp_glyph_new(rdpContext* cont - void guac_rdp_glyph_draw(rdpContext* context, rdpGlyph* glyph, int x, int y); - void guac_rdp_glyph_free(rdpContext* context, rdpGlyph* glyph); - void guac_rdp_glyph_begindraw(rdpContext* context, -- int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor); -+ int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor, -+ BOOL fOpRedundant); - void guac_rdp_glyph_enddraw(rdpContext* context, - int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor); - diff --git a/guacamole-server.spec b/guacamole-server.spec index 4eb7a84..37a854b 100644 --- a/guacamole-server.spec +++ b/guacamole-server.spec @@ -1,17 +1,15 @@ %global _hardened_build 1 %global username guacd -#global _with_freerdp 1 +%global _with_freerdp 1 Name: guacamole-server -Version: 0.9.9 -Release: 2%{?dist} +Version: 0.9.10 +Release: 1%{?dist} Summary: Server-side native components that form the Guacamole proxy License: MPLv1.1 or GPLv2+ URL: http://guac-dev.org/ -Source0: http://downloads.sourceforge.net/guacamole/%{name}-%{version}.tar.gz -Patch1: guacamole-server-0.9.5-clipboard-id-update.patch -Patch2: guacamole-server-0.9.5-glyph-order.patch +Source0: https://github.com/apache/incubator-%{name}/archive/%{version}-incubating.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.sysconfig Source2: %{name}.service Source3: %{name}.init @@ -22,7 +20,7 @@ BuildRequires: doxygen BuildRequires: libjpeg-devel BuildRequires: libtool BuildRequires: pkgconfig(cairo) -%{?_with_freerdp:BuildRequires: pkgconfig(freerdp) >= 1.0.2} +%{?_with_freerdp:BuildRequires: pkgconfig(freerdp2)} BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpulse) @@ -68,7 +66,7 @@ Requires: libguac%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} The libguac-devel package contains libraries and header files for developing applications that use %{name}. -%{?_with_freerdp +%{?_with_freerdp: %package -n libguac-client-rdp Summary: RDP support for guacd Requires: libguac%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -127,9 +125,7 @@ guacd is the Guacamole proxy daemon used by the Guacamole web application and framework to translate between arbitrary protocols and the Guacamole protocol. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 +%setup -q -n incubator-%{name}-%{version}-incubating %build export CFLAGS="%{optflags} -Wno-error=pedantic" @@ -271,6 +267,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/guacd %changelog +* Mon Jan 09 2017 Simone Caronni - 0.9.10-1 +- Update to 0.9.10. + * Sun Oct 09 2016 Simone Caronni - 0.9.9-2 - Restore Epoch on all requirements; make it more flexible for rebases.