Gentoo Archives: gentoo-commits

From: Thomas Sachau <tommy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/fms/, net-p2p/fms/files/
Date: Fri, 29 Oct 2021 09:50:24
Message-Id: 1635501014.14cc2e7dc4add659d0cb9afd60e2a824dd8cc3bf.tommy@gentoo
1 commit: 14cc2e7dc4add659d0cb9afd60e2a824dd8cc3bf
2 Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 29 09:49:38 2021 +0000
4 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 29 09:50:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14cc2e7d
7
8 net-p2p/fms: Add patch for mbedtls-3, fixes bug 804960
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
12
13 net-p2p/fms/files/fms-0.3.83-fix-for-mbedtls-3.patch | 11 +++++++++++
14 net-p2p/fms/fms-0.3.83.ebuild | 6 +++++-
15 2 files changed, 16 insertions(+), 1 deletion(-)
16
17 diff --git a/net-p2p/fms/files/fms-0.3.83-fix-for-mbedtls-3.patch b/net-p2p/fms/files/fms-0.3.83-fix-for-mbedtls-3.patch
18 new file mode 100644
19 index 00000000000..fdc1948abd8
20 --- /dev/null
21 +++ b/net-p2p/fms/files/fms-0.3.83-fix-for-mbedtls-3.patch
22 @@ -0,0 +1,11 @@
23 +--- /include/freenet/fcpv2.h 2016-06-04 18:16:06.000000000 +0200
24 ++++ /include/freenet/fcpv2.h.new 2021-10-29 11:38:04.000000000 +0200
25 +@@ -33,7 +33,7 @@
26 + #endif
27 +
28 + #ifdef FCP_SSL
29 +- #include <mbedtls/net.h>
30 ++ #include <mbedtls/net_sockets.h>
31 + #include <mbedtls/ssl.h>
32 + #include <mbedtls/ctr_drbg.h>
33 + #include <mbedtls/entropy.h>
34
35 diff --git a/net-p2p/fms/fms-0.3.83.ebuild b/net-p2p/fms/fms-0.3.83.ebuild
36 index ca07782f847..4923e850642 100644
37 --- a/net-p2p/fms/fms-0.3.83.ebuild
38 +++ b/net-p2p/fms/fms-0.3.83.ebuild
39 @@ -35,7 +35,10 @@ BDEPEND="
40 virtual/libiconv
41 "
42
43 -PATCHES=( "${FILESDIR}/${PN}-use-system-libs4.patch" )
44 +PATCHES=(
45 + "${FILESDIR}/${PN}-use-system-libs4.patch"
46 + "${FILESDIR}/${P}-fix-for-mbedtls-3.patch"
47 +)
48
49 DOCS=( "readme.txt" )
50
51 @@ -43,6 +46,7 @@ src_prepare() {
52 # Convert encoding due applied patch
53 edos2unix src/http/pages/showfilepage.cpp
54 edos2unix CMakeLists.txt
55 + edos2unix include/freenet/fcpv2.h
56
57 # Remove bundled libs
58 rm -fr libs || die