diff options
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/Manifest.gz | bin | 14809 -> 14813 bytes | |||
-rw-r--r-- | app-emulation/spice/Manifest | 6 | ||||
-rw-r--r-- | app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-404d7478.patch | 31 | ||||
-rw-r--r-- | app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-762e0aba.patch | 13 | ||||
-rw-r--r-- | app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-b24fe6b6.patch | 18 | ||||
-rw-r--r-- | app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-ef1b6ff7.patch | 17 | ||||
-rw-r--r-- | app-emulation/spice/spice-0.14.3-r1.ebuild | 106 |
7 files changed, 0 insertions, 191 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex 3eae9a1d12fb..f157f5448ccd 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest index 2346513362c9..08d66f17cf76 100644 --- a/app-emulation/spice/Manifest +++ b/app-emulation/spice/Manifest @@ -1,12 +1,6 @@ AUX README.gentoo 270 BLAKE2B 979c3e8d2a3c1d4f30af8f2d9954434dd685abf42992abf0e63e9dbe2d16d8fb3b135ecf3b81344e12d585ed92543d6b8adffb01e55772964de0f97f320d785c SHA512 9202046d629d12eee0435bb0ee8bafc1d8a0b52784275a7b3989fd430de8ed0ec2e59cfdf963a58494a05296a55bc99fe7095e661398182d62286e8816895dd1 -AUX spice-0.14.3-CVE-2020-14355-404d7478.patch 1274 BLAKE2B 750de585f630c724c851514b35dcec57e2c263fb4423cf472c9cb10a2654fdc918eac9f14460e17f4e147d1b2b4ad1269e254037fce49397eb336f38747492b7 SHA512 51a901195a884209929294c4e9af4e49da79741dc08f5fc3035b95abbdbacb9a8c2fe6d0ffb4c6829b9f22012497058e3c618e543102fd9bdf446fae6cd07824 -AUX spice-0.14.3-CVE-2020-14355-762e0aba.patch 533 BLAKE2B f6ecb51c2ef568d7e9c341be68100423434b70f963ecadf05f351ebc567af6defe8033a4e2fb930b7401ac9a0ed721c9f00ef643d93f2ff7aca5100ad7636e92 SHA512 f5af0b2a8e4604390f7ae35a87ad17a5def2b4861538fe80c385e7a601e7fe78bcc24af4fa536f72be2c980dff94d2ff7252cdf6e593889106c8c1ce9978d91b -AUX spice-0.14.3-CVE-2020-14355-b24fe6b6.patch 876 BLAKE2B 7ba5c57e7ca7265f6d42bf475403ba1f1ce3690b1d6ab9d9c65ee722005a1b198b7b6a5ffb0d94a2dea1c67eb7ecd2585d6974c43ffae1dd25a2bc51781d5483 SHA512 b13f1b44d3452b5b246efb1b98f9b4b9bcff8ed9161bfa79d31fb4404cc499772144676a96b37b1cb94c7e9036c23df092fb1a878651555164e733d0fafb0712 -AUX spice-0.14.3-CVE-2020-14355-ef1b6ff7.patch 759 BLAKE2B 8d3f0b5d03d79dc1c02efec9f3746d4d8a5fc3be9b4a98a1b1b6f325cb19a03dbc2d29ab5c7a3a7bb807fda2bd52080c87d706a1c61eff15bc74a8c65a60f8ce SHA512 9b72fb0195feb5ddbce7dacca0459d2f5ad00a72c0f45488debae50c188b14274ae8a7208052e85ca42793a6be3a7483c816f1f381015ea5fe42fa05bb2a9f5a -DIST spice-0.14.3.tar.bz2 1504304 BLAKE2B be655e1d4c48dae29903ab8e0dc52da63723e3252052afccc9587065531f28c8af7dbab4c585093f26d98f2273c6e734a553c18d4779a9f4464334ae1764f682 SHA512 9ecdc455ff25c71ac1fe6c576654b51efbfb860110bd6828065d23f7462d5c5cac772074d1a40f033386258d970b77275b2007bcfdffb23fdff2137154ea46e4 DIST spice-0.15.0-pthread-c5fe3df1.patch.bz2 7605 BLAKE2B 86b8094a22a02080db038ef98972bf09f391d5344fee8df2aa7d2def0b50a581353cb0e3dd97f99bbd58b88a13ceac4b54be8086a9f4274f38d132b27b62e84d SHA512 5075bd260b33c2dad8c3ce641372383871f7d69190a4f4697bd5e12af1bf5429310c592961de001d36c19a9cdd91143b8d6e8be0e08b3850b9700c2aef2ddd78 DIST spice-0.15.0.tar.bz2 1537970 BLAKE2B 98e8f55de81a86c6370e4a74c0fd90db78a9a8e8e3af536bccd6a2a75185194ac7b87521163090c4312e392d2ee10036c0283171c7796aea630e1307128a2d55 SHA512 0a776d191c395ce1f7ebbbac47956a00a2765327d3127aeca6e232bd56fd4ccd28750ae1599eb6eb2909ac909cda517d5511faa631166db16b8b75bd4e7b86d9 -EBUILD spice-0.14.3-r1.ebuild 2621 BLAKE2B fb7b7b353150b930c483319ce63cd2eed08802862568e4a27c2bbd890893c2abe8a10322643d322f34c8762369d014c3ef16c8e5da279e53d96b824bc4ab081c SHA512 ae8142fc96cc2cb997a58b4fcc37395edd7d83e87a7abaa051a02d5aab0cfffbd8b4e02f5dfe6fb46c0d320a9370bc27efa9d7b0bcd54d7745f4d64d4faf86c3 EBUILD spice-0.15.0.ebuild 2608 BLAKE2B 17f188d37af0906064ce52acb0873c0f133fc3b5930a4525bd4dfcca59b55dd72fc5e887b39054d5c774d7e9ee2c99f8779b9e52e30192faadae0f40bd832ff6 SHA512 283e664f45636f8e10e182b9f28c74373595654fc601792cc08a9a32e13848dd8251083aa2489aa17dea117a1008325a876dfc1252ac930004b70c522316014a EBUILD spice-9999.ebuild 2328 BLAKE2B db08b2067401437d68800c321647c8f55469d28c20a81a9b878655f4e744c335ace06249d75e03186cd125750c6067dd5759baf69b5c03250d74feb855a87f65 SHA512 2446a83cec21b44bfa87dcb03b210e1003684bf57afe070e715b77e2f8eeec10e3f7eec0f0fe53de3cb5afabdf2edc66c6ee4217533389a1d793abca6337f43c MISC metadata.xml 386 BLAKE2B 0f119a27a56d18c4229d807d0a8ed56816ff5d85ff3366b763f25ded218cfabd823cb7ca7fb695cf1c079d75bc0e02df13daef5186c61937db8a572489a4a055 SHA512 b977a2ffba331a37f0c26e01558b8d12beb586f24904cc5f26687973547021caf6c377479de86bc27405346f4dcd49130c5281d7c9d1b37b7809a70354eac37f diff --git a/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-404d7478.patch b/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-404d7478.patch deleted file mode 100644 index 338f4e6ca657..000000000000 --- a/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-404d7478.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/common/quic.c b/common/quic.c -index bc753ca5064a0326906b4aa8c18d8745747feb5c..681531677fbd6c3bca5e482c77bb709d4465ef8e 100644 ---- a/subprojects/spice-common/common/quic.c -+++ b/subprojects/spice-common/common/quic.c -@@ -56,6 +56,9 @@ typedef uint8_t BYTE; - #define MINwminext 1 - #define MAXwminext 100000000 - -+/* Maximum image size in pixels, mainly to avoid possible integer overflows */ -+#define SPICE_MAX_IMAGE_SIZE (512 * 1024 * 1024 - 1) -+ - typedef struct QuicFamily { - unsigned int nGRcodewords[MAXNUMCODES]; /* indexed by code number, contains number of - unmodified GR codewords in the code */ -@@ -1165,6 +1168,16 @@ int quic_decode_begin(QuicContext *quic, uint32_t *io_ptr, unsigned int num_io_w - height = encoder->io_word; - decode_eat32bits(encoder); - -+ if (width <= 0 || height <= 0) { -+ encoder->usr->warn(encoder->usr, "invalid size\n"); -+ return QUIC_ERROR; -+ } -+ -+ /* avoid too big images */ -+ if ((uint64_t) width * height > SPICE_MAX_IMAGE_SIZE) { -+ encoder->usr->error(encoder->usr, "image too large\n"); -+ } -+ - quic_image_params(encoder, type, &channels, &bpc); - - if (!encoder_reset_channels(encoder, channels, width, bpc)) { diff --git a/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-762e0aba.patch b/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-762e0aba.patch deleted file mode 100644 index ce79ef0043ee..000000000000 --- a/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-762e0aba.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/common/quic.c b/common/quic.c -index e2dee0fd68741512911d5d050053ad073cf29457..bc753ca5064a0326906b4aa8c18d8745747feb5c 100644 ---- a/subprojects/spice-common/common/quic.c -+++ b/subprojects/spice-common/common/quic.c -@@ -1136,7 +1136,7 @@ int quic_decode_begin(QuicContext *quic, uint32_t *io_ptr, unsigned int num_io_w - int channels; - int bpc; - -- if (!encoder_reset(encoder, io_ptr, io_ptr_end)) { -+ if (!num_io_words || !encoder_reset(encoder, io_ptr, io_ptr_end)) { - return QUIC_ERROR; - } - diff --git a/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-b24fe6b6.patch b/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-b24fe6b6.patch deleted file mode 100644 index 40127deda15a..000000000000 --- a/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-b24fe6b6.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/common/quic_family_tmpl.c b/common/quic_family_tmpl.c -index 8a5f7d2c9be3f6b1bd82993703749268bab243b4..6cc051b36889f773fe5401e204db6245d99e27df 100644 ---- a/subprojects/spice-common/common/quic_family_tmpl.c -+++ b/subprojects/spice-common/common/quic_family_tmpl.c -@@ -103,7 +103,12 @@ static s_bucket *FNAME(find_bucket)(Channel *channel, const unsigned int val) - { - spice_extra_assert(val < (0x1U << BPC)); - -- return channel->_buckets_ptrs[val]; -+ /* The and (&) here is to avoid buffer overflows in case of garbage or malicious -+ * attempts. Is much faster then using comparisons and save us from such situations. -+ * Note that on normal build the check above won't be compiled as this code path -+ * is pretty hot and would cause speed regressions. -+ */ -+ return channel->_buckets_ptrs[val & ((1U << BPC) - 1)]; - } - - #undef FNAME diff --git a/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-ef1b6ff7.patch b/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-ef1b6ff7.patch deleted file mode 100644 index bc764ec23ce2..000000000000 --- a/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-ef1b6ff7.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/common/quic_tmpl.c b/common/quic_tmpl.c -index ecd6f3f187c753a89b7dbb0657edc3ae82ffaaff..ebae992d642a657a7505b3ca0e8145310805f32f 100644 ---- a/subprojects/spice-common/common/quic_tmpl.c -+++ b/subprojects/spice-common/common/quic_tmpl.c -@@ -563,7 +563,11 @@ static void FNAME_DECL(uncompress_row_seg)(const PIXEL * const prev_row, - do_run: - state->waitcnt = stopidx - i; - run_index = i; -- run_end = i + decode_state_run(encoder, state); -+ run_end = decode_state_run(encoder, state); -+ if (run_end < 0 || run_end > (end - i)) { -+ encoder->usr->error(encoder->usr, "wrong RLE\n"); -+ } -+ run_end += i; - - for (; i < run_end; i++) { - UNCOMPRESS_PIX_START(&cur_row[i]); diff --git a/app-emulation/spice/spice-0.14.3-r1.ebuild b/app-emulation/spice/spice-0.14.3-r1.ebuild deleted file mode 100644 index 1eed375b81ad..000000000000 --- a/app-emulation/spice/spice-0.14.3-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit autotools python-any-r1 readme.gentoo-r1 xdg-utils - -DESCRIPTION="SPICE server" -HOMEPAGE="https://www.spice-space.org/" -SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86" -IUSE="lz4 sasl smartcard static-libs gstreamer test" - -RESTRICT="!test? ( test )" - -# the libspice-server only uses the headers of libcacard -RDEPEND=" - dev-lang/orc[static-libs(+)?] - >=dev-libs/glib-2.38:2[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(+)?] - dev-libs/openssl:0=[static-libs(+)?] - lz4? ( app-arch/lz4:0=[static-libs(+)?] ) - smartcard? ( >=app-emulation/libcacard-2.5.1 ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - )" -DEPEND="${RDEPEND} - >=app-emulation/spice-protocol-0.14.0 - smartcard? ( app-emulation/qemu[smartcard] ) - test? ( net-libs/glib-networking )" -BDEPEND="${PYTHON_DEPS} - virtual/pkgconfig - $(python_gen_any_dep ' - >=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ')" - -python_check_deps() { - has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]" - has_version -b "dev-python/six[${PYTHON_USEDEP}]" -} - -PATCHES=( - "${FILESDIR}"/${P}-CVE-2020-14355-762e0aba.patch - "${FILESDIR}"/${P}-CVE-2020-14355-404d7478.patch - "${FILESDIR}"/${P}-CVE-2020-14355-ef1b6ff7.patch - "${FILESDIR}"/${P}-CVE-2020-14355-b24fe6b6.patch -) - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup -} - -src_prepare() { - default - - eautoreconf -} - -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) - $(use_enable test tests) - --enable-gstreamer=$(usex gstreamer "1.0" "no") - --disable-celt051 - " - 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 || find "${D}" -name '*.la' -type f -delete || die - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} |