Gentoo Archives: gentoo-commits

From: Adam Feldman <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/vde/, net-misc/vde/files/
Date: Fri, 24 Apr 2020 00:58:17
Message-Id: 1587689872.0e66ab37e438f1538495ee7d3049a55c04e95fd9.np-hardass@gentoo
1 commit: 0e66ab37e438f1538495ee7d3049a55c04e95fd9
2 Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 24 00:56:55 2020 +0000
4 Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 24 00:57:52 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e66ab37
7
8 net-misc/vde: Fix typos
9
10 Package-Manager: Portage-2.3.96, Repoman-2.3.21
11 Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
12
13 net-misc/vde/files/vde-2.3.2-fix-inline-funcs.patch | 4 ++--
14 net-misc/vde/vde-2.3.2-r5.ebuild | 7 +++----
15 2 files changed, 5 insertions(+), 6 deletions(-)
16
17 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
18 index 5e2102617ca..c1329d0f720 100644
19 --- a/net-misc/vde/files/vde-2.3.2-fix-inline-funcs.patch
20 +++ b/net-misc/vde/files/vde-2.3.2-fix-inline-funcs.patch
21 @@ -1,7 +1,7 @@
22 # Sourced from https://raw.githubusercontent.com/OpenMandrivaAssociation/vde2/master/vd2-2.3.2-clang.patch
23
24 ---- a/vde2-2.3.2/src/vde_switch/fstp.c 2014-10-29 22:54:18.659988435 +0000
25 -+++ b/vde2-2.3.2/src/vde_switch/fstp.c 2014-10-29 22:54:44.912986501 +0000
26 +--- a/src/vde_switch/fstp.c 2014-10-29 22:54:18.659988435 +0000
27 ++++ b/src/vde_switch/fstp.c 2014-10-29 22:54:44.912986501 +0000
28 @@ -30,14 +30,14 @@
29 #ifdef FSTP
30 #include <fstp.h>
31
32 diff --git a/net-misc/vde/vde-2.3.2-r5.ebuild b/net-misc/vde/vde-2.3.2-r5.ebuild
33 index 54380de4455..227cf9a7d28 100644
34 --- a/net-misc/vde/vde-2.3.2-r5.ebuild
35 +++ b/net-misc/vde/vde-2.3.2-r5.ebuild
36 @@ -29,15 +29,14 @@ RDEPEND="${COMMON_DEPS}
37
38 S="${WORKDIR}/${MY_P}"
39
40 -PATCHES=(
41 +PATCHES=(
42 "${FILESDIR}/${P}-format-security.patch"
43 - "${FILESDIR}/${P}-fix-inline-funcs.patch
44 + "${FILESDIR}/${P}-fix-inline-funcs.patch"
45 )
46
47 src_prepare() {
48 default
49 - has_version ">=dev-libs/openssl-1.1.0" && \
50 - eapply "${FILESDIR}/${P}-openssl-1.1.patch"
51 + has_version ">=dev-libs/openssl-1.1.0" && eapply "${FILESDIR}/${P}-openssl-1.1.patch"
52 }
53
54 src_configure() {