subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: net\-misc\/vde\/, net\-misc\/vde\/files\/"

[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/, net-misc/vde/files/

2021-03-18 Thread Adam Feldman

commit: 8b77fed6ae4f0145da7fe9f8ece1544e168a0b61
Author: Adam Feldman  gentoo  org>
AuthorDate: Thu Mar 18 15:54:26 2021 +
Commit: Adam Feldman  gentoo  org>
CommitDate: Thu Mar 18 15:59:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b77fed6

net-misc/vde: Fix compilation with slibtool

Closes: https://bugs.gentoo.org/775272
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Adam Feldman  gentoo.org>

 .../vde/files/vde-2.3.2-slibtool-support.patch | 49 
 net-misc/vde/vde-2.3.2_p20191011-r1.ebuild | 91 ++
 2 files changed, 140 insertions(+)

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
new file mode 100644
index 000..5eeb3a5c902
--- /dev/null
+++ b/net-misc/vde/files/vde-2.3.2-slibtool-support.patch
@@ -0,0 +1,49 @@
+From d11d9dd8b370016a2d10ffd35c450c9f68e578a5 Mon Sep 17 00:00:00 2001
+From: orbea 
+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/vde-2.3.2_p20191011-r1.ebuild 
b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
new file mode 100644
index 000..142f3837ed9
--- /dev/null
+++ b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+if [[ ${PV} ==  ]]; then
+   inherit autotools git-r3
+   EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN;
+   KEYWORDS=""
+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 ~ppc ~ppc64 ~x86"
+
+   S="${WORKDIR}/${MY_PN}-${COMMIT}"
+else
+   MY_P="${PN}2-${PV}"
+   SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
+   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+   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"
+#IUSE="pcap selinux ssl libressl static-libs"
+# upstream switched to wolfssl
+IUSE="pcap selinux static-libs"
+
+COMMON_DEPS="pcap? ( net-libs/libpcap )"
+# upstream switched to wolfssl
+#  ssl? (
+#  !libressl? ( dev-libs/openssl:0= )
+#  libressl? ( dev-libs/libressl:0= )
+#  )"
+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} ==  ]] || [[ ${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
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/, net-misc/vde/files/

2020-04-23 Thread Adam Feldman

commit: 0e66ab37e438f1538495ee7d3049a55c04e95fd9
Author: Adam Feldman  gentoo  org>
AuthorDate: Fri Apr 24 00:56:55 2020 +
Commit: Adam Feldman  gentoo  org>
CommitDate: Fri Apr 24 00:57:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e66ab37

net-misc/vde: Fix typos

Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman  gentoo.org>

 net-misc/vde/files/vde-2.3.2-fix-inline-funcs.patch | 4 ++--
 net-misc/vde/vde-2.3.2-r5.ebuild| 7 +++
 2 files changed, 5 insertions(+), 6 deletions(-)

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.patch
index 5e2102617ca..c1329d0f720 100644
--- 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.patch
@@ -1,7 +1,7 @@
 # Sourced from 
https://raw.githubusercontent.com/OpenMandrivaAssociation/vde2/master/vd2-2.3.2-clang.patch
 
 a/vde2-2.3.2/src/vde_switch/fstp.c 2014-10-29 22:54:18.659988435 +
-+++ b/vde2-2.3.2/src/vde_switch/fstp.c 2014-10-29 22:54:44.912986501 +
+--- 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 

diff --git a/net-misc/vde/vde-2.3.2-r5.ebuild b/net-misc/vde/vde-2.3.2-r5.ebuild
index 54380de4455..227cf9a7d28 100644
--- a/net-misc/vde/vde-2.3.2-r5.ebuild
+++ b/net-misc/vde/vde-2.3.2-r5.ebuild
@@ -29,15 +29,14 @@ RDEPEND="${COMMON_DEPS}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( 
+PATCHES=(
"${FILESDIR}/${P}-format-security.patch"
-   "${FILESDIR}/${P}-fix-inline-funcs.patch
+   "${FILESDIR}/${P}-fix-inline-funcs.patch"
 )
 
 src_prepare() {
default
-   has_version ">=dev-libs/openssl-1.1.0" && \
-   eapply "${FILESDIR}/${P}-openssl-1.1.patch"
+   has_version ">=dev-libs/openssl-1.1.0" && eapply 
"${FILESDIR}/${P}-openssl-1.1.patch"
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/, net-misc/vde/files/

2020-04-23 Thread Adam Feldman

commit: 831d1cc65c3c86a50cfd3a695394d44288e3e494
Author: Adam Feldman  gentoo  org>
AuthorDate: Fri Apr 24 00:19:47 2020 +
Commit: Adam Feldman  gentoo  org>
CommitDate: Fri Apr 24 00:51:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=831d1cc6

net-misc/vde: Drop python bindings and multiple bugfixes

Bug: https://bugs.gentoo.org/705936
Closes: https://bugs.gentoo.org/661818
Closes: https://bugs.gentoo.org/705934
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman  gentoo.org>

 .../vde/files/vde-2.3.2-fix-inline-funcs.patch | 21 +++
 net-misc/vde/vde-2.3.2-r5.ebuild   | 68 ++
 2 files changed, 89 insertions(+)

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.patch
new file mode 100644
index 000..5e2102617ca
--- /dev/null
+++ b/net-misc/vde/files/vde-2.3.2-fix-inline-funcs.patch
@@ -0,0 +1,21 @@
+# Sourced from 
https://raw.githubusercontent.com/OpenMandrivaAssociation/vde2/master/vd2-2.3.2-clang.patch
+
+--- a/vde2-2.3.2/src/vde_switch/fstp.c 2014-10-29 22:54:18.659988435 +
 b/vde2-2.3.2/src/vde_switch/fstp.c 2014-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/vde-2.3.2-r5.ebuild b/net-misc/vde/vde-2.3.2-r5.ebuild
new file mode 100644
index 000..54380de4455
--- /dev/null
+++ b/net-misc/vde/vde-2.3.2-r5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+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 python selinux ssl libressl static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPS="pcap? ( net-libs/libpcap )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl: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.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"
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/, net-misc/vde/files/

2017-09-20 Thread NP Hardass

commit: 5a8034fff6a4ef923daf2076fa0112108774c9a7
Author: NP-Hardass  gentoo  org>
AuthorDate: Wed Sep 20 22:54:30 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Wed Sep 20 23:36:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a8034ff

net-misc/vde: Fix compilation with format-security

Closes: https://bugs.gentoo.org/520306
Bug: https://bugs.gentoo.org/520306
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-misc/vde/files/vde-2.3.2-format-security.patch | 18 ++
 net-misc/vde/vde-2.3.2-r4.ebuild   |  2 ++
 2 files changed, 20 insertions(+)

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
new file mode 100644
index 000..d1cfaa58cb2
--- /dev/null
+++ b/net-misc/vde/files/vde-2.3.2-format-security.patch
@@ -0,0 +1,18 @@
+--- 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/vde-2.3.2-r4.ebuild b/net-misc/vde/vde-2.3.2-r4.ebuild
index f0872a509c6..fe1cc671c9a 100644
--- a/net-misc/vde/vde-2.3.2-r4.ebuild
+++ b/net-misc/vde/vde-2.3.2-r4.ebuild
@@ -31,6 +31,8 @@ RDEPEND="${COMMON_DEPS}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${P}-format-security.patch" )
+
 pkg_setup() {
# default group already used in kqemu
enewgroup qemu

[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/, net-misc/vde/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/, net-misc/vde/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/, net-misc/vde/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/vde/, net-misc/vde/files/

4 matches

Site Navigation

Mail list logo

Footer information