[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/, net-misc/vde/
commit: 5b86639e912dd3a6456d83dffafa3350082c0737
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Nov 23 20:58:34 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Nov 23 21:00:30 2022 +
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 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..
--- 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.c2014-10-29 22:54:18.659988435 +
-+++ b/src/vde_switch/fstp.c2014-10-29 22:54:44.912986501 +
-@@ -30,14 +30,14 @@
- #ifdef FSTP
- #include
- /*** 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..
--- a/net-misc/vde/files/vde-2.3.2-format-security.patch
+++ /dev/null
@@ -1,18 +0,0 @@
a/src/common/cmdparse.c2017-09-20 18:47:31.662856695 -0400
-+++ b/src/common/cmdparse.c2017-09-20 18:48:54.008852141 -0400
-@@ -284,13 +284,13 @@
- int i;
- for
(i=0;i='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..
--- 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
-Date: Fri, 2 Sep 2016 19:52:49 +
-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
[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/
commit: a977b7b6ae0ce88c391460a0dd0b8e7ec93bb0b7
Author: Adam Feldman gentoo org>
AuthorDate: Thu Mar 18 16:09:30 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 30 14:35:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a977b7b6
net-misc/vde: Fix typo in initscript
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Adam Feldman gentoo.org>
net-misc/vde/files/vde.init-r1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/vde/files/vde.init-r1 b/net-misc/vde/files/vde.init-r1
index 0934c51f8f4..b1583c338f4 100644
--- a/net-misc/vde/files/vde.init-r1
+++ b/net-misc/vde/files/vde.init-r1
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
command="/usr/bin/vde_switch"
@@ -19,7 +19,7 @@ start_pre() {
start() {
VDE_SOCKET="${VDE_SOCKET:-/run/${RC_SVCNAME}.ctl}"
- ebegin "Starting ${SVC_NAME}"
+ ebegin "Starting ${RC_SVCNAME}"
start-stop-daemon --start --exec ${command} -- \
--pidfile=${pidfile} \
[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/, net-misc/vde/
commit: 8edc61b33e6167b8db41aff4f649150ba98f3763
Author: Adam Feldman gentoo org>
AuthorDate: Fri Apr 24 01:06:25 2020 +
Commit: Adam Feldman gentoo org>
CommitDate: Fri Apr 24 01:06:25 2020 +
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 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() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/, net-misc/vde/
commit: a0bae155d65b5fd1ed4be98f52ec47012d39156a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 6 19:49:16 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed May 8 17:03:37 2019 +
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 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 000..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
+Date: Fri, 2 Sep 2016 19:52:49 +
+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.0 +
b/src/vde_cryptcab/cryptcab.c 2017-03-20 22:54:20.452975075 +
+@@ -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 < 0x1010
++#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 = EVP_CIPHER_CTX_new ();
++ if (!ctx)
++ return -1;
+ ctx_initialized = 1;
+ }
+
+- EVP_EncryptInit (, EVP_bf_cbc (), p->key, p->iv);
+- if (EVP_EncryptUpdate (, dst, , src, len) != 1)
++ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++ if (EVP_EncryptUpdate (ctx, dst, , src, len) != 1)
+ {
+ fprintf (stderr,"error in encrypt update\n");
+ olen = -1;
+ goto cleanup;
+ }
+
+- if (EVP_EncryptFinal (, dst + olen, ) != 1)
++ if (EVP_EncryptFinal (ctx, dst + olen, ) != 1)
+ {
+ fprintf (stderr,"error in encrypt final\n");
+ olen = -1;
+@@ -124,7 +130,7 @@
+ olen += tlen;
+
+ cleanup:
+- EVP_CIPHER_CTX_cleanup();
++ EVP_CIPHER_CTX_reset(ctx);
+ return olen;
+ }
+
+@@ -138,19 +144,21 @@
+ }
+
+ if (!ctx_initialized) {
+- EVP_CIPHER_CTX_init ();
++ ctx = EVP_CIPHER_CTX_new ();
++ if (!ctx)
++ return -1;
+ ctx_initialized = 1;
+ }
+
+- EVP_DecryptInit (, EVP_bf_cbc (), p->key, p->iv);
+- if (EVP_DecryptUpdate (, dst, , src, len) != 1)
++ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++ if (EVP_DecryptUpdate (ctx, dst, , src, len) != 1)
+ {
+ fprintf (stderr,"error in decrypt update\n");
+ olen = -1;
+ goto cleanup;
+ }
+
+- if (EVP_DecryptFinal (, dst + olen, ) != 1)
++ if (EVP_DecryptFinal (ctx, dst + olen, ) != 1)
+ {
+ fprintf (stderr,"error in decrypt final\n");
+ olen = -1;
+@@ -159,7 +167,7 @@
+ olen += tlen;
+
+ cleanup:
+- EVP_CIPHER_CTX_cleanup();
++ 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 \
[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/
commit: acf00ba6dd6a4f9374896d6e30b965f9aa2b85b2
Author: NP-Hardass gentoo org>
AuthorDate: Wed Sep 20 23:35:44 2017 +
Commit: NP Hardass gentoo org>
CommitDate: Wed Sep 20 23:36:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf00ba6
net-misc/vde: Tweak verbosity of init script
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-misc/vde/files/vde.init-r1 | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net-misc/vde/files/vde.init-r1 b/net-misc/vde/files/vde.init-r1
index b2ad548f372..0934c51f8f4 100644
--- a/net-misc/vde/files/vde.init-r1
+++ b/net-misc/vde/files/vde.init-r1
@@ -19,6 +19,8 @@ start_pre() {
start() {
VDE_SOCKET="${VDE_SOCKET:-/run/${RC_SVCNAME}.ctl}"
+ ebegin "Starting ${SVC_NAME}"
+
start-stop-daemon --start --exec ${command} -- \
--pidfile=${pidfile} \
--tap=${VDE_TAP} \
[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/
commit: cf0f407148dc9a70837610f98359dedb993b1b80
Author: NP-Hardass gentoo org>
AuthorDate: Wed Sep 20 22:54:58 2017 +
Commit: NP Hardass gentoo org>
CommitDate: Wed Sep 20 23:36:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf0f4071
net-misc/vde: Drop orphaned files
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-misc/vde/files/vde-2.2.2-gcc43.patch | 60
net-misc/vde/files/vde-2.2.2-gcc53.patch | 66 --
.../files/vde-2.2.2-slirpvde-buffer-overflow.patch | 49
net-misc/vde/files/vde.conf| 10
net-misc/vde/files/vde.init| 25
5 files changed, 210 deletions(-)
diff --git a/net-misc/vde/files/vde-2.2.2-gcc43.patch
b/net-misc/vde/files/vde-2.2.2-gcc43.patch
deleted file mode 100644
index 3b6e7b00385..000
--- a/net-misc/vde/files/vde-2.2.2-gcc43.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -NrU5 vde2-2.2.2.orig/src/kvde_switch/consmgmt.c
vde2-2.2.2/src/kvde_switch/consmgmt.c
vde2-2.2.2.orig/src/kvde_switch/consmgmt.c 2008-09-04 21:14:55.0
+0200
-+++ vde2-2.2.2/src/kvde_switch/consmgmt.c 2008-09-04 21:16:26.0
+0200
-@@ -22,10 +22,11 @@
- #include
- #include
- #include
- #include
- #include
-+#include
-
- #include
- #include
- #include
-
-diff -NrU5 vde2-2.2.2.orig/src/kvde_switch/datasock.c
vde2-2.2.2/src/kvde_switch/datasock.c
vde2-2.2.2.orig/src/kvde_switch/datasock.c 2008-09-04 21:14:55.0
+0200
-+++ vde2-2.2.2/src/kvde_switch/datasock.c 2008-09-04 21:19:59.0
+0200
-@@ -24,10 +24,11 @@
- #include
- #include
- #include
- #define _GNU_SOURCE
- #include
-+#include
-
- #include
- #include
- #include
-
-diff -NrU5 vde2-2.2.2.orig/src/vde_plug2tap.c vde2-2.2.2/src/vde_plug2tap.c
vde2-2.2.2.orig/src/vde_plug2tap.c 2008-09-04 21:14:55.0 +0200
-+++ vde2-2.2.2/src/vde_plug2tap.c 2008-09-04 21:22:23.0 +0200
-@@ -16,10 +16,11 @@
- #include
- #include
- #include
- #define _GNU_SOURCE
- #include
-+#include
-
- #include
- #include
- #include
- #include
-diff -NrU5 vde2-2.2.2.orig/src/wirefilter.c vde2-2.2.2/src/wirefilter.c
vde2-2.2.2.orig/src/wirefilter.c 2008-09-04 21:14:55.0 +0200
-+++ vde2-2.2.2/src/wirefilter.c2008-09-04 21:25:21.0 +0200
-@@ -29,10 +29,11 @@
- #include
- #include
- #include
- #include
- #include
-+#include
-
- #include
- #include
- #include
- #include
diff --git a/net-misc/vde/files/vde-2.2.2-gcc53.patch
b/net-misc/vde/files/vde-2.2.2-gcc53.patch
deleted file mode 100644
index 60fb98cc9a8..000
--- a/net-misc/vde/files/vde-2.2.2-gcc53.patch
+++ /dev/null
@@ -1,66 +0,0 @@
src/slirpvde/misc.c2016-01-02 22:54:35.746094904 -0500
-+++ src/slirpvde/misc.c.old2016-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/files/vde-2.2.2-slirpvde-buffer-overflow.patch
b/net-misc/vde/files/vde-2.2.2-slirpvde-buffer-overflow.patch
deleted file mode 100644
index cc494e16ac4..000
--- a/net-misc/vde/files/vde-2.2.2-slirpvde-buffer-overflow.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d466d77be6ec40d8d7d96050fbee5e17e7c61af9 Mon Sep 17 00:00:00 2001
-From: Ludwig Nussel
[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/, net-misc/vde/
commit: 487449d882b95ff9d88657746ee835553e461a27
Author: NP-Hardass gentoo org>
AuthorDate: Wed Sep 20 21:48:21 2017 +
Commit: NP Hardass gentoo org>
CommitDate: Wed Sep 20 22:20:42 2017 +
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 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 000..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 000..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 000..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"
+}
[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/files/, net-misc/vde/
commit: 8efc88270606d78f64045fff6c70583e5052230e
Author: Nicholas Vinson gmail com>
AuthorDate: Sun Jan 3 04:15:50 2016 +
Commit: Ian Delaney gentoo org>
CommitDate: Sun Jan 3 08:39:29 2016 +
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 000..60fb98c
--- /dev/null
+++ b/net-misc/vde/files/vde-2.2.2-gcc53.patch
@@ -0,0 +1,66 @@
+--- src/slirpvde/misc.c2016-01-02 22:54:35.746094904 -0500
src/slirpvde/misc.c.old2016-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 000..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=2138410_id=95403=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"
+}
