From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- x11-misc/virtualgl/Manifest | 5 +- ...-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch | 168 --------------------- x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild | 8 +- x11-misc/virtualgl/virtualgl-9999.ebuild | 8 +- 4 files changed, 12 insertions(+), 177 deletions(-) delete mode 100644 x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch (limited to 'x11-misc/virtualgl') diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest index 2e2e40c8e0ea..42f29b8458a2 100644 --- a/x11-misc/virtualgl/Manifest +++ b/x11-misc/virtualgl/Manifest @@ -2,8 +2,7 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29 AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9 -AUX virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch 5047 BLAKE2B 75dadf6d80456a702a3591b04b771410768e65c009da576502ada0fd192f480b20c6e0b12e470950be3306df7944f3b6bd890d0f4f97b778052eda63309cc0ea SHA512 a7d7dfc54f1fb00c00e8ae3011c7a28b4029f20049b9d792e2e8833fba79eb64f57c6ca6778d6d8bf4f383a2b08013e0d3b3db869ed8c08da549c89f095c4d3d DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5 -EBUILD virtualgl-2.6.1-r1.ebuild 2710 BLAKE2B 922ca3fa4e9230db03968aeacd5bdbce1560ef81404deaf39e528bf334d80f8bdc7759c340601543ce1007180820c9a990e2f3b4a1eba3a3ccd1b9e9ba27cf13 SHA512 603c12da0ccf3f1a9fde29470b30230c878f061497df85954db2376620d9f962ac5da86f40b599dde8913e404e80d9b7bb0ab944105bf253080e0439a692b6eb -EBUILD virtualgl-9999.ebuild 2712 BLAKE2B d5ae149a1bfa905ff96a6caa40d0daea92e825b70303591595834bb43948bf2994ea6c56c33fc3cf47cec890bbefa7d95b623d2b6bda568dec56f8f897a695fa SHA512 ff1fda99385b88521420c738b0b2467b76dd4b2a6be47b13e8351e246d01cc923b4b87eed53a81e23d72826f27fb24f8b23e86eb9b3541325a25446006649d55 +EBUILD virtualgl-2.6.1-r1.ebuild 2709 BLAKE2B 95b4f319aeae46ee30ddd72eed37956bf465857e25e0397c8837a6e86689c2803513ab2d13385cd7e8ad879a78a5567fc33e3f0070a69d0ad26688c9a0694aed SHA512 2981a1b63d890e16159ae292e70a34e50deb363183eaa9910ff1501a15de61d279eb77bdf2cf5e0fc39100ad7dcff841a07f426eb60f6bf2d0cd5da25e4cdc01 +EBUILD virtualgl-9999.ebuild 2711 BLAKE2B 6e80ffef02dbb840712e2d8767a3de5acde047a119e3550ad341174d7206ebb811b86a2fade4af739a66363d681106811c6b78a55d8e01160d59ee85a58e6cbd SHA512 53dc4e4e1bd74c0866d165e8e76cc36717081408046ebb798cf31abfcca27d0b93048ebb9a66c513a5914a8f455127d89b667ad210696eb849380f85457bcc10 MISC metadata.xml 736 BLAKE2B b0fef33f453e573f7742dff774acdd66aae3a8ed586718eb2c88fb5776c8c8040a94285971022ea52a47a702911a6d0f0f669e0cc8facac09d127a73ab6d083d SHA512 b1d37b1974a1db8cb9080279863708a6c1e50a86114ccfb17540980c178093ae6617b1bdfa470e73899277b44af231e41ec2b28504da5e335c0e34d509457600 diff --git a/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch b/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch deleted file mode 100644 index d5d923f89d1b..000000000000 --- a/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch +++ /dev/null @@ -1,168 +0,0 @@ -Patch modified to apply to VirtualGL 2.5.2, before -1b82bceb3723b24ea5dc32edffbe019a8a37ab39 reformatted whitespace - - -From a974c22141d0ded9ff60a0b903f81e6b484d6ba4 Mon Sep 17 00:00:00 2001 -From: DRC -Date: Mon, 16 Apr 2018 15:06:07 -0500 -Subject: [PATCH] OpenSSL improvements - -- Fix build issues with OpenSSL 1.1 (OpenSSL 1.1 and later no longer - provides CRYPTO_set_locking_callback(), since locking is now performed - internally.) -- Detect whether the platform has /dev/urandom at compile time, rather - than assuming that all Sun and SGI machines don't have it (Solaris 10 - and later supports /dev/urandom.) ---- - ChangeLog.md | 2 ++ - include/Socket.h | 8 ++++++-- - util/CMakeLists.txt | 5 +++++ - util/Socket.cpp | 25 ++++++++++++++++--------- - 4 files changed, 29 insertions(+), 11 deletions(-) - -diff --git a/ChangeLog.md b/ChangeLog.md -index 3632c1d8..5c9bff84 100644 ---- a/ChangeLog.md -+++ b/ChangeLog.md -@@ -52,6 +52,8 @@ a subsequent segfault when VTK tried to call `glBlendFuncSeparate()`. - VirtualGL's implementation of `glXGetVisualFromFBConfig()` now returns NULL - unless the FB config has a corresponding visual on the 3D X server. - -+6. VirtualGL can now be built and run with OpenSSL 1.1. -+ - - 2.5.2 - ===== -diff --git a/include/Socket.h b/include/Socket.h -index dfe45e3a..f7409956 100644 ---- a/include/Socket.h -+++ b/include/Socket.h -@@ -1,6 +1,6 @@ - /* Copyright (C)2004 Landmark Graphics Corporation - * Copyright (C)2005 Sun Microsystems, Inc. -- * Copyright (C)2014, 2016 D. R. Commander -+ * Copyright (C)2014, 2016, 2018 D. R. Commander - * - * This library is free software and may be redistributed and/or modified under - * the terms of the wxWindows Library License, Version 3.1 or (at your option) -@@ -23,7 +23,7 @@ - #endif - #include - #include --#if defined(sun) || defined(sgi) -+#if !defined(HAVE_DEVURANDOM) && !defined(_WIN32) - #include - #endif - #endif -@@ -161,15 +161,19 @@ namespace vglutil - - #ifdef USESSL - -+ #if OPENSSL_VERSION_NUMBER < 0x10100000L - static void lockingCallback(int mode, int type, const char *file, - int line) - { - if(mode&CRYPTO_LOCK) cryptoLock[type].lock(); - else cryptoLock[type].unlock(); - } -+ #endif - - static bool sslInit; -+ #if OPENSSL_VERSION_NUMBER < 0x10100000L - static CriticalSection cryptoLock[CRYPTO_NUM_LOCKS]; -+ #endif - bool doSSL; SSL_CTX *sslctx; SSL *ssl; - - #endif -diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt -index 65ef59e7..ed1dfb39 100644 ---- a/util/CMakeLists.txt -+++ b/util/CMakeLists.txt -@@ -13,6 +13,11 @@ target_link_libraries(bmptest vglutil) - add_executable(pftest pftest.c) - target_link_libraries(pftest vglutil) - -+if(EXISTS /dev/urandom) -+ message(STATUS "Using /dev/urandom for random number generation") -+ add_definitions(-DHAVE_DEVURANDOM) -+endif() -+ - add_library(vglsocket STATIC Socket.cpp) - target_link_libraries(vglsocket vglutil) - if(WIN32) -diff --git a/util/Socket.cpp b/util/Socket.cpp -index 0d230841..b41c25e9 100644 ---- a/util/Socket.cpp -+++ b/util/Socket.cpp -@@ -1,6 +1,6 @@ - /* Copyright (C)2004 Landmark Graphics Corporation - * Copyright (C)2005 Sun Microsystems, Inc. -- * Copyright (C)2014, 2016 D. R. Commander -+ * Copyright (C)2014, 2016, 2018 D. R. Commander - * - * This library is free software and may be redistributed and/or modified under - * the terms of the wxWindows Library License, Version 3.1 or (at your option) -@@ -43,32 +43,37 @@ typedef socklen_t SOCKLEN_T; - - #ifdef USESSL - bool Socket::sslInit=false; -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - CriticalSection Socket::cryptoLock[CRYPTO_NUM_LOCKS]; - #endif -+#endif - CriticalSection Socket::mutex; - int Socket::instanceCount=0; - - - #ifdef USESSL - --static void progressCallback(int p, int n, void *arg) --{ --} -- -- - static EVP_PKEY *newPrivateKey(int bits) - { -+ BIGNUM *bn = NULL; -+ RSA *rsa = NULL; - EVP_PKEY *pk=NULL; - - try - { -+ if(!(bn = BN_new())) _throwssl(); -+ if(!BN_set_word(bn, RSA_F4)) _throwssl(); -+ if(!(rsa = RSA_new())) _throwssl(); -+ if(!RSA_generate_key_ex(rsa, bits, bn, NULL)) _throwssl(); - if(!(pk=EVP_PKEY_new())) _throwssl(); -- if(!EVP_PKEY_assign_RSA(pk, RSA_generate_key(bits, 0x10001, -- progressCallback, NULL))) _throwssl(); -+ if(!EVP_PKEY_assign_RSA(pk, rsa)) _throwssl(); -+ BN_free(bn); - return pk; - } - catch (...) - { -+ if(bn) BN_free(bn); -+ if(rsa) RSA_free(rsa); - if(pk) EVP_PKEY_free(pk); - throw; - } -@@ -147,7 +152,7 @@ Socket::Socket(bool doSSL_) - #ifdef USESSL - if(!sslInit && doSSL) - { -- #if defined(sun) || defined(sgi) -+ #if !defined(HAVE_DEVURANDOM) && !defined(_WIN32) - char buf[128]; int i; - srandom(getpid()); - for(i = 0; i < 128; i++) -@@ -158,7 +163,9 @@ Socket::Socket(bool doSSL_) - SSL_load_error_strings(); - ERR_load_crypto_strings(); - CRYPTO_set_id_callback(Thread::threadID); -+ #if OPENSSL_VERSION_NUMBER < 0x10100000L - CRYPTO_set_locking_callback(lockingCallback); -+ #endif - SSL_library_init(); - sslInit = true; - char *env = NULL; diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild index 90a64046885d..15a2ad641c5e 100644 --- a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild +++ b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild @@ -2,7 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-multilib flag-o-matic multilib systemd + +CMAKE_ECLASS=cmake +inherit cmake-multilib flag-o-matic systemd if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git" @@ -51,7 +53,7 @@ src_prepare() { sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \ server/vglrun.in server/vglgenkey server/vglserver_config || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -68,7 +70,7 @@ src_configure() { -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) ) - cmake-utils_src_configure + cmake_src_configure } multilib_parallel_foreach_abi abi_configure } diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild index baca3aa94532..b1f2ed56343a 100644 --- a/x11-misc/virtualgl/virtualgl-9999.ebuild +++ b/x11-misc/virtualgl/virtualgl-9999.ebuild @@ -2,7 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-multilib flag-o-matic multilib systemd + +CMAKE_ECLASS=cmake +inherit cmake-multilib flag-o-matic systemd if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git" @@ -51,7 +53,7 @@ src_prepare() { sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \ server/vglrun.in server/vglgenkey server/vglserver_config || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -68,7 +70,7 @@ src_configure() { -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) ) - cmake-utils_src_configure + cmake_src_configure } multilib_parallel_foreach_abi abi_configure } -- cgit v1.2.3