gentoo resync : 25.04.2020

5 files changed, 266 insertions, 0 deletions

diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 8127f45fec25..329a78482418 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -1,7 +1,12 @@
+AUX vde-2.3.2-fix-inline-funcs-r1.patch 698 BLAKE2B 131ede6fed47cc8e9835604df3d34cd3c679ba717c81d67d292c9da17e1ce6a652412244f8e113a295bc17f08a525de22782dcb3b95aa8df05d768ec6765dc49 SHA512 2e7b16a7fd7cccbc79ac8f1c64e5e22399bbf219b37626b8c700d22e7f1d3b3250cb32cbfbd592743065bc68443b1b0443dedeb731f917de59a0e2568db6cbf4
 AUX vde-2.3.2-format-security.patch 547 BLAKE2B 757f0008ed24eea80225c9e194584f2320fda48ee21c2ce49a3a500ce0700b1475ece3c3826d2a2f42c0abfab20194214b73071a7422b9a86c9c47ac098844d2 SHA512 05d4ef0c8e45a30ccdf24ce65e7b1ed268f7e8da095d20d8743193eef1018bc11cf13996bde32231739d153af9e4b1828bd2073d862e06ac21e7e64b6945cbf4
 AUX vde-2.3.2-openssl-1.1.patch 2739 BLAKE2B 57062de9d624875255a4bb9a77408a356e8832163ce70bdee5f15884dfe641dcdd3f697d0d57340384f4380836c0867edb27b155249b3a54e4369639d72ca783 SHA512 fe7f549917267e025ccc6417b76af7409002a72d0a1e8133dcfde84ab44e954b9fef7c725bf102f7cdd3c1328da06dfe2fb0b309ea454e2094abdcf95b9cee3f
 AUX vde.conf-r1 341 BLAKE2B b61648c4559e7fdc240ce7c82da6a0c0d53c4a94637ab0a4fd0d30e80306e6006c9242b9967f5fa6100c05efe2f4eb317ee55a05fbb3a4d79030fc14ea6ac61b SHA512 5aa5a52fb150f54672465b36dd215dc24e45f60015bf7afc4b376e046093089c656db642a4d8c4a98205cd0c453427e38ecc3c36cab79bf5f9d2936c61c914df
 AUX vde.init-r1 1022 BLAKE2B 3859d94c2e0871998eda1ccdddf88ab01a00a67c86ec9c28710efe8347d302a97fe727fe3d58c61c1c3abda5a5fb401ca12672fe06cbaaa75b1beea1fa6d9281 SHA512 599b3560721b6e31cbcc21e764df772bde2a8bbf131b47ebb575bf31855a53237dd1c265d33f31c91e3115d6f8cb9f94493d2dd6792c8bedb011299d1ed6d8e9
+DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971
 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6
 EBUILD vde-2.3.2-r4.ebuild 1664 BLAKE2B f8da664dc0bffde29dcd6086a6140fa7d890ac3fe505ee2a1cb7e7508d7f635451e867d60bf5a4c1cbdd7082556e15a198ffaaf434028b1c6a8b2a699590a352 SHA512 516232acd5db7ef34b7a1064870a0ad2797525bda33379abbc11a18a29b99e5f86a0fcf7b22d081a99602f15a0d6e94d3688f61c9578ee50a6796e93decf2a36
+EBUILD vde-2.3.2-r6.ebuild 1493 BLAKE2B 92427dfc6e4944951c9af14da684704e8bfea94ef7aa3c60b129b3436633bf5c3cd8f840b7b739c45945a027ca480ffcbeffab8850a79e2f4c9f09aa2f8ac1cf SHA512 c6a2198e062bd497f51bde152bbdddba8afa888dfea45acfd25dc099884be2bf4ff89851773530fd77e41188df28b51afa70cb272adfb959980c4d6234e6a77b
+EBUILD vde-2.3.2_p20191011.ebuild 2190 BLAKE2B e0484281c05d992c02fb27c908a05eddd0b4a62a6cacb7331add7ea5c53702cd3e0006e1c5db17db5df7a54051b5198ad12953f3b1922f44d4acd8387073b34d SHA512 5068cbddcd630a5c87bc021cde9e4fe2a102d997c4bdb7e131ce1d6e8602cf13511e887d45520ace6e1fe74e6e80b327426fb1edc9a04384b5019f5983cbecee
+EBUILD vde-9999.ebuild 2190 BLAKE2B e0484281c05d992c02fb27c908a05eddd0b4a62a6cacb7331add7ea5c53702cd3e0006e1c5db17db5df7a54051b5198ad12953f3b1922f44d4acd8387073b34d SHA512 5068cbddcd630a5c87bc021cde9e4fe2a102d997c4bdb7e131ce1d6e8602cf13511e887d45520ace6e1fe74e6e80b327426fb1edc9a04384b5019f5983cbecee
 MISC metadata.xml 955 BLAKE2B 6e199d64f0af38e233d31f2f91e364f7f01910b9a450d215abc6ad4b5aad0a8d639d7dabea4d76cdf4d8730b4969a0466aa07496cb858ca9581c3c20bd837191 SHA512 06ac79d51fd38f77e4f3840995d228c61923d512e023ab74915030d9ee4ec628669c52d99fb040021ed1452fc5e4ba459a7a29e08fb898b44bd99642e1d7a6d6
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
new file mode 100644
index 000000000000..c1329d0f7207
--- /dev/null
+++ b/net-misc/vde/files/vde-2.3.2-fix-inline-funcs-r1.patch
@@ -0,0 +1,21 @@
+# 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/vde-2.3.2-r6.ebuild b/net-misc/vde/vde-2.3.2-r6.ebuild
new file mode 100644
index 000000000000..3d99e238fb29
--- /dev/null
+++ b/net-misc/vde/vde-2.3.2-r6.ebuild
@@ -0,0 +1,66 @@
+# 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 selinux ssl libressl static-libs"
+
+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-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.ebuild b/net-misc/vde/vde-2.3.2_p20191011.ebuild
new file mode 100644
index 000000000000..b8bb5681a369
--- /dev/null
+++ b/net-misc/vde/vde-2.3.2_p20191011.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 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"
+	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 )"
+
+# 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"
+}
diff --git a/net-misc/vde/vde-9999.ebuild b/net-misc/vde/vde-9999.ebuild
new file mode 100644
index 000000000000..b8bb5681a369
--- /dev/null
+++ b/net-misc/vde/vde-9999.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 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"
+	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 )"
+
+# 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"
+}