From eccb70a7f91b2d22582587f26d1a28bb31408b45 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 18 May 2019 00:10:51 +0100 Subject: gentoo resync : 18.05.2019 --- net-misc/vde/Manifest | 3 +- net-misc/vde/files/vde-2.3.2-openssl-1.1.patch | 104 +++++++++++++++++++++++++ net-misc/vde/vde-2.3.2-r4.ebuild | 12 ++- 3 files changed, 114 insertions(+), 5 deletions(-) create mode 100644 net-misc/vde/files/vde-2.3.2-openssl-1.1.patch (limited to 'net-misc/vde') diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest index 63b5e2778126..c9e6bba3e0f7 100644 --- a/net-misc/vde/Manifest +++ b/net-misc/vde/Manifest @@ -1,6 +1,7 @@ AUX vde-2.3.2-format-security.patch 547 BLAKE2B 757f0008ed24eea80225c9e194584f2320fda48ee21c2ce49a3a500ce0700b1475ece3c3826d2a2f42c0abfab20194214b73071a7422b9a86c9c47ac098844d2 SHA512 05d4ef0c8e45a30ccdf24ce65e7b1ed268f7e8da095d20d8743193eef1018bc11cf13996bde32231739d153af9e4b1828bd2073d862e06ac21e7e64b6945cbf4 +AUX vde-2.3.2-openssl-1.1.patch 2739 BLAKE2B 57062de9d624875255a4bb9a77408a356e8832163ce70bdee5f15884dfe641dcdd3f697d0d57340384f4380836c0867edb27b155249b3a54e4369639d72ca783 SHA512 fe7f549917267e025ccc6417b76af7409002a72d0a1e8133dcfde84ab44e954b9fef7c725bf102f7cdd3c1328da06dfe2fb0b309ea454e2094abdcf95b9cee3f AUX vde.conf-r1 341 BLAKE2B b61648c4559e7fdc240ce7c82da6a0c0d53c4a94637ab0a4fd0d30e80306e6006c9242b9967f5fa6100c05efe2f4eb317ee55a05fbb3a4d79030fc14ea6ac61b SHA512 5aa5a52fb150f54672465b36dd215dc24e45f60015bf7afc4b376e046093089c656db642a4d8c4a98205cd0c453427e38ecc3c36cab79bf5f9d2936c61c914df AUX vde.init-r1 1022 BLAKE2B 3859d94c2e0871998eda1ccdddf88ab01a00a67c86ec9c28710efe8347d302a97fe727fe3d58c61c1c3abda5a5fb401ca12672fe06cbaaa75b1beea1fa6d9281 SHA512 599b3560721b6e31cbcc21e764df772bde2a8bbf131b47ebb575bf31855a53237dd1c265d33f31c91e3115d6f8cb9f94493d2dd6792c8bedb011299d1ed6d8e9 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6 -EBUILD vde-2.3.2-r4.ebuild 1562 BLAKE2B 866cbd2f5cc9416ad467b219d9e5e7d1e0e120cb8d70d38a575f13c57f708db597f630a52387bfb818bf3db9ea31a229c6aae53ea538e301ff093cfa41775e6f SHA512 e965e74ac2b48d5520ce7e89e52fabdd74fb09fdb8faec1c401e1beabe5f61df9961a512675ba720b9001632607bf1be879f64da9b61cb5c65e0ec4f0cd1919d +EBUILD vde-2.3.2-r4.ebuild 1707 BLAKE2B 7bb39766358ca5d9420a02e41fca0602b78d91bad6b16bbde0ab3df98e4b6685779a73dc36ebd1233fc8efd3d3f1d6be041e3d2ce062e00c816ea9e77aa77c9e SHA512 4fd212c1023e3c6eb9759e692808a91a72c425295e9cdd3f7ebe94343d57924873521a16e178163a65827651a8e7e8b28317818699d80563368ba55a2aa23fd2 MISC metadata.xml 955 BLAKE2B 6e199d64f0af38e233d31f2f91e364f7f01910b9a450d215abc6ad4b5aad0a8d639d7dabea4d76cdf4d8730b4969a0466aa07496cb858ca9581c3c20bd837191 SHA512 06ac79d51fd38f77e4f3840995d228c61923d512e023ab74915030d9ee4ec628669c52d99fb040021ed1452fc5e4ba459a7a29e08fb898b44bd99642e1d7a6d6 diff --git a/net-misc/vde/files/vde-2.3.2-openssl-1.1.patch b/net-misc/vde/files/vde-2.3.2-openssl-1.1.patch new file mode 100644 index 000000000000..b490b93350f4 --- /dev/null +++ b/net-misc/vde/files/vde-2.3.2-openssl-1.1.patch @@ -0,0 +1,104 @@ +From 5f2c4c7b67617991af65798a4d177ada90f7e463 Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior +Date: Fri, 2 Sep 2016 19:52:49 +0000 +Subject: [PATCH] vde_cryptcab: compile against openssl 1.1.0 + +Signed-off-by: Sebastian Andrzej Siewior +--- + src/vde_cryptcab/cryptcab.c | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) + +diff --git a/src/vde_cryptcab/cryptcab.c b/src/vde_cryptcab/cryptcab.c +index c5b4474..a2780f1 100644 +--- a/src/vde_cryptcab/cryptcab.c 2011-11-23 16:41:17.000000000 +0000 ++++ b/src/vde_cryptcab/cryptcab.c 2017-03-20 22:54:20.452975075 +0000 +@@ -22,7 +22,7 @@ + exit(1); + } + +-static EVP_CIPHER_CTX ctx; ++static EVP_CIPHER_CTX *ctx; + static int ctx_initialized = 0; + static int encryption_disabled = 0; + static int nfd; +@@ -30,6 +30,10 @@ + static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700}; + static int verbose = 0; + ++#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#define EVP_CIPHER_CTX_reset(x) EVP_CIPHER_CTX_cleanup(x) ++#endif ++ + void vc_printlog(int priority, const char *format, ...) + { + va_list arg; +@@ -103,19 +107,21 @@ + } + + if (!ctx_initialized) { +- EVP_CIPHER_CTX_init (&ctx); ++ ctx = EVP_CIPHER_CTX_new (); ++ if (!ctx) ++ return -1; + ctx_initialized = 1; + } + +- EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); +- if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1) ++ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); ++ if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1) + { + fprintf (stderr,"error in encrypt update\n"); + olen = -1; + goto cleanup; + } + +- if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1) ++ if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1) + { + fprintf (stderr,"error in encrypt final\n"); + olen = -1; +@@ -124,7 +130,7 @@ + olen += tlen; + + cleanup: +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_reset(ctx); + return olen; + } + +@@ -138,19 +144,21 @@ + } + + if (!ctx_initialized) { +- EVP_CIPHER_CTX_init (&ctx); ++ ctx = EVP_CIPHER_CTX_new (); ++ if (!ctx) ++ return -1; + ctx_initialized = 1; + } + +- EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); +- if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1) ++ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); ++ if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1) + { + fprintf (stderr,"error in decrypt update\n"); + olen = -1; + goto cleanup; + } + +- if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1) ++ if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1) + { + fprintf (stderr,"error in decrypt final\n"); + olen = -1; +@@ -159,7 +167,7 @@ + olen += tlen; + + cleanup: +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_reset (ctx); + return olen; + } + diff --git a/net-misc/vde/vde-2.3.2-r4.ebuild b/net-misc/vde/vde-2.3.2-r4.ebuild index 117e2965131b..45c90ec179d6 100644 --- a/net-misc/vde/vde-2.3.2-r4.ebuild +++ b/net-misc/vde/vde-2.3.2-r4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit ltprune python-single-r1 user flag-o-matic +inherit python-single-r1 user flag-o-matic MY_P="${PN}2-${PV}" @@ -36,8 +36,12 @@ PATCHES=( "${FILESDIR}/${P}-format-security.patch" ) pkg_setup() { # default group already used in kqemu enewgroup qemu + use python && python-single-r1_pkg_setup +} - python-single-r1_pkg_setup +src_prepare() { + default + has_version ">=dev-libs/openssl-1.1.0" && eapply "${FILESDIR}/${P}-openssl-1.1.patch" } src_configure() { @@ -55,7 +59,7 @@ src_compile() { src_install() { default - prune_libtool_files + find "${D}" -name '*.la' -type f -delete || die newinitd "${FILESDIR}"/vde.init-r1 vde newconfd "${FILESDIR}"/vde.conf-r1 vde -- cgit v1.2.3