commit: 24492876545e0acf680e214f8547a2e739f89a9e Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Thu May 11 04:36:38 2017 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Thu May 11 04:37:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24492876
app-emulation/spice: drop versions 0.12.8, 0.13.1, 0.13.2 Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-emulation/spice/Manifest | 3 - .../spice/files/0.12.8-upstream-fix.patch | 36 ------- .../spice/files/0.13.1-CVE-2016-0749-p1.patch | 56 ----------- .../spice/files/0.13.1-CVE-2016-0749-p2.patch | 50 ---------- .../spice/files/0.13.1-CVE-2016-2150-p1.patch | 109 --------------------- .../spice/files/0.13.1-CVE-2016-2150-p2.patch | 50 ---------- app-emulation/spice/spice-0.12.8.ebuild | 86 ---------------- app-emulation/spice/spice-0.13.1-r2.ebuild | 91 ----------------- app-emulation/spice/spice-0.13.2.ebuild | 88 ----------------- 9 files changed, 569 deletions(-) diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest index 61803b6991c..8e228b69b86 100644 --- a/app-emulation/spice/Manifest +++ b/app-emulation/spice/Manifest @@ -1,5 +1,2 @@ DIST spice-0.12.7.tar.bz2 1220405 SHA256 1c8e96cb9e833e23372e2f461508135903b697fd8c6daff565e9e87f6d2f6aba SHA512 a740d500d0ccad3edd1f2f71e51c5a120d6ae98e44125f33870c12f5d1eeb30b809e588d05b2d0cadb4216e889b38e57d2278916817538311b875ff22e3b31ae WHIRLPOOL 61ffa3e280a346a2667ddd38dcfd63ffa6c1e6efd0f05da4fad43b00ca5e1a1587411a907b929b75e4d1e72ebcef29621ccdd76dfb313e8f3a5513a5a367132b -DIST spice-0.12.8.tar.bz2 1223778 SHA256 f901a5c5873d61acac84642f9eea5c4d6386fc3e525c2b68792322794e1c407d SHA512 6485d3522af1cde93d2c0abad7f7ef9f2e4d3e5049314fb93b6dd4b86e33d67d353a3ff42a355c8fd991bad447bbde1e6320c083bbc6f02b576bd9cebe7269ed WHIRLPOOL 9363254a4b072e8c06e7c0ea4d25dd4b068e4700cbb4fdaabc9f8fe9291e2f67afc321b0d56c2b6f46153b3f6bd7d6c96341437053b0410808fb95ddd01354fb -DIST spice-0.13.1.tar.bz2 1245323 SHA256 9ecb130424da02e90c235c1294f6e759d7c676c5e710587a5c98a1f20f991da2 SHA512 a8e65cc02c802686f2e0c21615401e13b337e050c40938bebefa684abc1ce0e2d478136d0fec481a8ee30ed98f2e2fb909dfbf6cd65e9dfd7093d59f825b95d5 WHIRLPOOL 068d7d26f18435995546d84b0d8d81ced4973773303463e597cf05e1c5accd9ac8554f22032eb55827bebbe6c0fc14915455da24c58fc70b135d955fe3442db7 -DIST spice-0.13.2.tar.bz2 1284734 SHA256 045a1f145d8207ecf33105c8a8917252c1201c45791fdc544733465a37974954 SHA512 7220c6550446a8077522442bd518cff68439bb0b00ee199920b32a97c3655ccad75a0cdfc822a99be678e6098ad33698b26340caddae0400403490a89137d367 WHIRLPOOL f2bd409e87203c2bbe481e6b6ba9ae3c6cfee0e67b0dd5073c97e9ff14d9c02a7cec0606700717ce9c25e478a38eefc925f9c797697981528f357464f388b65d DIST spice-0.13.3.tar.bz2 1322505 SHA256 30f710c0e7594e05b6b9cc702be748a69f910a95192ab851d748c256157fb89e SHA512 63496fbd3df0fd453052cef8e1fb00a3a28f0105610676fdc4a58043cbc6da571ae4407701af2b817e410d05ce727d60d5ee0c93c8897231e25229897c51d95a WHIRLPOOL 16bb08301d66c1f21f612f5be87ba1ffef7132f3c18ac3ab7feec21e16de61461648311d04f6990254d4c47ee7a6d39f4c33f122e941e5a3fc0c2ed289dd928b diff --git a/app-emulation/spice/files/0.12.8-upstream-fix.patch b/app-emulation/spice/files/0.12.8-upstream-fix.patch deleted file mode 100644 index fcc1855ac77..00000000000 --- a/app-emulation/spice/files/0.12.8-upstream-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 1d597f4b1a6bbeaf3dda998413a1e3cef2e40681 -Author: Marc-André Lureau <[email protected]> -Date: Wed Jul 20 17:16:31 2016 +0400 - - Call migrate_end_complete() after falling back to switch-host - - Eventually, during a seamless migration, qemu may finish to migrate - before the spice client even finished to connect all channels to - destination and informed the server. In this case, - main_channel_client_migrate_src_complete() will fall back to - switch-host method, and reds_mig_fill_wait_disconnect() is called to - complete the migration (disconnecting all channels). - - reds_mig_cleanup() is called when all channels are disconnected, but - reds->mig_wait_connect is still TRUE, and it will call - migrate_connect_complete() instead of the expected - migrate_end_complete(). Setting reds->mig_wait_connect to FALSE when - reds_mig_fill_wait_disconnect() solves the issue. - - Fixes: - https://bugzilla.redhat.com/show_bug.cgi?id=1352836 - - Signed-off-by: Marc-André Lureau <[email protected]> - -diff --git a/server/reds.c b/server/reds.c -index 61bf735..f40b65c 100644 ---- a/server/reds.c -+++ b/server/reds.c -@@ -2816,6 +2816,7 @@ static void reds_mig_fill_wait_disconnect(void) - wait_client->client = client; - ring_add(&reds->mig_wait_disconnect_clients, &wait_client->link); - } -+ reds->mig_wait_connect = FALSE; - reds->mig_wait_disconnect = TRUE; - core->timer_start(reds->mig_timer, MIGRATE_TIMEOUT); - } diff --git a/app-emulation/spice/files/0.13.1-CVE-2016-0749-p1.patch b/app-emulation/spice/files/0.13.1-CVE-2016-0749-p1.patch deleted file mode 100644 index cd1c8ef1df6..00000000000 --- a/app-emulation/spice/files/0.13.1-CVE-2016-0749-p1.patch +++ /dev/null @@ -1,56 +0,0 @@ -From fd4a179a15882234f86ded87905a240dc76a9445 Mon Sep 17 00:00:00 2001 -From: Matthias Maier <[email protected]> -Date: Tue, 14 Jun 2016 00:08:05 -0500 -Subject: [PATCH 1/2] Port fix for CVE-2016-0749 to 0.13.1, part I - -This is a port of - - 0065-smartcard-add-a-ref-to-item-before-adding-to-pipe.patch - -to version 0.13.1 - -Original commit message: - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Marc-Andre Lureau <[email protected]> -Date: Thu, 17 Dec 2015 18:13:47 +0100 -Subject: [PATCH] smartcard: add a ref to item before adding to pipe - -There is an unref when the message is sent. - -[...] - -Signed-off-by: Marc-Andre Lureau <[email protected]> ---- - server/smartcard.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/server/smartcard.c b/server/smartcard.c -index ba6f2f5..96e4295 100644 ---- a/server/smartcard.c -+++ b/server/smartcard.c -@@ -181,14 +181,18 @@ static void smartcard_unref_msg_to_client(RedCharDeviceMsgToClient *msg, - smartcard_unref_vsc_msg_item((MsgItem *)msg); - } - --static void smartcard_send_msg_to_client(RedCharDeviceMsgToClient *msg, -+static void smartcard_send_msg_to_client(RedCharDeviceMsgToClient *message, - RedClient *client, - void *opaque) - { - RedCharDeviceSmartcard *dev = opaque; -- spice_assert(dev->priv->scc && dev->priv->scc->base.client == client); -- smartcard_channel_client_pipe_add_push(&dev->priv->scc->base, &((MsgItem *)msg)->base); - -+ MsgItem *msg = (MsgItem *)message; -+ PipeItem *item = &msg->base; -+ -+ spice_assert(dev->priv->scc && dev->priv->scc->base.client == client); -+ smartcard_ref_vsc_msg_item(msg); -+ smartcard_channel_client_pipe_add_push(&dev->priv->scc->base, item); - } - - static void smartcard_send_tokens_to_client(RedClient *client, uint32_t tokens, void *opaque) --- -2.7.3 - diff --git a/app-emulation/spice/files/0.13.1-CVE-2016-0749-p2.patch b/app-emulation/spice/files/0.13.1-CVE-2016-0749-p2.patch deleted file mode 100644 index 6a1895f247f..00000000000 --- a/app-emulation/spice/files/0.13.1-CVE-2016-0749-p2.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4cd23b8378e68283c7c9cf0b1e25dae11cf69c3e Mon Sep 17 00:00:00 2001 -From: Matthias Maier <[email protected]> -Date: Tue, 14 Jun 2016 00:15:48 -0500 -Subject: [PATCH 2/2] Port fix for CVE-2016-0749 to 0.13.1, part II - -This is a port of - - 0066-smartcard-allocate-msg-with-the-expected-size.patch - -to version 0.13.1 - -Original commit message: - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Marc-Andre Lureau <[email protected]> -Date: Thu, 17 Dec 2015 18:16:22 +0100 -Subject: [PATCH] smartcard: allocate msg with the expected size - -[...] - -Signed-off-by: Marc-Andre Lureau <[email protected]> ---- - server/smartcard.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/server/smartcard.c b/server/smartcard.c -index 96e4295..c317512 100644 ---- a/server/smartcard.c -+++ b/server/smartcard.c -@@ -313,7 +313,7 @@ static void smartcard_char_device_notify_reader_add(RedCharDeviceSmartcard *dev) - RedCharDeviceWriteBuffer *write_buf; - VSCMsgHeader *vheader; - -- write_buf = red_char_device_write_buffer_get(RED_CHAR_DEVICE(dev), NULL, sizeof(vheader)); -+ write_buf = red_char_device_write_buffer_get(RED_CHAR_DEVICE(dev), NULL, sizeof(*vheader)); - if (!write_buf) { - spice_error("failed to allocate write buffer"); - return; -@@ -360,7 +360,7 @@ static void smartcard_char_device_notify_reader_remove(RedCharDeviceSmartcard *d - spice_debug("reader add was never sent to the device"); - return; - } -- write_buf = red_char_device_write_buffer_get(RED_CHAR_DEVICE(dev), NULL, sizeof(vheader)); -+ write_buf = red_char_device_write_buffer_get(RED_CHAR_DEVICE(dev), NULL, sizeof(*vheader)); - if (!write_buf) { - spice_error("failed to allocate write buffer"); - return; --- -2.7.3 - diff --git a/app-emulation/spice/files/0.13.1-CVE-2016-2150-p1.patch b/app-emulation/spice/files/0.13.1-CVE-2016-2150-p1.patch deleted file mode 100644 index e814975e5f3..00000000000 --- a/app-emulation/spice/files/0.13.1-CVE-2016-2150-p1.patch +++ /dev/null @@ -1,109 +0,0 @@ -From fc06265c3780e05503410a6646d1434e15d25b03 Mon Sep 17 00:00:00 2001 -From: Frediano Ziglio <[email protected]> -Date: Mon, 29 Feb 2016 14:24:03 +0000 -Subject: [PATCH 1/2] factor out red_validate_surface function to validate - surface parameters - -Make possible to reuse it outside red-parse-qxl.c. - -Signed-off-by: Frediano Ziglio <[email protected]> -Acked-by: Christophe Fergeau <[email protected]> ---- - server/red-parse-qxl.c | 49 ++++++++++++++++++++++++++++++++----------------- - server/red-parse-qxl.h | 3 +++ - 2 files changed, 35 insertions(+), 17 deletions(-) - -diff --git a/server/red-parse-qxl.c b/server/red-parse-qxl.c -index 18b7ea6..b462311 100644 ---- a/server/red-parse-qxl.c -+++ b/server/red-parse-qxl.c -@@ -1327,13 +1327,41 @@ static unsigned int surface_format_to_bpp(uint32_t format) - return 0; - } - -+bool red_validate_surface(uint32_t width, uint32_t height, -+ int32_t stride, uint32_t format) -+{ -+ unsigned int bpp; -+ uint64_t size; -+ -+ bpp = surface_format_to_bpp(format); -+ -+ /* check if format is valid */ -+ if (!bpp) { -+ return false; -+ } -+ -+ /* check stride is larger than required bytes */ -+ size = ((uint64_t) width * bpp + 7u) / 8u; -+ /* the uint32_t conversion is here to avoid problems with -2^31 value */ -+ if (stride == G_MININT32 || size > (uint32_t) abs(stride)) { -+ return false; -+ } -+ -+ /* the multiplication can overflow, also abs(-2^31) may return a negative value */ -+ size = (uint64_t) height * abs(stride); -+ if (size > MAX_DATA_CHUNK) { -+ return false; -+ } -+ -+ return true; -+} -+ - int red_get_surface_cmd(RedMemSlotInfo *slots, int group_id, - RedSurfaceCmd *red, QXLPHYSICAL addr) - { - QXLSurfaceCmd *qxl; - uint64_t size; - int error; -- unsigned int bpp; - - qxl = (QXLSurfaceCmd *)memslot_get_virt(slots, addr, sizeof(*qxl), group_id, - &error); -@@ -1353,26 +1381,13 @@ int red_get_surface_cmd(RedMemSlotInfo *slots, int group_id, - red->u.surface_create.width = qxl->u.surface_create.width; - red->u.surface_create.height = qxl->u.surface_create.height; - red->u.surface_create.stride = qxl->u.surface_create.stride; -- bpp = surface_format_to_bpp(red->u.surface_create.format); - -- /* check if format is valid */ -- if (!bpp) { -+ if (!red_validate_surface(red->u.surface_create.width, red->u.surface_create.height, -+ red->u.surface_create.stride, red->u.surface_create.format)) { - return 1; - } - -- /* check stride is larger than required bytes */ -- size = ((uint64_t) red->u.surface_create.width * bpp + 7u) / 8u; -- /* the uint32_t conversion is here to avoid problems with -2^31 value */ -- if (red->u.surface_create.stride == G_MININT32 -- || size > (uint32_t) abs(red->u.surface_create.stride)) { -- return 1; -- } -- -- /* the multiplication can overflow, also abs(-2^31) may return a negative value */ -- size = (uint64_t) red->u.surface_create.height * abs(red->u.surface_create.stride); -- if (size > MAX_DATA_CHUNK) { -- return 1; -- } -+ size = red->u.surface_create.height * abs(red->u.surface_create.stride); - red->u.surface_create.data = - (uint8_t*)memslot_get_virt(slots, qxl->u.surface_create.data, size, group_id, &error); - if (error) { -diff --git a/server/red-parse-qxl.h b/server/red-parse-qxl.h -index 9c30572..72a57b4 100644 ---- a/server/red-parse-qxl.h -+++ b/server/red-parse-qxl.h -@@ -127,6 +127,9 @@ int red_get_message(RedMemSlotInfo *slots, int group_id, - RedMessage *red, QXLPHYSICAL addr); - void red_put_message(RedMessage *red); - -+bool red_validate_surface(uint32_t width, uint32_t height, -+ int32_t stride, uint32_t format); -+ - int red_get_surface_cmd(RedMemSlotInfo *slots, int group_id, - RedSurfaceCmd *red, QXLPHYSICAL addr); - void red_put_surface_cmd(RedSurfaceCmd *red); --- -2.7.3 - diff --git a/app-emulation/spice/files/0.13.1-CVE-2016-2150-p2.patch b/app-emulation/spice/files/0.13.1-CVE-2016-2150-p2.patch deleted file mode 100644 index a452969d6f1..00000000000 --- a/app-emulation/spice/files/0.13.1-CVE-2016-2150-p2.patch +++ /dev/null @@ -1,50 +0,0 @@ -From b1c167bb9e8047e93bfd43a43832963c8e830f5b Mon Sep 17 00:00:00 2001 -From: Frediano Ziglio <[email protected]> -Date: Wed, 2 Mar 2016 12:35:41 +0000 -Subject: [PATCH 2/2] improve primary surface parameter checks - -Primary surface, as additional surfaces, can be used to access -host memory from the guest using invalid parameters. - -The removed warning is not enough to prevent all cases. Also a warning -is not enough to stop an escalation to happen. -The red_validate_surface do different checks to make sure surface -request is valid and not cause possible buffer/integer overflows: -- format is valid; -- width is not large to cause overflow compared to stride; -- stride is not -2^31 (a number which negate is still <0); -- stride * height does not overflow. - -This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1312980. - -Signed-off-by: Frediano Ziglio <[email protected]> -Acked-by: Christophe Fergeau <[email protected]> ---- - server/red-worker.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/server/red-worker.c b/server/red-worker.c -index 241c300..c7fc8bd 100644 ---- a/server/red-worker.c -+++ b/server/red-worker.c -@@ -681,8 +681,15 @@ static void dev_create_primary_surface(RedWorker *worker, uint32_t surface_id, - spice_debug(NULL); - spice_warn_if_fail(surface_id == 0); - spice_warn_if_fail(surface.height != 0); -- spice_warn_if_fail(((uint64_t)abs(surface.stride) * (uint64_t)surface.height) == -- abs(surface.stride) * surface.height); -+ -+ /* surface can arrive from guest unchecked so make sure -+ * guest is not a malicious one and drop invalid requests -+ */ -+ if (!red_validate_surface(surface.width, surface.height, -+ surface.stride, surface.format)) { -+ spice_warning("wrong primary surface creation request"); -+ return; -+ } - - line_0 = (uint8_t*)memslot_get_virt(&worker->mem_slots, surface.mem, - surface.height * abs(surface.stride), --- -2.7.3 - diff --git a/app-emulation/spice/spice-0.12.8.ebuild b/app-emulation/spice/spice-0.12.8.ebuild deleted file mode 100644 index 6da878426ea..00000000000 --- a/app-emulation/spice/spice-0.12.8.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_4 ) - -inherit eutils python-any-r1 - -DESCRIPTION="SPICE server" -HOMEPAGE="http://spice-space.org/"; -SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"; - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl sasl smartcard static-libs" - -# the libspice-server only uses the headers of libcacard -RDEPEND=" - >=dev-libs/glib-2.22:2[static-libs(+)?] - >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] - media-libs/opus[static-libs(+)?] - sys-libs/zlib[static-libs(+)?] - virtual/jpeg:0=[static-libs(+)?] - >=x11-libs/pixman-0.17.7[static-libs(+)?] - !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) - libressl? ( dev-libs/libressl[static-libs(+)?] ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )" - -DEPEND=" - ~app-emulation/spice-protocol-0.12.11 - virtual/pkgconfig - $(python_gen_any_dep ' - >=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ') - smartcard? ( app-emulation/qemu[smartcard] ) - ${RDEPEND}" - -python_check_deps() { - has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]" - has_version "dev-python/six[${PYTHON_USEDEP}]" -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup -} - -# maintainer notes: -# * opengl support is currently broken - -src_prepare() { - epatch \ - "${FILESDIR}"/0.11.0-gold.patch \ - "${FILESDIR}"/0.12.8-upstream-fix.patch - - epatch_user -} - -src_configure() { - # Prevent sandbox violations, bug #586560 - # https://bugzilla.gnome.org/show_bug.cgi?id=744134 - # https://bugzilla.gnome.org/show_bug.cgi?id=744135 - addpredict /dev - - econf \ - $(use_enable static-libs static) \ - $(use_with sasl) \ - $(use_enable smartcard) \ - --disable-gui -} - -src_compile() { - # Prevent sandbox violations, bug #586560 - # https://bugzilla.gnome.org/show_bug.cgi?id=744134 - # https://bugzilla.gnome.org/show_bug.cgi?id=744135 - addpredict /dev - - default -} - -src_install() { - default - use static-libs || prune_libtool_files -} diff --git a/app-emulation/spice/spice-0.13.1-r2.ebuild b/app-emulation/spice/spice-0.13.1-r2.ebuild deleted file mode 100644 index e5fb5576a82..00000000000 --- a/app-emulation/spice/spice-0.13.1-r2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_4} ) - -inherit eutils python-any-r1 - -DESCRIPTION="SPICE server" -HOMEPAGE="http://spice-space.org/"; -SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"; - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl lz4 sasl smartcard static-libs" - -# the libspice-server only uses the headers of libcacard -RDEPEND=" - >=dev-libs/glib-2.22:2[static-libs(+)?] - >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] - media-libs/opus[static-libs(+)?] - sys-libs/zlib[static-libs(+)?] - virtual/jpeg:0=[static-libs(+)?] - >=x11-libs/pixman-0.17.7[static-libs(+)?] - !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) - libressl? ( dev-libs/libressl[static-libs(+)?] ) - lz4? ( app-arch/lz4 ) - smartcard? ( >=app-emulation/libcacard-0.1.2 ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )" - -DEPEND=" - ~app-emulation/spice-protocol-0.12.11 - virtual/pkgconfig - $(python_gen_any_dep ' - >=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ') - smartcard? ( app-emulation/qemu[smartcard] ) - ${RDEPEND}" - -python_check_deps() { - has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]" - has_version "dev-python/six[${PYTHON_USEDEP}]" -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup -} - -# maintainer notes: -# * opengl support is currently broken - -src_prepare() { - epatch \ - "${FILESDIR}"/${PV}-CVE-2016-0749-p1.patch \ - "${FILESDIR}"/${PV}-CVE-2016-0749-p2.patch \ - "${FILESDIR}"/${PV}-CVE-2016-2150-p1.patch \ - "${FILESDIR}"/${PV}-CVE-2016-2150-p2.patch - - epatch_user -} - -src_configure() { - # Prevent sandbox violations, bug #586560 - # https://bugzilla.gnome.org/show_bug.cgi?id=744134 - # https://bugzilla.gnome.org/show_bug.cgi?id=744135 - addpredict /dev - - econf \ - $(use_enable static-libs static) \ - $(use_enable lz4) \ - $(use_with sasl) \ - $(use_enable smartcard) \ - --disable-gui -} - -src_compile() { - # Prevent sandbox violations, bug #586560 - # https://bugzilla.gnome.org/show_bug.cgi?id=744134 - # https://bugzilla.gnome.org/show_bug.cgi?id=744135 - addpredict /dev - - default -} - -src_install() { - default - use static-libs || prune_libtool_files -} diff --git a/app-emulation/spice/spice-0.13.2.ebuild b/app-emulation/spice/spice-0.13.2.ebuild deleted file mode 100644 index ce5bfb11322..00000000000 --- a/app-emulation/spice/spice-0.13.2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4} ) - -inherit eutils python-any-r1 readme.gentoo-r1 xdg-utils - -DESCRIPTION="SPICE server" -HOMEPAGE="http://spice-space.org/"; -SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"; - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl lz4 sasl smartcard static-libs gstreamer" - -# the libspice-server only uses the headers of libcacard -RDEPEND=" - >=dev-libs/glib-2.22:2[static-libs(+)?] - >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] - media-libs/opus[static-libs(+)?] - sys-libs/zlib[static-libs(+)?] - virtual/jpeg:0=[static-libs(+)?] - >=x11-libs/pixman-0.17.7[static-libs(+)?] - !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) - libressl? ( dev-libs/libressl[static-libs(+)?] ) - lz4? ( app-arch/lz4 ) - smartcard? ( >=app-emulation/libcacard-0.1.2 ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) - gstreamer? ( media-libs/gstreamer:1.0 )" - -DEPEND=" - ~app-emulation/spice-protocol-0.12.12 - virtual/pkgconfig - $(python_gen_any_dep ' - >=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ') - smartcard? ( app-emulation/qemu[smartcard] ) - ${RDEPEND}" - -python_check_deps() { - has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]" - has_version "dev-python/six[${PYTHON_USEDEP}]" -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup -} - -# maintainer notes: -# * opengl support is currently broken -src_configure() { - # Prevent sandbox violations, bug #586560 - # https://bugzilla.gnome.org/show_bug.cgi?id=744134 - # https://bugzilla.gnome.org/show_bug.cgi?id=744135 - addpredict /dev - - xdg_environment_reset - - local myconf=" - $(use_enable static-libs static) - $(use_enable lz4) - $(use_with sasl) - $(use_enable smartcard) - $(usex gstreamer "1.0" "no") - --enable-celt051 - --disable-gui - " - econf ${myconf} -} - -src_compile() { - # Prevent sandbox violations, bug #586560 - # https://bugzilla.gnome.org/show_bug.cgi?id=744134 - # https://bugzilla.gnome.org/show_bug.cgi?id=744135 - addpredict /dev - - default -} - -src_install() { - default - use static-libs || prune_libtool_files - readme.gentoo_create_doc -}
