diff options
Diffstat (limited to 'app-emulation/spice')
| -rw-r--r-- | app-emulation/spice/Manifest | 6 | ||||
| -rw-r--r-- | app-emulation/spice/files/spice-0.14.0-libressl_fix.patch | 13 | ||||
| -rw-r--r-- | app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch | 26 | ||||
| -rw-r--r-- | app-emulation/spice/spice-0.14.0.ebuild (renamed from app-emulation/spice/spice-0.13.90.ebuild) | 13 |
4 files changed, 51 insertions, 7 deletions
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest index b278715e79bc..43b55111bf02 100644 --- a/app-emulation/spice/Manifest +++ b/app-emulation/spice/Manifest @@ -3,9 +3,11 @@ AUX spice-0.13.3-reds-Avoid-buffer-overflows-handling-monitor-configu.patch 1902 AUX spice-0.13.3-reds-Avoid-integer-overflows-handling-monitor-config.patch 1022 BLAKE2B eff6063372af35b926663393afc022a4e0b875c22402136ed41be394951958789a2c8de26e8791664cbef1c8bee7e9344f8fe7f39563e7b14567f9ebff2b0fa8 SHA512 4f815f091c0eec1ccfaa3438390087d4b7390e3ea84e353e42638a850e0faa552077af443719f2015ce36375ac2ac400721677462a2739ecf05fdf8c2e778b41 AUX spice-0.13.3-reds-Disconnect-when-receiving-overly-big-ClientMoni.patch 2988 BLAKE2B 99bca01b78b4acb875085628613f47a8c07c87061b77a50fdb4abc45770aa75a88bc75310e3a8a558d303861f17480b6362751f4073a54c5909aaca8c11422ef SHA512 ee15a37c45527869415d301968857f47a4536462bcea6fb5608862fa7019b2eeba36d08563b74feb7a96bc565dd6fe09349c736c4677d43c1f13fc95f1c42c06 AUX spice-0.13.3-skip_faulty_lz4_check.patch 566 BLAKE2B 4775395c0e39e8c930078365ac2b05c21d30698b4cd472e56eb77fcde3f83894f3649c066824ad424dd0178200e17a8cd207046552dfebd3944de88e96d406e9 SHA512 aa16b86446f42a08c5d76927090e6b01817308520b34affcdd28a9e89d70d344f5ce47d1600c5cc564ecdf428cbfe8cf456ce8d3ccf4e686bd0cfb2f9fe5fe33 +AUX spice-0.14.0-libressl_fix.patch 488 BLAKE2B ab316ba0e5ca7299304dae229216291f0c2e80720f16dd0bd3de825b311b57cea3dd52b1afa029e5c246abe4244c30deda55f40262085ed2290799748cdb27d2 SHA512 80d809aa7cb92cb5b51a00c1d92f3160110ceefedf6fbebdc77726dec99f253fa9c308b5e5356620ea5b426c14857ad87d8aa861913b22c5b1eecb6df1ce922e +AUX spice-0.14.0-openssl1.1_fix.patch 576 BLAKE2B 0b2f86239048722c7350ce63274d022994f6a9a13f3e12c0450ca7c1ec9e9c79b0e688b46e387fcc9cd0c606f2e0631baa20b29cfabca697f0e1a848d7f2f604 SHA512 50d2121760fdb5e3da75cb33e5d63855501cb9045dbb1e6ab26b13b27bcaf32a4c02daa4d28951ad9431cfea533061196f0157068ea846fc19e458604ff7dc77 DIST spice-0.13.3.tar.bz2 1322505 BLAKE2B 56f9cd34bb48fdcf750230242b27567db713ef749649d4b780a82d0d4ec5d326b19540c9bb4f36c164d40a692eb0368c39e05ee8dba319dd8461a0315e5a9a17 SHA512 63496fbd3df0fd453052cef8e1fb00a3a28f0105610676fdc4a58043cbc6da571ae4407701af2b817e410d05ce727d60d5ee0c93c8897231e25229897c51d95a -DIST spice-0.13.90.tar.bz2 1364173 BLAKE2B 1bc0e71d8c5a21f9961ac6c0567bde19d31983bd5b0f5d4df30cc5634080d288f277689d875334d94c6a276284313bc82f15eaf0ce20916c6c912c2dcc4bdfc0 SHA512 a5a6ab328a2d3cb405ead6eef40a1b896432f35accf1f8b015fc9deadcc4e5eb5f6d8d575a94fa3b2505e206986887badecf721ab015efd88dad174d7340c01c +DIST spice-0.14.0.tar.bz2 1330195 BLAKE2B 08f93e8ddeb79adb4feac0557a854cc41fd096a9dfefc0baaca176803c2a03ef9286c4f61a135d62ad22e3ac3f4bb31ffd1614c8ddeaec7ae8c01eca34da1750 SHA512 84532146aa628ca6ca459a82afb89d6391892e063668fd4a68023c92cee7ca868b6c82e31dd9886819b76ea745ebdae0d0030e1f608d8f58f51c00f0b09bae1f EBUILD spice-0.13.3-r2.ebuild 2712 BLAKE2B dc0b6c6ec539682690d5a7f240beb49669fa7260a92214a8434b8e527b4f07434fa0feee54db5906fea7cc3256d8fcaed207bbf255aa79bdc640577647dc1110 SHA512 d0cbb81eaaacdf131c914b83ef42071e3f373d1154b0d3c530db6d4ff39c44f814e5a20c3ba2182bbf3cea3598cab1f6e7201ca74377cadb710808554a4f3228 -EBUILD spice-0.13.90.ebuild 2384 BLAKE2B 4e492b1f09f5c2ebf4c0fb7a862ab40fa04a0e6d6c5fa73655965bdbae8a390604d67e80e852ed34a534c49f298f2f93d6c67436e94935099400361c04105fba SHA512 60a13e6974938a603d082f76c54f062a8109be23787430baa9cd557b5d4ccf1f363fe73a1e233976caf1be1a1961cba45a09f520f4a725774feaf5980ac940ba +EBUILD spice-0.14.0.ebuild 2412 BLAKE2B fcc229345c3111f59604673fdb0022c840f5ca0ee68d592b1d95df1a5994f5a93680904b382fa44622db786da3eaf9e6d0cfb7b4156df7c18541159738132f50 SHA512 aefaa63c2e9f35e000c6c4cccb330c7eb1e514aecb319d571138bedb7ea3206d947cf2ed27cb7c8b5d6b1bb2aca9d2c8979f02c57bff5120ccb851382fc972d7 EBUILD spice-9999.ebuild 2386 BLAKE2B da587de7bed6da379e3a91a50911cd9069a4c72d35b75728c3554f07026438392a7ce8f5aedc55f9fb7ada93ff6e46167b610f23cf5d3def2004fdcff1d818c4 SHA512 e9c217c888229996b61a6fd38c0769fe5fc579117b0f2f54f07d44d45d720d4a1bd7a1c6b8145f01d7aa99c03aa88ac2a5edd1c44ff6a4bd17fd0950eb29397f MISC metadata.xml 476 BLAKE2B 2cda64935d0117db099551f30928c447c4d1d7f4e1c355e619c0134ec31e4d7779b646329218c48f9be671d0f0e92fa496caaa34f6aa4136748dd9bd6d2d868a SHA512 3ae95b689c812e19679cb9a9db2f0811077a4eb205cadf4baeb78a2ddfeb7fc0086e2514540fad59e447bbca6c9dba81001a8ff156a1d18ba2d58171ba301f9b diff --git a/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch b/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch new file mode 100644 index 000000000000..2f77fa5a0006 --- /dev/null +++ b/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch @@ -0,0 +1,13 @@ +diff --git a/spice-common/common/ssl_verify.c b/spice-common/common/ssl_verify.c +index a9ed650..27aa5d3 100644 +--- a/spice-common/common/ssl_verify.c ++++ b/spice-common/common/ssl_verify.c +@@ -33,7 +33,7 @@ + #include <string.h> + #include <gio/gio.h> + +-#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined (LIBRESSL_VERSION_NUMBER) + static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1) + { + return M_ASN1_STRING_data(asn1); diff --git a/app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch b/app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch new file mode 100644 index 000000000000..5854d8788c75 --- /dev/null +++ b/app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch @@ -0,0 +1,26 @@ +--- spice-0.13.90-orig/server/reds.c 2017-07-27 01:04:10.000000000 +1000 ++++ spice-0.13.90/server/reds.c 2017-10-18 21:42:12.054934199 +1100 +@@ -34,6 +34,8 @@ + #include <ctype.h> + + #include <openssl/err.h> ++#include <openssl/bn.h> ++#include <openssl/rsa.h> + + #if HAVE_SASL + #include <sasl/sasl.h> +@@ -2795,9 +2797,12 @@ + + static gpointer openssl_global_init(gpointer arg) + { ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ OPENSSL_init_ssl(0, NULL); ++#else + SSL_library_init(); + SSL_load_error_strings(); +- ++#endif + openssl_thread_setup(); + + return NULL; + diff --git a/app-emulation/spice/spice-0.13.90.ebuild b/app-emulation/spice/spice-0.14.0.ebuild index abf7a28a67bb..11420b4ea1be 100644 --- a/app-emulation/spice/spice-0.13.90.ebuild +++ b/app-emulation/spice/spice-0.14.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,6 @@ 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(+)?] @@ -34,7 +33,7 @@ RDEPEND=" )" DEPEND="${RDEPEND} ${PYTHON_DEPS} - >=app-emulation/spice-protocol-0.12.12 + >=app-emulation/spice-protocol-0.12.13 virtual/pkgconfig $(python_gen_any_dep ' >=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}] @@ -42,6 +41,11 @@ DEPEND="${RDEPEND} ') smartcard? ( app-emulation/qemu[smartcard] )" +PATCHES=( + "${FILESDIR}"/${P}-libressl_fix.patch + "${FILESDIR}"/${P}-openssl1.1_fix.patch +) + python_check_deps() { has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]" has_version "dev-python/six[${PYTHON_USEDEP}]" @@ -71,8 +75,7 @@ src_configure() { $(use_with sasl) $(use_enable smartcard) --enable-gstreamer=$(usex gstreamer "1.0" "no") - --enable-celt051 - --disable-gui + --disable-celt051 " econf ${myconf} } |