commit: 5b86639e912dd3a6456d83dffafa3350082c0737 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Nov 23 20:58:34 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Nov 23 21:00:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b86639e
net-misc/vde: drop 2.3.2-r6, 2.3.2_p20191011-r1 Closes: https://bugs.gentoo.org/879805 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-misc/vde/Manifest | 2 - .../vde/files/vde-2.3.2-fix-inline-funcs-r1.patch | 21 ----- net-misc/vde/files/vde-2.3.2-format-security.patch | 18 ---- net-misc/vde/files/vde-2.3.2-openssl-1.1.patch | 104 --------------------- .../vde/files/vde-2.3.2-slibtool-support.patch | 49 ---------- net-misc/vde/metadata.xml | 23 ++--- net-misc/vde/vde-2.3.2-r6.ebuild | 62 ------------ net-misc/vde/vde-2.3.2_p20191011-r1.ebuild | 83 ---------------- 8 files changed, 8 insertions(+), 354 deletions(-) diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest index 471d0f18b7d1..60ab1dec5697 100644 --- a/net-misc/vde/Manifest +++ b/net-misc/vde/Manifest @@ -1,3 +1 @@ -DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971 DIST vde-2.3.3.tar.gz 234790 BLAKE2B e3ed7423edc03a6af09967484613c0e2a701f74a4323eeab720cabe9a899120023425527054662ee1dbd207327b7e6dd375bceb4999fd708666df13c08acf348 SHA512 d0495aa700984dcc82f85cf7c8125cc10505a8a077fceec45b7fd2bec9c389966381682842e886469fa49239badd9442403d091c2ae5282685085e8262396387 -DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6 diff --git a/net-misc/vde/files/vde-2.3.2-fix-inline-funcs-r1.patch b/net-misc/vde/files/vde-2.3.2-fix-inline-funcs-r1.patch deleted file mode 100644 index c1329d0f7207..000000000000 --- a/net-misc/vde/files/vde-2.3.2-fix-inline-funcs-r1.patch +++ /dev/null @@ -1,21 +0,0 @@ -# Sourced from https://raw.githubusercontent.com/OpenMandrivaAssociation/vde2/master/vd2-2.3.2-clang.patch - ---- a/src/vde_switch/fstp.c 2014-10-29 22:54:18.659988435 +0000 -+++ b/src/vde_switch/fstp.c 2014-10-29 22:54:44.912986501 +0000 -@@ -30,14 +30,14 @@ - #ifdef FSTP - #include <fstp.h> - /*********************** sending macro used by FSTP & Core ******************/ --void inline ltonstring(unsigned long l,unsigned char *s) { -+void ltonstring(unsigned long l,unsigned char *s) { - s[3]=l; l>>=8; - s[2]=l; l>>=8; - s[1]=l; l>>=8; - s[0]=l; - } - --unsigned long inline nstringtol(unsigned char *s) { -+unsigned long nstringtol(unsigned char *s) { - return (s[0]<<24)+(s[1]<<16)+(s[2]<<8)+s[3]; - } - diff --git a/net-misc/vde/files/vde-2.3.2-format-security.patch b/net-misc/vde/files/vde-2.3.2-format-security.patch deleted file mode 100644 index d1cfaa58cb2f..000000000000 --- a/net-misc/vde/files/vde-2.3.2-format-security.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/common/cmdparse.c 2017-09-20 18:47:31.662856695 -0400 -+++ b/src/common/cmdparse.c 2017-09-20 18:48:54.008852141 -0400 -@@ -284,13 +284,13 @@ - int i; - for (i=0;i<argc;i++) { - if (i) fprintf(mf," "); -- fprintf(mf,argv[i]); -+ fprintf(mf,"%s",argv[i]); - } - } else { - int num=atoi(t); - while (*t >='0' && *t <= '9') t++; - if (num < argc) -- fprintf(mf,argv[num]); -+ fprintf(mf,"%s",argv[num]); - } - } else - fprintf(mf,"%c",*t); 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 deleted file mode 100644 index b490b93350f4..000000000000 --- a/net-misc/vde/files/vde-2.3.2-openssl-1.1.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 5f2c4c7b67617991af65798a4d177ada90f7e463 Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior <sebast...@breakpoint.cc> -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 <sebast...@breakpoint.cc> ---- - 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/files/vde-2.3.2-slibtool-support.patch b/net-misc/vde/files/vde-2.3.2-slibtool-support.patch deleted file mode 100644 index 5eeb3a5c9026..000000000000 --- a/net-misc/vde/files/vde-2.3.2-slibtool-support.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d11d9dd8b370016a2d10ffd35c450c9f68e578a5 Mon Sep 17 00:00:00 2001 -From: orbea <or...@riseup.net> -Date: Wed, 17 Mar 2021 15:14:45 -0700 -Subject: [PATCH] build: Only use -module for libraries. - ---- - src/vde_l3/Makefile.am | 9 +++++++-- - src/vde_router/Makefile.am | 2 +- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/src/vde_l3/Makefile.am b/src/vde_l3/Makefile.am -index 748cb78..855081c 100644 ---- a/src/vde_l3/Makefile.am -+++ b/src/vde_l3/Makefile.am -@@ -1,7 +1,6 @@ -- - moddir = $(pkglibdir)/vde_l3 - --AM_LDFLAGS = -module -avoid-version -export-dynamic -+AM_LDFLAGS = -avoid-version -export-dynamic - AM_LIBTOOLFLAGS = --tag=disable-static - AM_CPPFLAGS = -I$(top_srcdir)/include - -@@ -15,6 +14,12 @@ pfifo_la_SOURCES = pfifo.c vde_buff.h - tbf_la_SOURCES = tbf.c vde_buff.h - bfifo_la_SOURCES = bfifo.c vde_buff.h - -+vde_l3_lib_LDFLAGS = -module -+ -+pfifo_la_LDFLAGS = $(vde_l3_lib_LDFLAGS) -+bfifo_la_LDFLAGS = $(vde_l3_lib_LDFLAGS) -+tbf_la_LDFLAGS = $(vde_l3_lib_LDFLAGS) -+ - pfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la - bfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la - tbf_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la -diff --git a/src/vde_router/Makefile.am b/src/vde_router/Makefile.am -index d872388..d055259 100644 ---- a/src/vde_router/Makefile.am -+++ b/src/vde_router/Makefile.am -@@ -1,7 +1,7 @@ - - moddir = $(pkglibdir)/vde_router - --AM_LDFLAGS = -module -avoid-version -export-dynamic -+AM_LDFLAGS = -avoid-version -export-dynamic - AM_LIBTOOLFLAGS = --tag=disable-static - AM_CPPFLAGS = -I$(top_srcdir)/include - diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml index 8284456aa7c7..2f9b19bd1a72 100644 --- a/net-misc/vde/metadata.xml +++ b/net-misc/vde/metadata.xml @@ -1,19 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="pcap"> - Enable the pcap-based plugin that allows creating a switch against - a real interface. - </flag> - <flag name="ssl"> - Enable the cryptcab plugin that allows creating an encrypted - virtual cable. - </flag> - </use> - <upstream> - <remote-id type="sourceforge">vde</remote-id> - <remote-id type="github">virtualsquare/vde-2</remote-id> - </upstream> + <!-- maintainer-needed --> + <use> + <flag name="pcap">Enable the pcap-based plugin that allows creating a switch against a real interface.</flag> + </use> + <upstream> + <remote-id type="sourceforge">vde</remote-id> + <remote-id type="github">virtualsquare/vde-2</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/vde/vde-2.3.2-r6.ebuild b/net-misc/vde/vde-2.3.2-r6.ebuild deleted file mode 100644 index 3e9c368a8f50..000000000000 --- a/net-misc/vde/vde-2.3.2-r6.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${PN}2-${PV}" - -DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" -SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" -HOMEPAGE="https://virtualsquare.org"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc ppc64 x86" -IUSE="pcap selinux ssl static-libs" - -COMMON_DEPS="pcap? ( net-libs/libpcap ) - ssl? ( dev-libs/openssl:0= ) - " -DEPEND="${COMMON_DEPS}" -RDEPEND="${COMMON_DEPS} - acct-group/qemu - selinux? ( sec-policy/selinux-vde )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${P}-format-security.patch" - "${FILESDIR}/${P}-fix-inline-funcs-r1.patch" -) - -src_prepare() { - default - has_version ">=dev-libs/openssl-1.1.0" && eapply "${FILESDIR}/${P}-openssl-1.1.patch" -} - -src_configure() { - econf \ - --disable-python \ - $(use_enable pcap) \ - $(use_enable ssl cryptcab) \ - $(use_enable static-libs static) -} - -src_compile() { - emake -j1 -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die - - newinitd "${FILESDIR}"/vde.init-r1 vde - newconfd "${FILESDIR}"/vde.conf-r1 vde -} - -pkg_postinst() { - einfo "To start vde automatically add it to the default runlevel:" - einfo "# rc-update add vde default" - einfo "You need to setup tap0 in /etc/conf.d/net" - einfo "To use it as an user be sure to set a group in /etc/conf.d/vde" -} diff --git a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild deleted file mode 100644 index f541ec750c2d..000000000000 --- a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -if [[ ${PV} == 9999 ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN"; -elif [[ ${PV} = *_p* ]]; then - inherit autotools - MY_PN="vde-2" - COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb" - SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64 ~loong ~ppc ppc64 ~riscv x86" - - S="${WORKDIR}/${MY_PN}-${COMMIT}" -else - MY_P="${PN}2-${PV}" - SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" -HOMEPAGE="https://virtualsquare.org"; - -LICENSE="GPL-2" -SLOT="0" -# upstream switched to wolfssl -IUSE="pcap selinux static-libs" - -COMMON_DEPS="pcap? ( net-libs/libpcap )" -DEPEND="${COMMON_DEPS}" -RDEPEND="${COMMON_DEPS} - acct-group/qemu - selinux? ( sec-policy/selinux-vde )" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.2-slibtool-support.patch" -) - -# upstream switched to wolfssl -src_prepare() { - default - if [[ ${PV} == 9999 ]] || [[ ${PV} == *_p* ]]; then - eautoreconf - fi -# upstream switched to wolfssl -# has_version ">=dev-libs/openssl-1.1.0" && \ -# eapply "${FILESDIR}/${PN}-2.3.2-openssl-1.1.patch" -} - -src_configure() { - filter-flags -O0 -Os -# upstream switched to wolfssl -# $(use_enable ssl cryptcab) \ - econf \ - --disable-python \ - --disable-cryptcab \ - $(use_enable pcap) \ - $(use_enable static-libs static) -} - -src_compile() { - # https://github.com/virtualsquare/vde-2/issues/6 - emake -j1 -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die - - newinitd "${FILESDIR}"/vde.init-r1 vde - newconfd "${FILESDIR}"/vde.conf-r1 vde -} - -pkg_postinst() { - einfo "To start vde automatically add it to the default runlevel:" - einfo "# rc-update add vde default" - einfo "You need to setup tap0 in /etc/conf.d/net" - einfo "To use it as an user be sure to set a group in /etc/conf.d/vde" -}
