Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/guacamole-server/files/, net-misc/guacamole-server/, profiles/
Date: Sun, 19 Aug 2018 08:56:47
Message-Id: 1534668980.7630c0b73d7d50d7e39e2504662bf8f7023721d3.mgorny@gentoo
1 commit: 7630c0b73d7d50d7e39e2504662bf8f7023721d3
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 19 08:52:33 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 19 08:56:20 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7630c0b7
7
8 net-misc/guacamole-server: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/608540
11
12 net-misc/guacamole-server/Manifest | 1 -
13 ...uacamole-server-0.9.9-clipboard-id-update.patch | 104 ---------------------
14 .../files/guacamole-server-0.9.9-glyph-order.patch | 24 -----
15 net-misc/guacamole-server/files/guacd | 23 -----
16 net-misc/guacamole-server/files/guacd.service | 11 ---
17 .../guacamole-server-0.9.9-r1.ebuild | 70 --------------
18 net-misc/guacamole-server/metadata.xml | 18 ----
19 profiles/package.mask | 1 -
20 8 files changed, 252 deletions(-)
21
22 diff --git a/net-misc/guacamole-server/Manifest b/net-misc/guacamole-server/Manifest
23 deleted file mode 100644
24 index 6c3e68e110c..00000000000
25 --- a/net-misc/guacamole-server/Manifest
26 +++ /dev/null
27 @@ -1 +0,0 @@
28 -DIST guacamole-server-0.9.9.tar.gz 679635 BLAKE2B e870a68f19d5946bc6df53160db95986c80d64176838084cf0626b24258585260c7b9f61a31a51815d98a1b99e3e4185bd6e4cd19e6c983f93d54915420c7d97 SHA512 bdc004c45e63bb2c692c1dfd280840ea682e461b2c578da511247cd36d727ffa22c3fdde22b3635ef6ac7e35a1b5e63f5971bdbb4d227f88d1b81ff035bd5f83
29
30 diff --git a/net-misc/guacamole-server/files/guacamole-server-0.9.9-clipboard-id-update.patch b/net-misc/guacamole-server/files/guacamole-server-0.9.9-clipboard-id-update.patch
31 deleted file mode 100644
32 index 4191479f34d..00000000000
33 --- a/net-misc/guacamole-server/files/guacamole-server-0.9.9-clipboard-id-update.patch
34 +++ /dev/null
35 @@ -1,104 +0,0 @@
36 ---- guacamole-server-0.9.5/src/protocols/rdp/rdp_cliprdr.c.orig 2015-03-17 12:39:58.316549546 +0000
37 -+++ guacamole-server-0.9.5/src/protocols/rdp/rdp_cliprdr.c 2015-03-17 12:40:57.059229957 +0000
38 -@@ -104,8 +104,8 @@ void guac_rdp_process_cb_monitor_ready(g
39 -
40 - /* Respond with supported format list */
41 - format_list->formats = (UINT32*) malloc(sizeof(UINT32)*2);
42 -- format_list->formats[0] = CB_FORMAT_TEXT;
43 -- format_list->formats[1] = CB_FORMAT_UNICODETEXT;
44 -+ format_list->formats[0] = CF_TEXT;
45 -+ format_list->formats[1] = CF_UNICODETEXT;
46 - format_list->num_formats = 2;
47 -
48 - freerdp_channels_send_event(channels, (wMessage*) format_list);
49 -@@ -147,22 +147,22 @@ void guac_rdp_process_cb_format_list(gua
50 - for (i=0; i<event->num_formats; i++) {
51 -
52 - /* If plain text available, request it */
53 -- if (event->formats[i] == CB_FORMAT_TEXT)
54 -+ if (event->formats[i] == CF_TEXT)
55 - formats |= GUAC_RDP_CLIPBOARD_FORMAT_CP1252;
56 -- else if (event->formats[i] == CB_FORMAT_UNICODETEXT)
57 -+ else if (event->formats[i] == CF_UNICODETEXT)
58 - formats |= GUAC_RDP_CLIPBOARD_FORMAT_UTF16;
59 -
60 - }
61 -
62 - /* Prefer Unicode to plain text */
63 - if (formats & GUAC_RDP_CLIPBOARD_FORMAT_UTF16) {
64 -- __guac_rdp_cb_request_format(client, CB_FORMAT_UNICODETEXT);
65 -+ __guac_rdp_cb_request_format(client, CF_UNICODETEXT);
66 - return;
67 - }
68 -
69 - /* Use plain text if Unicode unavailable */
70 - if (formats & GUAC_RDP_CLIPBOARD_FORMAT_CP1252) {
71 -- __guac_rdp_cb_request_format(client, CB_FORMAT_TEXT);
72 -+ __guac_rdp_cb_request_format(client, CF_TEXT);
73 - return;
74 - }
75 -
76 -@@ -186,11 +186,11 @@ void guac_rdp_process_cb_data_request(gu
77 - /* Determine output encoding */
78 - switch (event->format) {
79 -
80 -- case CB_FORMAT_TEXT:
81 -+ case CF_TEXT:
82 - writer = GUAC_WRITE_CP1252;
83 - break;
84 -
85 -- case CB_FORMAT_UNICODETEXT:
86 -+ case CF_UNICODETEXT:
87 - writer = GUAC_WRITE_UTF16;
88 - break;
89 -
90 -@@ -232,12 +232,12 @@ void guac_rdp_process_cb_data_response(g
91 - switch (client_data->requested_clipboard_format) {
92 -
93 - /* Non-Unicode */
94 -- case CB_FORMAT_TEXT:
95 -+ case CF_TEXT:
96 - reader = GUAC_READ_CP1252;
97 - break;
98 -
99 - /* Unicode (UTF-16) */
100 -- case CB_FORMAT_UNICODETEXT:
101 -+ case CF_UNICODETEXT:
102 - reader = GUAC_READ_UTF16;
103 - break;
104 -
105 ---- guacamole-server-0.9.5/src/protocols/rdp/client.c.orig 2015-03-17 12:40:07.079651048 +0000
106 -+++ guacamole-server-0.9.5/src/protocols/rdp/client.c 2015-03-17 12:40:57.064230015 +0000
107 -@@ -722,7 +722,7 @@ int guac_client_init(guac_client* client
108 - guac_client_data->rdp_inst = rdp_inst;
109 - guac_client_data->mouse_button_mask = 0;
110 - guac_client_data->clipboard = guac_common_clipboard_alloc(GUAC_RDP_CLIPBOARD_MAX_LENGTH);
111 -- guac_client_data->requested_clipboard_format = CB_FORMAT_TEXT;
112 -+ guac_client_data->requested_clipboard_format = CF_TEXT;
113 - guac_client_data->audio = NULL;
114 - guac_client_data->filesystem = NULL;
115 - guac_client_data->available_svc = guac_common_list_alloc();
116 ---- guacamole-server-0.9.5/src/protocols/rdp/rdp_stream.c.orig 2015-03-17 12:40:13.952730659 +0000
117 -+++ guacamole-server-0.9.5/src/protocols/rdp/rdp_stream.c 2015-03-17 12:40:57.066230038 +0000
118 -@@ -289,8 +289,8 @@ int guac_rdp_clipboard_end_handler(guac_
119 -
120 - /* Notify server that text data is now available */
121 - format_list->formats = (UINT32*) malloc(sizeof(UINT32));
122 -- format_list->formats[0] = CB_FORMAT_TEXT;
123 -- format_list->formats[1] = CB_FORMAT_UNICODETEXT;
124 -+ format_list->formats[0] = CF_TEXT;
125 -+ format_list->formats[1] = CF_UNICODETEXT;
126 - format_list->num_formats = 2;
127 -
128 - freerdp_channels_send_event(channels, (wMessage*) format_list);
129 ---- guacamole-server-0.9.5/src/protocols/rdp/client.h.orig 2015-03-17 12:40:22.535830076 +0000
130 -+++ guacamole-server-0.9.5/src/protocols/rdp/client.h 2015-03-17 12:40:57.067230050 +0000
131 -@@ -143,7 +143,7 @@ typedef struct rdp_guac_client_data {
132 - * The format of the clipboard which was requested. Data received from
133 - * the RDP server should conform to this format. This will be one of
134 - * several legal clipboard format values defined within FreeRDP, such as
135 -- * CB_FORMAT_TEXT.
136 -+ * CF_TEXT.
137 - */
138 - int requested_clipboard_format;
139 -
140
141 diff --git a/net-misc/guacamole-server/files/guacamole-server-0.9.9-glyph-order.patch b/net-misc/guacamole-server/files/guacamole-server-0.9.9-glyph-order.patch
142 deleted file mode 100644
143 index 70bba86d900..00000000000
144 --- a/net-misc/guacamole-server/files/guacamole-server-0.9.9-glyph-order.patch
145 +++ /dev/null
146 @@ -1,24 +0,0 @@
147 ---- guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.c~ 2015-02-04 05:58:22.000000000 +0000
148 -+++ guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.c 2015-03-17 14:04:45.549617112 +0000
149 -@@ -126,7 +126,8 @@ void guac_rdp_glyph_free(rdpContext* con
150 - }
151 -
152 - void guac_rdp_glyph_begindraw(rdpContext* context,
153 -- int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor) {
154 -+ int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor,
155 -+ BOOL fOpRedundant) {
156 -
157 - guac_client* client = ((rdp_freerdp_context*) context)->client;
158 - rdp_guac_client_data* guac_client_data =
159 ---- guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.h~ 2015-02-04 05:58:22.000000000 +0000
160 -+++ guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.h 2015-03-17 14:05:27.929142981 +0000
161 -@@ -53,7 +53,8 @@ void guac_rdp_glyph_new(rdpContext* cont
162 - void guac_rdp_glyph_draw(rdpContext* context, rdpGlyph* glyph, int x, int y);
163 - void guac_rdp_glyph_free(rdpContext* context, rdpGlyph* glyph);
164 - void guac_rdp_glyph_begindraw(rdpContext* context,
165 -- int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor);
166 -+ int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor,
167 -+ BOOL fOpRedundant);
168 - void guac_rdp_glyph_enddraw(rdpContext* context,
169 - int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor);
170 -
171
172 diff --git a/net-misc/guacamole-server/files/guacd b/net-misc/guacamole-server/files/guacd
173 deleted file mode 100644
174 index 64aa93fd067..00000000000
175 --- a/net-misc/guacamole-server/files/guacd
176 +++ /dev/null
177 @@ -1,23 +0,0 @@
178 -#!/sbin/openrc-run
179 -# Copyright 1999-2015 Gentoo Foundation
180 -# Distributed under the terms of the GNU General Public License v2
181 -
182 -DAEMON="/usr/sbin/guacd"
183 -PIDFILE="/run/guacd/guacd"
184 -
185 -depend() {
186 - use net
187 -}
188 -
189 -start() {
190 - checkpath -q -d -m 0755 -o guacd:guacd /run/guacd/
191 - ebegin "Starting guacd"
192 - start-stop-daemon --start --user guacd:guacd --exec "${DAEMON}" -- -p "${PIDFILE}"
193 - eend $? "Failed to start guacd"
194 -}
195 -
196 -stop() {
197 - ebegin "Stopping guacd"
198 - start-stop-daemon --stop --pidfile "${PIDFILE}"
199 - eend $? "Failed to stop guacd"
200 -}
201
202 diff --git a/net-misc/guacamole-server/files/guacd.service b/net-misc/guacamole-server/files/guacd.service
203 deleted file mode 100644
204 index 547dc030259..00000000000
205 --- a/net-misc/guacamole-server/files/guacd.service
206 +++ /dev/null
207 @@ -1,11 +0,0 @@
208 -[Unit]
209 -Description=Guacamole proxy daemon
210 -Documentation=man:guacd(8)
211 -
212 -[Service]
213 -ExecStart=/usr/sbin/guacd -f
214 -StandardOutput=null
215 -User=guacd
216 -
217 -[Install]
218 -WantedBy=multi-user.target
219
220 diff --git a/net-misc/guacamole-server/guacamole-server-0.9.9-r1.ebuild b/net-misc/guacamole-server/guacamole-server-0.9.9-r1.ebuild
221 deleted file mode 100644
222 index 60d3b04ba27..00000000000
223 --- a/net-misc/guacamole-server/guacamole-server-0.9.9-r1.ebuild
224 +++ /dev/null
225 @@ -1,70 +0,0 @@
226 -# Copyright 1999-2017 Gentoo Foundation
227 -# Distributed under the terms of the GNU General Public License v2
228 -
229 -EAPI=6
230 -inherit systemd user
231 -
232 -DESCRIPTION="This is the proxy-daemon used by www-apps/guacamole"
233 -
234 -HOMEPAGE="http://guac-dev.org/"
235 -SRC_URI="mirror://sourceforge/guacamole/${P}.tar.gz"
236 -LICENSE="MIT"
237 -SLOT="0"
238 -KEYWORDS="~amd64 ~x86"
239 -
240 -IUSE="multilib pulseaudio rdp ssh ssl telnet vnc vorbis"
241 -REQUIRED_USE="multilib? ( ssl )"
242 -
243 -RDEPEND="
244 - x11-libs/cairo
245 - media-libs/libpng:0=
246 - virtual/jpeg:0
247 - dev-libs/ossp-uuid
248 - rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20150312:= )
249 - ssh? (
250 - x11-libs/pango
251 - net-libs/libssh2 )
252 - telnet? (
253 - net-libs/libtelnet
254 - x11-libs/pango )
255 - vnc? (
256 - net-libs/libvncserver[threads]
257 - pulseaudio? ( media-sound/pulseaudio ) )
258 - ssl? ( dev-libs/openssl:0= )
259 - vorbis? ( media-libs/libvorbis )
260 -"
261 -DEPEND="${RDEPEND}"
262 -
263 -PATCHES=(
264 - # From Fedora for compat with newer freerdp
265 - "${FILESDIR}"/${P}-glyph-order.patch
266 - "${FILESDIR}"/${P}-clipboard-id-update.patch
267 -)
268 -
269 -src_configure() {
270 - local myconf="--without-terminal --without-pango"
271 -
272 - if use ssh || use telnet; then
273 - myconf="--with-terminal --with-pango"
274 - fi
275 -
276 - econf ${myconf} \
277 - $(use_with ssh) \
278 - $(use_with rdp) \
279 - $(use_with vnc) \
280 - $(use_with pulseaudio pulse) \
281 - $(use_with vorbis) \
282 - $(use_with telnet) \
283 - $(use_with ssl)
284 -}
285 -
286 -src_install() {
287 - default
288 - doinitd "${FILESDIR}/guacd"
289 - systemd_dounit "${FILESDIR}/guacd.service"
290 -}
291 -
292 -pkg_postinst() {
293 - enewgroup guacd
294 - enewuser guacd -1 -1 -1 guacd
295 -}
296
297 diff --git a/net-misc/guacamole-server/metadata.xml b/net-misc/guacamole-server/metadata.xml
298 deleted file mode 100644
299 index 4d42c6188d3..00000000000
300 --- a/net-misc/guacamole-server/metadata.xml
301 +++ /dev/null
302 @@ -1,18 +0,0 @@
303 -<?xml version="1.0" encoding="UTF-8"?>
304 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
305 -<pkgmetadata>
306 - <maintainer type="person">
307 - <email>nativemad@g.o</email>
308 - <name>Andreas Schuerch</name>
309 - </maintainer>
310 - <longdescription>
311 - This is the proxy-daemon for vnc, ssh and rdp connections used by www-apps/guacamole.
312 - </longdescription>
313 - <use>
314 - <flag name="ssh">enable support for ssh connections</flag>
315 - <flag name="telnet">enable support for telnet connections</flag>
316 - </use>
317 - <upstream>
318 - <remote-id type="sourceforge">guacamole</remote-id>
319 - </upstream>
320 -</pkgmetadata>
321
322 diff --git a/profiles/package.mask b/profiles/package.mask
323 index 42472d5b439..0508903578e 100644
324 --- a/profiles/package.mask
325 +++ b/profiles/package.mask
326 @@ -170,7 +170,6 @@ dev-python/wxpython:2.8
327 # Andreas Schuerch <nativemad@g.o> (10 Jul 2018)
328 # Packages have open bugs and mayor component is not working since years
329 # Removal in 30 days. Bug 608540
330 -net-misc/guacamole-server
331 www-apps/guacamole
332
333 # Brian Dolbec <dolsen@g.o> (4 July 2018)
Report Message
Find on MARC Find on Google Groups