wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-04-11 11:47:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vde2: update to 2.3.3.

Browse source
This commit is contained in:
oreo639 2025-03-18 18:19:15 -07:00 • committed by oreo639
parent 72646f8d4b
commit f3471032ee
2 changed files with 7 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
srcpkgs/vde2/patches/vde_cryptcab-compile-against-openssl-1.1.0.patch
View file

@ -1,97 +0,0 @@
Reason: doesn't compile with openssl-1.1.0
Source: Taken from Arch repo
https://raw.githubusercontent.com/archlinux/svntogit-packages/e4ea86ebebfc446113d858542cf23723f1b2a891/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch
edited wto also support LIBRESSL
--- 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 < 0x1010000 || defined LIBRESSL_VERSION_NUMBER
+#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;
}

17
srcpkgs/vde2/template
View file

@ -1,7 +1,7 @@
# Template file for 'vde2'
pkgname=vde2
version=2.3.2
revision=25
version=2.3.3
revision=1
build_style=gnu-configure
configure_args="--disable-static --enable-experimental
--disable-python --enable-kernel-switch"
@ -15,10 +15,10 @@ conf_files="
/etc/vde2/libvdemgmt/sendcmd.rc"
short_desc="Virtual Distributed Ethernet"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"
homepage="http://sourceforge.net/projects/vde/"
distfiles="${SOURCEFORGE_SITE}/vde/vde2-$version.tar.bz2"
checksum=cbea9b7e03097f87a6b5e98b07890d2275848f1fe4b9fcda77b8994148bc9542
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://github.com/virtualsquare/vde-2"
distfiles="https://github.com/virtualsquare/vde-2/archive/refs/tags/v${version}.tar.gz"
checksum=a7d2cc4c3d0c0ffe6aff7eb0029212f2b098313029126dcd12dc542723972379
lib32disabled=yes
disable_parallel_build=yes
@ -27,16 +27,13 @@ pre_configure() {
autoreconf -fi
}
post_install() {
vlicense COPYING.slirpvde
}
libvde2_package() {
short_desc+=" - runtime libraries"
pkg_install() {
vmove usr/lib/*.so.*
}
}
vde2-devel_package() {
depends="libvde2-${version}_${revision}"
short_desc+=" - development files"