* [gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/, net-misc/vde/
@ 2016-01-03 8:39 Ian Delaney
0 siblings, 0 replies; 5+ messages in thread
From: Ian Delaney @ 2016-01-03 8:39 UTC (permalink / raw
To: gentoo-commits
commit: 8efc88270606d78f64045fff6c70583e5052230e
Author: Nicholas Vinson <nvinson234 <AT> gmail <DOT> com>
AuthorDate: Sun Jan 3 04:15:50 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 3 08:39:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8efc8827
net-misc/vde: Fix for bug #543006
Added vde-2.2.2-gcc53.patch. Starting with GCC 5, GCC uses Std. C semantics for
inline kewords instead of non-compliant GNU C semantics. This patch corrects
the source with respect to the semantic difference.
Package-Manager: portage-2.2.26
net-misc/vde/files/vde-2.2.2-gcc53.patch | 66 ++++++++++++++++++++++++++++++++
net-misc/vde/vde-2.2.2-r1.ebuild | 53 +++++++++++++++++++++++++
2 files changed, 119 insertions(+)
diff --git a/net-misc/vde/files/vde-2.2.2-gcc53.patch b/net-misc/vde/files/vde-2.2.2-gcc53.patch
new file mode 100644
index 0000000..60fb98c
--- /dev/null
+++ b/net-misc/vde/files/vde-2.2.2-gcc53.patch
@@ -0,0 +1,66 @@
+--- src/slirpvde/misc.c 2016-01-02 22:54:35.746094904 -0500
++++ src/slirpvde/misc.c.old 2016-01-02 22:54:33.152132668 -0500
+@@ -120,11 +120,15 @@ getouraddr()
+ struct quehead_32 {
+ u_int32_t qh_link;
+ u_int32_t qh_rlink;
+ };
+
++#ifdef __GNUC_GNU_INLINE__
+ inline void
++#else
++extern inline void
++#endif
+ insque_32(a, b)
+ void *a;
+ void *b;
+ {
+ register struct quehead_32 *element = (struct quehead_32 *) a;
+@@ -134,11 +134,15 @@ insque_32(a, b)
+ element->qh_rlink = (u_int32_t)head;
+ ((struct quehead_32 *)(element->qh_link))->qh_rlink
+ = (u_int32_t)element;
+ }
+
++#ifdef __GNUC_GNU_INLINE__
+ inline void
++#else
++extern inline void
++#endif
+ remque_32(void *a)
+ {
+ register struct quehead_32 *element = (struct quehead_32 *) a;
+ ((struct quehead_32 *)(element->qh_link))->qh_rlink = element->qh_rlink;
+ ((struct quehead_32 *)(element->qh_rlink))->qh_link = element->qh_link;
+@@ -150,11 +150,15 @@ remque_32(void *a)
+ struct quehead {
+ struct quehead *qh_link;
+ struct quehead *qh_rlink;
+ };
+
++#ifdef __GNUC_GNU_INLINE__
+ inline void
++#else
++extern inline void
++#endif
+ insque(a, b)
+ void *a, *b;
+ {
+ register struct quehead *element = (struct quehead *) a;
+ register struct quehead *head = (struct quehead *) b;
+@@ -163,11 +163,15 @@ insque(a, b)
+ element->qh_rlink = (struct quehead *)head;
+ ((struct quehead *)(element->qh_link))->qh_rlink
+ = (struct quehead *)element;
+ }
+
++#ifdef __GNUC_GNU_INLINE__
+ inline void
++#else
++extern inline void
++#endif
+ remque(a)
+ void *a;
+ {
+ register struct quehead *element = (struct quehead *) a;
+ ((struct quehead *)(element->qh_link))->qh_rlink = element->qh_rlink;
diff --git a/net-misc/vde/vde-2.2.2-r1.ebuild b/net-misc/vde/vde-2.2.2-r1.ebuild
new file mode 100644
index 0000000..242951d
--- /dev/null
+++ b/net-misc/vde/vde-2.2.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic user
+
+MY_P="${PN}2-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
+SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
+HOMEPAGE="http://vde.sourceforge.net/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+# The slirpvde-buffer-overflow patch was made by Ludwig Nussel and submitted upstream at
+# http://sourceforge.net/tracker/?func=detail&aid=2138410&group_id=95403&atid=611248
+PATCHES=(
+ "${FILESDIR}/${P}-gcc43.patch"
+ "${FILESDIR}/${P}-slirpvde-buffer-overflow.patch"
+ "${FILESDIR}/${P}-gcc53.patch"
+)
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+ epatch_user
+}
+
+src_configure() {
+ append-cflags $(test-flags-CC -fno-strict-aliasing)
+ econf
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ newinitd "${FILESDIR}"/vde.init vde
+ newconfd "${FILESDIR}"/vde.conf vde
+
+ dodoc INSTALL README
+}
+
+pkg_postinst() {
+ # default group already used in kqemu
+ enewgroup qemu
+ 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 a user be sure to set a group in /etc/conf.d/vde"
+ einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts"
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/, net-misc/vde/
@ 2017-09-20 22:20 NP Hardass
0 siblings, 0 replies; 5+ messages in thread
From: NP Hardass @ 2017-09-20 22:20 UTC (permalink / raw
To: gentoo-commits
commit: 487449d882b95ff9d88657746ee835553e461a27
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 20 21:48:21 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Sep 20 22:20:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=487449d8
net-misc/vde: Revbump to 2.3.2-r4, EAPI bump
Acked-By: mjo <AT> gentoo.org
Bug: https://bugs.gentoo.org/603382
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-misc/vde/files/vde.conf-r1 | 15 +++++++++
net-misc/vde/files/vde.init-r1 | 42 +++++++++++++++++++++++++
net-misc/vde/vde-2.3.2-r4.ebuild | 66 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 123 insertions(+)
diff --git a/net-misc/vde/files/vde.conf-r1 b/net-misc/vde/files/vde.conf-r1
new file mode 100644
index 00000000000..856bde8ea2b
--- /dev/null
+++ b/net-misc/vde/files/vde.conf-r1
@@ -0,0 +1,15 @@
+# load the tun module
+VDE_MODPROBE_TUN="yes"
+
+# virtual tap networking device to be used for vde
+VDE_TAP="tap0"
+
+# The group that will have access to the VDE control socket.
+VDE_GROUP="qemu"
+
+# VDE socket location (default: /run/${RC_SVCNAME}.ctl)
+VDE_SOCKET=""
+
+# Additional options passed to the vde_switch daemon.
+#VDE_OPTS=""
+VDE_OPTS=""
\ No newline at end of file
diff --git a/net-misc/vde/files/vde.init-r1 b/net-misc/vde/files/vde.init-r1
new file mode 100644
index 00000000000..b2ad548f372
--- /dev/null
+++ b/net-misc/vde/files/vde.init-r1
@@ -0,0 +1,42 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/vde_switch"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+ after net.${VDE_TAP}
+}
+
+start_pre() {
+ [ "${VDE_MODPROBE_TUN}" = "yes" ] || return 0
+ modprobe tun
+}
+
+# We have to use start() because the shortform uses --pidfile for s-s-d --start
+# which causes s-s-d to check the pid file before it exists
+start() {
+ VDE_SOCKET="${VDE_SOCKET:-/run/${RC_SVCNAME}.ctl}"
+
+ start-stop-daemon --start --exec ${command} -- \
+ --pidfile=${pidfile} \
+ --tap=${VDE_TAP} \
+ --group=${VDE_GROUP} \
+ --mode=660 \
+ --dirmode=770 \
+ --sock=${VDE_SOCKET} \
+ --daemon \
+ ${VDE_OPTS}
+ ewaitfile 10 "${VDE_SOCKET}"
+
+ eend $? "Failed to start ${RC_SVCNAME}"
+}
+
+stop_post() {
+ [ "${VDE_MODPROBE_TUN}" = "yes" ] && modprobe --quiet --remove tun
+
+ # Don't fail to stop the service if the "tun" module in use
+ # and the above "modprobe -r" command fails.
+ return 0
+}
diff --git a/net-misc/vde/vde-2.3.2-r4.ebuild b/net-misc/vde/vde-2.3.2-r4.ebuild
new file mode 100644
index 00000000000..105d24c63bf
--- /dev/null
+++ b/net-misc/vde/vde-2.3.2-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ltprune python-single-r1 user
+
+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="http://vde.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="pcap python selinux ssl libressl static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPS="pcap? ( net-libs/libpcap )
+ python? ( ${PYTHON_DEPS} )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${COMMON_DEPS}"
+RDEPEND="${COMMON_DEPS}
+ selinux? ( sec-policy/selinux-vde )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ # default group already used in kqemu
+ enewgroup qemu
+
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ econf \
+ $(use_enable pcap) \
+ $(use_enable python) \
+ $(use_enable ssl cryptcab) \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ default
+ prune_libtool_files
+
+ 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"
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/, net-misc/vde/
@ 2019-05-08 17:05 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-05-08 17:05 UTC (permalink / raw
To: gentoo-commits
commit: a0bae155d65b5fd1ed4be98f52ec47012d39156a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 6 19:49:16 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 8 17:03:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0bae155
net-misc/vde: Fix build with >=dev-libs/openssl-1.1
Closes: https://bugs.gentoo.org/673928
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-misc/vde/files/vde-2.3.2-openssl-1.1.patch | 104 +++++++++++++++++++++++++
net-misc/vde/vde-2.3.2-r4.ebuild | 5 ++
2 files changed, 109 insertions(+)
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 00000000000..b490b93350f
--- /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 <sebastian@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 <sebastian@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/vde-2.3.2-r4.ebuild b/net-misc/vde/vde-2.3.2-r4.ebuild
index f5df46fa334..93a75bf2b54 100644
--- a/net-misc/vde/vde-2.3.2-r4.ebuild
+++ b/net-misc/vde/vde-2.3.2-r4.ebuild
@@ -39,6 +39,11 @@ pkg_setup() {
use python && 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() {
filter-flags -O0 -Os
econf \
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/, net-misc/vde/
@ 2020-04-24 1:08 Adam Feldman
0 siblings, 0 replies; 5+ messages in thread
From: Adam Feldman @ 2020-04-24 1:08 UTC (permalink / raw
To: gentoo-commits
commit: 8edc61b33e6167b8db41aff4f649150ba98f3763
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 01:06:25 2020 +0000
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 01:06:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edc61b3
net-misc/vde: Swap out Mandriva patch for upstream backport
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
...2.3.2-fix-inline-funcs.patch => vde-2.3.2-fix-inline-funcs-r1.patch} | 0
net-misc/vde/{vde-2.3.2-r5.ebuild => vde-2.3.2-r6.ebuild} | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/vde/files/vde-2.3.2-fix-inline-funcs.patch b/net-misc/vde/files/vde-2.3.2-fix-inline-funcs-r1.patch
similarity index 100%
rename from net-misc/vde/files/vde-2.3.2-fix-inline-funcs.patch
rename to net-misc/vde/files/vde-2.3.2-fix-inline-funcs-r1.patch
diff --git a/net-misc/vde/vde-2.3.2-r5.ebuild b/net-misc/vde/vde-2.3.2-r6.ebuild
similarity index 97%
rename from net-misc/vde/vde-2.3.2-r5.ebuild
rename to net-misc/vde/vde-2.3.2-r6.ebuild
index 227cf9a7d28..c872dce076b 100644
--- a/net-misc/vde/vde-2.3.2-r5.ebuild
+++ b/net-misc/vde/vde-2.3.2-r6.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${P}-format-security.patch"
- "${FILESDIR}/${P}-fix-inline-funcs.patch"
+ "${FILESDIR}/${P}-fix-inline-funcs-r1.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/, net-misc/vde/
@ 2022-11-23 21:18 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2022-11-23 21:18 UTC (permalink / raw
To: gentoo-commits
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 <sebastian@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 <sebastian@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 <orbea@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"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-11-23 21:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-20 22:20 [gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/, net-misc/vde/ NP Hardass
-- strict thread matches above, loose matches on Subject: below --
2022-11-23 21:18 Andreas Sturmlechner
2020-04-24 1:08 Adam Feldman
2019-05-08 17:05 Andreas Sturmlechner
2016-01-03 8:39 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox