git: 17ae8ac44741 - main - net/vde2: update to 2.3.3 release (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 02 Jul 2022 21:31:16 UTC
The branch main has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=17ae8ac447413deb6594a0681d426fe21000caf4
commit 17ae8ac447413deb6594a0681d426fe21000caf4
Author: Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-07-02 21:28:11 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2022-07-02 21:31:01 +0000
net/vde2: update to 2.3.3 release (+)
Upstream switched to GitHub
Cryptcab support now require WolfSSL instead of OpenSSL
PR: 264824
---
net/vde2/Makefile | 35 +++----
net/vde2/distinfo | 5 +-
net/vde2/files/patch-src__dpipe.c | 6 +-
net/vde2/files/patch-src_vde__cryptcab_cryptcab.c | 110 ----------------------
net/vde2/files/patch-src_vde__l3_vde__l3.c | 23 -----
net/vde2/files/patch-src_vde__switch_fstp.c | 18 ----
net/vde2/pkg-plist | 16 +---
7 files changed, 28 insertions(+), 185 deletions(-)
diff --git a/net/vde2/Makefile b/net/vde2/Makefile
index 1575df2edb7f..f5e428173460 100644
--- a/net/vde2/Makefile
+++ b/net/vde2/Makefile
@@ -1,10 +1,11 @@
# Created by: Philip M. Gollucci <ports@FreeBSD.org>
-PORTNAME= vde2
-PORTVERSION= 2.3.2
-PORTREVISION= 5
+PORTNAME= vde
+PORTVERSION= 2.3.3
+DISTVERSIONPREFIX= v
CATEGORIES= net
-MASTER_SITES= SF/vde/${PORTNAME}/${PORTVERSION}
+#MASTER_SITES= https://github.com/virtualsquare/vde-2/archive/refs/tags/
+PKGNAMESUFFIX= 2
MAINTAINER= ports@FreeBSD.org
COMMENT= User-mode virtual ethernet infrastructure
@@ -14,32 +15,32 @@ LICENSE_COMB= multi
LIB_DEPENDS= libpcap.so.1:net/libpcap
-USES= gmake libtool pathfix shebangfix ssl
+USES= autoreconf gmake libtool pathfix shebangfix ssl
USE_LDCONFIG= yes
+USE_GITHUB= yes
+GH_ACCOUNT= virtualsquare
+GH_PROJECT= ${PORTNAME}-${PKGNAMESUFFIX}
+
CONFLICTS= vde
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-SHEBANG_FILES= src/lib/python/VdePlug.py
MAKE_ENV= V=1
MAKE_JOBS_UNSAFE=yes
-OPTIONS_DEFINE= PYTHON
-OPTIONS_DEFAULT= PYTHON
-
+OPTIONS_DEFINE= CRYPTCAB
OPTIONS_SUB= yes
-PYTHON_CONFIGURE_OFF= --disable-python
-PYTHON_USES= python:3.7-3.9 gettext-runtime
-PYTHON_CPPFLAGS= -I${LOCALBASE}/include
-PYTHON_LDFLAGS= -L${LOCALBASE}/lib
+
+CRYPTCAB_DESC= Enable vde_cryptcab (require security/wolfssl)
+CRYPTCAB_LIB_DEPENDS= libwolfssl.so:security/wolfssl
+CRYPTCAB_USES= localbase:ldflags
+CRYPTCAB_CONFIGURE_ENABLE= cryptcab
post-patch:
@${REINPLACE_CMD} -e '/-Wall/s|-O2||g' \
- ${WRKSRC}/configure
+ ${WRKSRC}/configure.ac
@${REINPLACE_CMD} -e 's|$$(MAKE).*install-data-hook||g' \
- ${WRKSRC}/man/Makefile.in
- @${REINPLACE_CMD} -e 's|^AM_CFLAGS|#AM_CFLAGS|g' \
- ${WRKSRC}/src/slirpvde/Makefile.in
+ ${WRKSRC}/man/Makefile.am
post-install:
${LN} -sf unixcmd.1 ${STAGEDIR}${PREFIX}/man/man1/vdecmd.1
diff --git a/net/vde2/distinfo b/net/vde2/distinfo
index 7c286f9aec77..28356695093a 100644
--- a/net/vde2/distinfo
+++ b/net/vde2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (vde2-2.3.2.tar.gz) = 22df546a63dac88320d35d61b7833bbbcbef13529ad009c7ce3c5cb32250af93
-SIZE (vde2-2.3.2.tar.gz) = 770257
+TIMESTAMP = 1656794898
+SHA256 (virtualsquare-vde-2-v2.3.3_GH0.tar.gz) = a7d2cc4c3d0c0ffe6aff7eb0029212f2b098313029126dcd12dc542723972379
+SIZE (virtualsquare-vde-2-v2.3.3_GH0.tar.gz) = 234790
diff --git a/net/vde2/files/patch-src__dpipe.c b/net/vde2/files/patch-src__dpipe.c
index 5d995cbdf900..ccd58f38cd38 100644
--- a/net/vde2/files/patch-src__dpipe.c
+++ b/net/vde2/files/patch-src__dpipe.c
@@ -4,8 +4,8 @@
if (daemonize != 0)
daemon(0,0);
-- else if (setpgrp() != 0) {
-+ else if (setpgrp(0,getpid()) != 0) {
+- else if (setpgrp() == -1) {
++ else if (setpgrp(0,getpid()) == -1) {
fprintf(stderr,"Err: cannot create pgrp\n");
+ perror("setpgrp");
exit(1);
- }
diff --git a/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c b/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c
deleted file mode 100644
index 9104fcfc4b9f..000000000000
--- a/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c
+++ /dev/null
@@ -1,110 +0,0 @@
---- src/vde_cryptcab/cryptcab.c.orig 2011-11-23 16:41:17 UTC
-+++ src/vde_cryptcab/cryptcab.c
-@@ -22,7 +22,11 @@ static void Usage(char *programname)
- exit(1);
- }
-
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
-+static EVP_CIPHER_CTX *ctx;
-+#else
- static EVP_CIPHER_CTX ctx;
-+#endif
- static int ctx_initialized = 0;
- static int encryption_disabled = 0;
- static int nfd;
-@@ -103,19 +107,33 @@ int data_encrypt(unsigned char *src, unsigned char *ds
- }
-
- if (!ctx_initialized) {
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
-+ ctx = EVP_CIPHER_CTX_new();
-+ EVP_CIPHER_CTX_init (ctx);
-+#else
- EVP_CIPHER_CTX_init (&ctx);
-+#endif
- ctx_initialized = 1;
- }
-
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
-+ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
-+ if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1)
-+#else
- EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
- if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1)
-+#endif
- {
- fprintf (stderr,"error in encrypt update\n");
- olen = -1;
- goto cleanup;
- }
-
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
-+ if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1)
-+#else
- if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1)
-+#endif
- {
- fprintf (stderr,"error in encrypt final\n");
- olen = -1;
-@@ -124,7 +142,12 @@ int data_encrypt(unsigned char *src, unsigned char *ds
- olen += tlen;
-
- cleanup:
-- EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
-+ EVP_CIPHER_CTX_cleanup(ctx);
-+ EVP_CIPHER_CTX_free(ctx);
-+#else
-+ EVP_CIPHER_CTX_cleanup(&ctx);
-+#endif
- return olen;
- }
-
-@@ -138,19 +161,33 @@ int data_decrypt(unsigned char *src, unsigned char *ds
- }
-
- if (!ctx_initialized) {
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
-+ ctx = EVP_CIPHER_CTX_new();
-+ EVP_CIPHER_CTX_init(ctx);
-+#else
- EVP_CIPHER_CTX_init (&ctx);
-+#endif
- ctx_initialized = 1;
- }
-
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
-+ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
-+ if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1)
-+#else
- EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
- if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1)
-+#endif
- {
- fprintf (stderr,"error in decrypt update\n");
- olen = -1;
- goto cleanup;
- }
-
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
-+ if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1)
-+#else
- if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1)
-+#endif
- {
- fprintf (stderr,"error in decrypt final\n");
- olen = -1;
-@@ -159,7 +196,12 @@ int data_decrypt(unsigned char *src, unsigned char *ds
- olen += tlen;
-
- cleanup:
-- EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
-+ EVP_CIPHER_CTX_cleanup(ctx);
-+ EVP_CIPHER_CTX_free(ctx);
-+#else
-+ EVP_CIPHER_CTX_cleanup(&ctx);
-+#endif
- return olen;
- }
-
diff --git a/net/vde2/files/patch-src_vde__l3_vde__l3.c b/net/vde2/files/patch-src_vde__l3_vde__l3.c
deleted file mode 100644
index 62a552d23e00..000000000000
--- a/net/vde2/files/patch-src_vde__l3_vde__l3.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/vde_l3/vde_l3.c.orig 2021-02-23 10:35:14 UTC
-+++ src/vde_l3/vde_l3.c
-@@ -99,17 +99,19 @@ struct routing_policy unlimited_fifo_routing_policy ={
- .policy_init = ufifo_init
- };
-
--
-+static
- inline struct vde_ethernet_header *ethhead(struct vde_buff *vdb)
- {
- return (struct vde_ethernet_header*)(vdb->data);
- }
-
-+static
- inline struct iphdr *iphead(struct vde_buff *vdb)
- {
- return (struct iphdr*)(vdb->data + 14);
- }
-
-+static
- inline void *payload(struct vde_buff *vdb)
- {
- return (uint8_t*)(vdb->data + 14 + sizeof(struct iphdr));
diff --git a/net/vde2/files/patch-src_vde__switch_fstp.c b/net/vde2/files/patch-src_vde__switch_fstp.c
deleted file mode 100644
index 612da3f11eb0..000000000000
--- a/net/vde2/files/patch-src_vde__switch_fstp.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/vde_switch/fstp.c.orig 2021-02-23 10:19:12 UTC
-+++ src/vde_switch/fstp.c
-@@ -30,6 +30,7 @@ static int numports;
- #ifdef FSTP
- #include <fstp.h>
- /*********************** sending macro used by FSTP & Core ******************/
-+static
- void inline ltonstring(unsigned long l,unsigned char *s) {
- s[3]=l; l>>=8;
- s[2]=l; l>>=8;
-@@ -37,6 +38,7 @@ void inline ltonstring(unsigned long l,unsigned char *
- s[0]=l;
- }
-
-+static
- unsigned long inline nstringtol(unsigned char *s) {
- return (s[0]<<24)+(s[1]<<16)+(s[2]<<8)+s[3];
- }
diff --git a/net/vde2/pkg-plist b/net/vde2/pkg-plist
index 05638b12fa0f..4a8c65d3c2ee 100644
--- a/net/vde2/pkg-plist
+++ b/net/vde2/pkg-plist
@@ -1,19 +1,14 @@
bin/dpipe
-bin/slirpvde
bin/unixcmd
-bin/unixterm
bin/vde_autolink
-bin/vde_cryptcab
-bin/vde_l3
+%%CRYPTCAB%%bin/vde_cryptcab
bin/vde_over_ns
bin/vde_pcapplug
bin/vde_plug
bin/vde_plug2tap
+bin/vde_router
bin/vde_switch
bin/vdecmd
-bin/vdekvm
-bin/vdeq
-bin/vdeqemu
bin/vdeterm
bin/wirefilter
etc/vde2/libvdemgmt/asyncrecv.rc
@@ -42,11 +37,6 @@ lib/libvdesnmp.a
lib/libvdesnmp.so
lib/libvdesnmp.so.0
lib/libvdesnmp.so.0.0.1
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/VdePlug.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vdeplug_python.so
-lib/vde2/vde_l3/bfifo.so
-lib/vde2/vde_l3/pfifo.so
-lib/vde2/vde_l3/tbf.so
libdata/pkgconfig/vdehist.pc
libdata/pkgconfig/vdemgmt.pc
libdata/pkgconfig/vdeplug.pc
@@ -62,7 +52,9 @@ man/man1/vde_over_ns.1.gz
man/man1/vde_pcapplug.1.gz
man/man1/vde_plug.1.gz
man/man1/vde_plug2tap.1.gz
+man/man1/vde_router.1.gz
man/man1/vde_switch.1.gz
+man/man1/vde_vxlan.1.gz
man/man1/vdecmd.1.gz
man/man1/vdekvm.1.gz
man/man1/vdeq.1.gz