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: Sun, 25 Nov 2018 14:07:47
Message-Id: 1543154853.a2a356041423c1d13e7ab8f350c6af9b99a39fc4.tommy@gentoo
1 commit: a2a356041423c1d13e7ab8f350c6af9b99a39fc4
2 Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 25 14:05:56 2018 +0000
4 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 25 14:07:33 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2a35604
7
8 net-p2p/fms: Version bump, EAPI bump
9
10 Bug: https://bugs.gentoo.org/605540
11 Package-Manager: Portage-2.3.48, Repoman-2.3.12
12 RepoMan-Options: --force
13 Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
14
15 net-p2p/fms/Manifest | 1 +
16 net-p2p/fms/files/fms | 3 +-
17 net-p2p/fms/files/fms-use-system-libs4.patch | 40 +++++++++++++++
18 net-p2p/fms/fms-0.3.80.ebuild | 76 ++++++++++++++++++++++++++++
19 net-p2p/fms/metadata.xml | 3 +-
20 5 files changed, 121 insertions(+), 2 deletions(-)
21
22 diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
23 index f717d08dc01..472d84ae559 100644
24 --- a/net-p2p/fms/Manifest
25 +++ b/net-p2p/fms/Manifest
26 @@ -1 +1,2 @@
27 DIST fms-src-0.3.79.zip 3847775 BLAKE2B e6087ef6e0e22f79e3d399f08ed531e839faf8199bdb3d0c0e148553dd6b7cab9dd35dbc74081a628d4456fadc4f9dd83a7a767f1dab8ac511f94eac1685d2ee SHA512 aa9f505c5ef55b1f462b16de6d870d02dc102fd184cc353c6c6b8a346978a9953b34e878f262f4190a3d15d76c5a37f065c4e5ebdbc0e43a4a5c22d61fa9fba7
28 +DIST fms-src-0.3.80.zip 4583891 BLAKE2B 363fe148c622d999398d2f435f49e312d3bea22ad6b69865a618593616b47b632c1a56bcc8fc75bd40590e3858aad7e3f1d70991a21936e38562e10f1813b49c SHA512 d3aa5eb7d417bb135d88a515702fac9c451054d071374bb7f475add9af7e1fda90f4d9c61569e3e9040b2a241efa7fcc7ecac32a7f652327d15ed8d1ea1418c4
29
30 diff --git a/net-p2p/fms/files/fms b/net-p2p/fms/files/fms
31 index 07f1a055163..d98f3b29e4a 100644
32 --- a/net-p2p/fms/files/fms
33 +++ b/net-p2p/fms/files/fms
34 @@ -1,6 +1,7 @@
35 #!/sbin/openrc-run
36 -# Copyright 1999-2008 Gentoo Foundation
37 +# Copyright 1999-2018 Gentoo Authors
38 # Distributed under the terms of the GNU General Public License v2
39 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/files/fms,v 1.4 2010/03/31 19:19:27 tommy Exp $
40
41 # Check for OpenRC/Baselayout 2 - see bug #270646
42 is_openrc() {
43
44 diff --git a/net-p2p/fms/files/fms-use-system-libs4.patch b/net-p2p/fms/files/fms-use-system-libs4.patch
45 new file mode 100644
46 index 00000000000..fc017ce0023
47 --- /dev/null
48 +++ b/net-p2p/fms/files/fms-use-system-libs4.patch
49 @@ -0,0 +1,40 @@
50 +--- /CMakeLists.txt 2016-06-04 22:18:20.000000000 +0200
51 ++++ /CMakeLists.txt.new 2018-11-25 14:05:45.000000000 +0100
52 +@@ -373,11 +373,17 @@
53 + ENDIF(AUDIO_CAPTCHA)
54 +
55 + IF(FROST_SUPPORT OR FCP_SSL_SUPPORT)
56 +- ADD_SUBDIRECTORY(libs/mbedtls)
57 +- TARGET_LINK_LIBRARIES(fms mbedtls)
58 +- TARGET_LINK_LIBRARIES(fms mbedcrypto)
59 +- TARGET_LINK_LIBRARIES(fms mbedx509)
60 +- INCLUDE_DIRECTORIES(libs/mbedtls/include)
61 ++ FIND_LIBRARY(MBEDTLS_LIBRARY NAMES mbedtls )
62 ++ FIND_LIBRARY(MBEDCRYPTO_LIBRARY NAMES mbedcrypto mbedx509)
63 ++ FIND_LIBRARY(MBEDX509_LIBRARY NAMES mbedx509)
64 ++
65 ++ IF(MBEDTLS_LIBRARY)
66 ++ TARGET_LINK_LIBRARIES(fms ${MBEDTLS_LIBRARY})
67 ++ TARGET_LINK_LIBRARIES(fms ${MBEDCRYPTO_LIBRARY})
68 ++ TARGET_LINK_LIBRARIES(fms ${MBEDX509_LIBRARY})
69 ++ ELSE(MBEDTLS_LIBRARY)
70 ++ MESSAGE(FATAL ERROR: "Could not find mbedtls library.")
71 ++ ENDIF(MBEDTLS_LIBRARY)
72 +
73 + IF(FROST_SUPPORT)
74 + ADD_DEFINITIONS(-DFROST_SUPPORT)
75 +@@ -405,3 +411,14 @@
76 + IF(BUILD_PLUGIN)
77 + ADD_SUBDIRECTORY(plugin)
78 + ENDIF(BUILD_PLUGIN)
79 ++
80 ++MESSAGE(STATUS "<<< Gentoo configuration >>>
81 ++Build type ${CMAKE_BUILD_TYPE}
82 ++Install path ${CMAKE_INSTALL_PREFIX}
83 ++Compiler flags:
84 ++C ${CMAKE_C_FLAGS}
85 ++C++ ${CMAKE_CXX_FLAGS}
86 ++Linker flags:
87 ++Executable ${CMAKE_EXE_LINKER_FLAGS}
88 ++Module ${CMAKE_MODULE_LINKER_FLAGS}
89 ++Shared ${CMAKE_SHARED_LINKER_FLAGS}\n")
90
91 diff --git a/net-p2p/fms/fms-0.3.80.ebuild b/net-p2p/fms/fms-0.3.80.ebuild
92 new file mode 100644
93 index 00000000000..1b85e8e8366
94 --- /dev/null
95 +++ b/net-p2p/fms/fms-0.3.80.ebuild
96 @@ -0,0 +1,76 @@
97 +# Copyright 1999-2018 Gentoo Authors
98 +# Distributed under the terms of the GNU General Public License v2
99 +
100 +EAPI="6"
101 +
102 +inherit eutils cmake-utils user
103 +
104 +DESCRIPTION="A spam-resistant message board application for Freenet"
105 +HOMEPAGE="http://freenetproject.org/tools.html"
106 +SRC_URI="mirror://gentoo/${PN}-src-${PV}.zip"
107 +
108 +LICENSE="GPL-2"
109 +SLOT="0"
110 +KEYWORDS="~amd64 ~x86"
111 +IUSE="frost ssl"
112 +
113 +RDEPEND="virtual/libiconv
114 + frost? ( net-libs/mbedtls )
115 + ssl? ( net-libs/mbedtls )
116 + >=dev-libs/poco-1.4.3_p1
117 + >=dev-db/sqlite-3.6.15"
118 +DEPEND="${RDEPEND}
119 + app-arch/unzip"
120 +
121 +S=${WORKDIR}
122 +PATCHES=( "${FILESDIR}"/${PN}-use-system-libs4.patch )
123 +
124 +pkg_setup() {
125 + enewgroup freenet
126 + enewuser freenet -1 -1 /var/freenet freenet
127 +}
128 +
129 +src_prepare() {
130 + rm -rv libs
131 + edos2unix src/http/pages/showfilepage.cpp
132 + edos2unix CMakeLists.txt
133 +
134 + cmake-utils_src_prepare
135 +}
136 +
137 +src_configure() {
138 + local mycmakeargs=( -DI_HAVE_READ_THE_README=ON \
139 + -DUSE_BUNDLED_SQLITE=OFF \
140 + -DDO_CHARSET_CONVERSION=ON \
141 + -DFROST_SUPPORT=$(use frost && echo ON || echo OFF) \
142 + -DFCP_SSL_SUPPORT=$(use ssl && echo ON || echo OFF) )
143 + cmake-utils_src_configure
144 +}
145 +
146 +src_install() {
147 + insinto /var/freenet/fms
148 + dobin "${CMAKE_BUILD_DIR}"/fms || die
149 + doins *.htm || die "doinstall failed"
150 + doins -r fonts images styles translations || die
151 + fperms -R o-rwx /var/freenet/fms/ /usr/bin/fms
152 + fowners -R freenet:freenet /var/freenet/fms/ /usr/bin/fms
153 + doinitd "${FILESDIR}/fms" || die "installing init.d file failed"
154 + dodoc readme.txt || die "installing doc failed"
155 +}
156 +
157 +pkg_postinst() {
158 + if ! has_version 'net-p2p/freenet' ; then
159 + ewarn "FMS needs a freenet node to up-/download #ssages."
160 + ewarn "Please make sure to have a node you can connect to"
161 + ewarn "or install net-p2p/freenet to get FMS working."
162 + fi
163 + elog "By default, the FMS NNTP server will listen on port 1119,"
164 + elog "and the web configuration interface will be running at"
165 + elog "http://localhost:8080. For more information, read"
166 + elog "${ROOT}usr/share/doc/${PF}/readme.txt.bz2"
167 + if use frost; then
168 + elog " "
169 + elog "You need to enable frost on the config page"
170 + elog "and restart fms for frost support."
171 + fi
172 +}
173
174 diff --git a/net-p2p/fms/metadata.xml b/net-p2p/fms/metadata.xml
175 index 2f2a55f2853..225e6300274 100644
176 --- a/net-p2p/fms/metadata.xml
177 +++ b/net-p2p/fms/metadata.xml
178 @@ -6,6 +6,7 @@
179 <name>Thomas Sachau (Tommy[D])</name>
180 </maintainer>
181 <use>
182 - <flag name="frost">Add support for frost boards</flag>
183 + <flag name='frost'>Add support for frost boards</flag>
184 + <flag name="ssl">Add support for FCP connection over SSL</flag>
185 </use>
186 </pkgmetadata>