summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2018-08-19 10:52:33 +0200
committerMichał Górny <mgorny@gentoo.org>2018-08-19 10:56:20 +0200
commit7630c0b73d7d50d7e39e2504662bf8f7023721d3 (patch)
tree48b6a2bc1f90b0074e0538834a84ac638948d047
parentmedia-sound/neroaac: Remove last-rited pkg (diff)
downloadgentoo-7630c0b73d7d50d7e39e2504662bf8f7023721d3.tar.gz
gentoo-7630c0b73d7d50d7e39e2504662bf8f7023721d3.tar.bz2
gentoo-7630c0b73d7d50d7e39e2504662bf8f7023721d3.zip
net-misc/guacamole-server: Remove last-rited pkg
Closes: https://bugs.gentoo.org/608540
-rw-r--r--net-misc/guacamole-server/Manifest1
-rw-r--r--net-misc/guacamole-server/files/guacamole-server-0.9.9-clipboard-id-update.patch104
-rw-r--r--net-misc/guacamole-server/files/guacamole-server-0.9.9-glyph-order.patch24
-rw-r--r--net-misc/guacamole-server/files/guacd23
-rw-r--r--net-misc/guacamole-server/files/guacd.service11
-rw-r--r--net-misc/guacamole-server/guacamole-server-0.9.9-r1.ebuild70
-rw-r--r--net-misc/guacamole-server/metadata.xml18
-rw-r--r--profiles/package.mask1
8 files changed, 0 insertions, 252 deletions
diff --git a/net-misc/guacamole-server/Manifest b/net-misc/guacamole-server/Manifest
deleted file mode 100644
index 6c3e68e110ca..000000000000
--- a/net-misc/guacamole-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST guacamole-server-0.9.9.tar.gz 679635 BLAKE2B e870a68f19d5946bc6df53160db95986c80d64176838084cf0626b24258585260c7b9f61a31a51815d98a1b99e3e4185bd6e4cd19e6c983f93d54915420c7d97 SHA512 bdc004c45e63bb2c692c1dfd280840ea682e461b2c578da511247cd36d727ffa22c3fdde22b3635ef6ac7e35a1b5e63f5971bdbb4d227f88d1b81ff035bd5f83
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
deleted file mode 100644
index 4191479f34d8..000000000000
--- a/net-misc/guacamole-server/files/guacamole-server-0.9.9-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; i<event->num_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/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
deleted file mode 100644
index 70bba86d9000..000000000000
--- a/net-misc/guacamole-server/files/guacamole-server-0.9.9-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/net-misc/guacamole-server/files/guacd b/net-misc/guacamole-server/files/guacd
deleted file mode 100644
index 64aa93fd0678..000000000000
--- a/net-misc/guacamole-server/files/guacd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON="/usr/sbin/guacd"
-PIDFILE="/run/guacd/guacd"
-
-depend() {
- use net
-}
-
-start() {
- checkpath -q -d -m 0755 -o guacd:guacd /run/guacd/
- ebegin "Starting guacd"
- start-stop-daemon --start --user guacd:guacd --exec "${DAEMON}" -- -p "${PIDFILE}"
- eend $? "Failed to start guacd"
-}
-
-stop() {
- ebegin "Stopping guacd"
- start-stop-daemon --stop --pidfile "${PIDFILE}"
- eend $? "Failed to stop guacd"
-}
diff --git a/net-misc/guacamole-server/files/guacd.service b/net-misc/guacamole-server/files/guacd.service
deleted file mode 100644
index 547dc030259d..000000000000
--- a/net-misc/guacamole-server/files/guacd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Guacamole proxy daemon
-Documentation=man:guacd(8)
-
-[Service]
-ExecStart=/usr/sbin/guacd -f
-StandardOutput=null
-User=guacd
-
-[Install]
-WantedBy=multi-user.target
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
deleted file mode 100644
index 60d3b04ba27e..000000000000
--- a/net-misc/guacamole-server/guacamole-server-0.9.9-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-DESCRIPTION="This is the proxy-daemon used by www-apps/guacamole"
-
-HOMEPAGE="http://guac-dev.org/"
-SRC_URI="mirror://sourceforge/guacamole/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="multilib pulseaudio rdp ssh ssl telnet vnc vorbis"
-REQUIRED_USE="multilib? ( ssl )"
-
-RDEPEND="
- x11-libs/cairo
- media-libs/libpng:0=
- virtual/jpeg:0
- dev-libs/ossp-uuid
- rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20150312:= )
- ssh? (
- x11-libs/pango
- net-libs/libssh2 )
- telnet? (
- net-libs/libtelnet
- x11-libs/pango )
- vnc? (
- net-libs/libvncserver[threads]
- pulseaudio? ( media-sound/pulseaudio ) )
- ssl? ( dev-libs/openssl:0= )
- vorbis? ( media-libs/libvorbis )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- # From Fedora for compat with newer freerdp
- "${FILESDIR}"/${P}-glyph-order.patch
- "${FILESDIR}"/${P}-clipboard-id-update.patch
-)
-
-src_configure() {
- local myconf="--without-terminal --without-pango"
-
- if use ssh || use telnet; then
- myconf="--with-terminal --with-pango"
- fi
-
- econf ${myconf} \
- $(use_with ssh) \
- $(use_with rdp) \
- $(use_with vnc) \
- $(use_with pulseaudio pulse) \
- $(use_with vorbis) \
- $(use_with telnet) \
- $(use_with ssl)
-}
-
-src_install() {
- default
- doinitd "${FILESDIR}/guacd"
- systemd_dounit "${FILESDIR}/guacd.service"
-}
-
-pkg_postinst() {
- enewgroup guacd
- enewuser guacd -1 -1 -1 guacd
-}
diff --git a/net-misc/guacamole-server/metadata.xml b/net-misc/guacamole-server/metadata.xml
deleted file mode 100644
index 4d42c6188d3d..000000000000
--- a/net-misc/guacamole-server/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>nativemad@gentoo.org</email>
- <name>Andreas Schuerch</name>
- </maintainer>
- <longdescription>
- This is the proxy-daemon for vnc, ssh and rdp connections used by www-apps/guacamole.
- </longdescription>
- <use>
- <flag name="ssh">enable support for ssh connections</flag>
- <flag name="telnet">enable support for telnet connections</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">guacamole</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 42472d5b4393..0508903578ee 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -170,7 +170,6 @@ dev-python/wxpython:2.8
# Andreas Schuerch <nativemad@gentoo.org> (10 Jul 2018)
# Packages have open bugs and mayor component is not working since years
# Removal in 30 days. Bug 608540
-net-misc/guacamole-server
www-apps/guacamole
# Brian Dolbec <dolsen@gentoo.org> (4 July 2018)