Gentoo Archives: gentoo-commits

From: Quentin Retornaz <gentoo@××××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/libressl:master commit in: net-vpn/i2pd/files/, net-vpn/i2pd/
Date: Sun, 03 Jul 2022 17:47:38
Message-Id: 1656870421.8a9c5f3c69f142af11b7099caa576f875e2e46b2.quentin@gentoo
1 commit: 8a9c5f3c69f142af11b7099caa576f875e2e46b2
2 Author: orbea <orbea <AT> riseup <DOT> net>
3 AuthorDate: Sun Jul 3 03:16:07 2022 +0000
4 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
5 CommitDate: Sun Jul 3 17:47:01 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=8a9c5f3c
7
8 net-vpn/i2pd: Remove package
9
10 Works with libressl-3.5.x and i2pd-2.42.1::gentoo.
11
12 Signed-off-by: orbea <orbea <AT> riseup.net>
13 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
14
15 net-vpn/i2pd/Manifest | 1 -
16 net-vpn/i2pd/files/99i2pd | 1 -
17 net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate | 13 -----
18 net-vpn/i2pd/files/i2pd-2.38.0.service | 37 ------------
19 net-vpn/i2pd/files/i2pd-2.39.0.initd | 52 -----------------
20 net-vpn/i2pd/files/i2pd-2.41.0-libressl.patch | 20 -------
21 net-vpn/i2pd/files/i2pd-2.6.0-r3.confd | 12 ----
22 net-vpn/i2pd/i2pd-2.41.0.ebuild | 83 ---------------------------
23 net-vpn/i2pd/metadata.xml | 24 --------
24 9 files changed, 243 deletions(-)
25
26 diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
27 deleted file mode 100644
28 index 6f0b942..0000000
29 --- a/net-vpn/i2pd/Manifest
30 +++ /dev/null
31 @@ -1 +0,0 @@
32 -DIST i2pd-2.41.0.tar.gz 594453 BLAKE2B 36298133f057152445d3f7c83c9983d1e16476066f0139019faf0168142cb8dbed150eccee1e006c0a9f1b67670855fdb38513e8d7992e05122b581890b036a5 SHA512 10ba77d714e4b02f9640c64b16b597550f71bfacf02242bd17cfdc7fc416e0e9bc62a2f1da486161baea397dae3d260fa88359325062b1c587f509058d418d85
33
34 diff --git a/net-vpn/i2pd/files/99i2pd b/net-vpn/i2pd/files/99i2pd
35 deleted file mode 100644
36 index 3cf3b46..0000000
37 --- a/net-vpn/i2pd/files/99i2pd
38 +++ /dev/null
39 @@ -1 +0,0 @@
40 -CONFIG_PROTECT="/var/lib/i2pd/certificates"
41
42 diff --git a/net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate b/net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate
43 deleted file mode 100644
44 index 9245bca..0000000
45 --- a/net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate
46 +++ /dev/null
47 @@ -1,13 +0,0 @@
48 -/var/log/i2pd.log {
49 - rotate 4
50 - weekly
51 - missingok
52 - notifempty
53 - create 640 i2pd i2pd
54 - postrotate
55 - if [ -f /run/i2pd/i2pd.pid ]; then
56 - /bin/kill -HUP $(/bin/cat /run/i2pd/i2pd.pid)
57 - fi
58 - endscript
59 -}
60 -
61
62 diff --git a/net-vpn/i2pd/files/i2pd-2.38.0.service b/net-vpn/i2pd/files/i2pd-2.38.0.service
63 deleted file mode 100644
64 index 99c1bf2..0000000
65 --- a/net-vpn/i2pd/files/i2pd-2.38.0.service
66 +++ /dev/null
67 @@ -1,37 +0,0 @@
68 -[Unit]
69 -Description=C++ daemon for accessing the I2P network
70 -After=network.target
71 -
72 -[Service]
73 -Type=forking
74 -Restart=on-abnormal
75 -User=i2pd
76 -Group=i2pd
77 -LimitNOFILE=4096
78 -
79 -# restrictions
80 -ProtectSystem=full
81 -ProtectHome=yes
82 -ProtectControlGroups=yes
83 -ProtectKernelLogs=yes
84 -ProtectKernelModules=yes
85 -ProtectKernelTunables=yes
86 -ProtectClock=yes
87 -PrivateUsers=yes
88 -PrivateDevices=yes
89 -PrivateTmp=yes
90 -RestrictNamespaces=yes
91 -RestrictSUIDSGID=yes
92 -CapabilityBoundingSet=
93 -NoNewPrivileges=yes
94 -
95 -RuntimeDirectory=i2pd
96 -RuntimeDirectoryMode=0700
97 -PIDFile=/run/i2pd/i2pd.pid
98 -ExecStartPre=+/bin/touch /var/log/i2pd.log
99 -ExecStartPre=+/bin/chown i2pd:i2pd /var/log/i2pd.log
100 -ExecStartPre=+/bin/chmod 600 /var/log/i2pd.log
101 -ExecStart=/usr/bin/i2pd --daemon --service --pidfile=${RUNTIME_DIRECTORY}/i2pd.pid --log=file --logfile=/var/log/i2pd.log --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf
102 -
103 -[Install]
104 -WantedBy=multi-user.target
105
106 diff --git a/net-vpn/i2pd/files/i2pd-2.39.0.initd b/net-vpn/i2pd/files/i2pd-2.39.0.initd
107 deleted file mode 100644
108 index fb4e033..0000000
109 --- a/net-vpn/i2pd/files/i2pd-2.39.0.initd
110 +++ /dev/null
111 @@ -1,52 +0,0 @@
112 -#!/sbin/openrc-run
113 -# Copyright 1999-2021 Gentoo Authors
114 -# Distributed under the terms of the GNU General Public License v2
115 -
116 -description="C++ daemon for accessing the I2P network"
117 -description_graceful="Graceful shutdown, takes 10 minutes"
118 -
119 -command="/usr/bin/i2pd"
120 -command_args="${I2PD_OPTIONS}"
121 -user="${I2PD_USER}:${I2PD_GROUP}"
122 -start_stop_daemon_args="
123 - --user \"${user}\"
124 - --pidfile \"${I2PD_PID}\"
125 - --progress
126 -"
127 -retry="SIGTERM/20/SIGKILL/20"
128 -
129 -I2PD_PID_DIR=$(dirname "${I2PD_PID}")
130 -
131 -extra_started_commands="graceful"
132 -
133 -depend() {
134 - use dns logger netmount
135 -}
136 -
137 -start_pre() {
138 - if [ -z "${I2PD_USER}" ] || \
139 - [ -z "${I2PD_GROUP}" ] || \
140 - [ -z "${I2PD_PID}" ] || \
141 - [ -z "${I2PD_LOG}" ] || \
142 - [ -z "${I2PD_OPTIONS}" ] ; then
143 - eerror "Not all variables I2PD_USER, I2PD_GROUP, I2PD_PID, I2PD_OPTIONS, I2PD_LOG are defined."
144 - eerror "Check your /etc/conf.d/i2pd."
145 - return 1
146 - fi
147 - checkpath -f -o "${user}" "${I2PD_LOG}"
148 - checkpath -d -m 0750 -o "${user}" "${I2PD_PID_DIR}"
149 -}
150 -
151 -stop_post() {
152 - # #808845
153 - rm -f "${I2PD_PID}"
154 -}
155 -
156 -graceful() {
157 - # on SIGINT, i2pd stops accepting tunnels and shuts down in 600 seconds
158 - ebegin "Gracefully stopping i2pd, this takes 10 minutes"
159 - mark_service_stopping
160 - eval start-stop-daemon --stop ${start_stop_daemon_args} \
161 - --exec "${command}" --retry 'SIGINT/620/SIGTERM/20/SIGKILL/20'
162 - eend $? && mark_service_stopped
163 -}
164
165 diff --git a/net-vpn/i2pd/files/i2pd-2.41.0-libressl.patch b/net-vpn/i2pd/files/i2pd-2.41.0-libressl.patch
166 deleted file mode 100644
167 index 8f18a62..0000000
168 --- a/net-vpn/i2pd/files/i2pd-2.41.0-libressl.patch
169 +++ /dev/null
170 @@ -1,20 +0,0 @@
171 -From OpenBSD:
172 -
173 -https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/i2pd/patches/patch-libi2pd_Crypto_h
174 -
175 -Fix build with opaque structs in LibreSSL 3.5
176 -
177 -Index: libi2pd/Crypto.h
178 ---- a/libi2pd/Crypto.h.orig
179 -+++ b/libi2pd/Crypto.h
180 -@@ -29,7 +29,9 @@
181 - #include "CPU.h"
182 -
183 - // recognize openssl version and features
184 --#if ((OPENSSL_VERSION_NUMBER < 0x010100000) || defined(LIBRESSL_VERSION_NUMBER)) // 1.0.2 and below or LibreSSL
185 -+#if defined(LIBRESSL_VERSION_NUMBER)
186 -+# define LEGACY_OPENSSL 0
187 -+#elif (OPENSSL_VERSION_NUMBER < 0x010100000) // 1.0.2 and below
188 - # define LEGACY_OPENSSL 1
189 - # define X509_getm_notBefore X509_get_notBefore
190 - # define X509_getm_notAfter X509_get_notAfter
191
192 diff --git a/net-vpn/i2pd/files/i2pd-2.6.0-r3.confd b/net-vpn/i2pd/files/i2pd-2.6.0-r3.confd
193 deleted file mode 100644
194 index d2ef16b..0000000
195 --- a/net-vpn/i2pd/files/i2pd-2.6.0-r3.confd
196 +++ /dev/null
197 @@ -1,12 +0,0 @@
198 -I2PD_USER=i2pd
199 -I2PD_GROUP=i2pd
200 -I2PD_LOG=/var/log/i2pd.log
201 -I2PD_PID=/run/i2pd/i2pd.pid
202 -
203 -# max number of open files (for floodfill)
204 -rc_ulimit="-n 4096"
205 -
206 -# Options to i2pd
207 -I2PD_OPTIONS="--daemon --service --pidfile=${I2PD_PID} \
208 ---log=file --logfile=${I2PD_LOG} \
209 ---conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf"
210
211 diff --git a/net-vpn/i2pd/i2pd-2.41.0.ebuild b/net-vpn/i2pd/i2pd-2.41.0.ebuild
212 deleted file mode 100644
213 index 7a367a8..0000000
214 --- a/net-vpn/i2pd/i2pd-2.41.0.ebuild
215 +++ /dev/null
216 @@ -1,83 +0,0 @@
217 -# Copyright 1999-2021 Gentoo Authors
218 -# Distributed under the terms of the GNU General Public License v2
219 -
220 -EAPI=8
221 -
222 -inherit cmake toolchain-funcs systemd
223 -
224 -DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
225 -HOMEPAGE="https://github.com/PurpleI2P/i2pd"
226 -SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
227 -
228 -LICENSE="BSD"
229 -SLOT="0"
230 -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
231 -IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening +upnp"
232 -
233 -RDEPEND="
234 - acct-user/i2pd
235 - acct-group/i2pd
236 - dev-libs/boost:=[threads(+)]
237 - dev-libs/openssl:0=[-bindist(-)]
238 - sys-libs/zlib
239 - upnp? ( net-libs/miniupnpc:= )"
240 -DEPEND="${RDEPEND}"
241 -
242 -CMAKE_USE_DIR="${WORKDIR}/${P}/build"
243 -
244 -DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf )
245 -
246 -PATCHES=( "${FILESDIR}/${P}-libressl.patch" )
247 -
248 -pkg_pretend() {
249 - if use i2p-hardening && ! tc-is-gcc; then
250 - die "i2p-hardening requires gcc"
251 - fi
252 -}
253 -
254 -src_configure() {
255 - local mycmakeargs=(
256 - -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
257 - -DWITH_HARDENING=$(usex i2p-hardening ON OFF)
258 - -DWITH_PCH=OFF
259 - -DWITH_STATIC=OFF
260 - -DWITH_UPNP=$(usex upnp ON OFF)
261 - -DWITH_LIBRARY=ON
262 - -DWITH_BINARY=ON
263 - )
264 - cmake_src_configure
265 -}
266 -
267 -src_install() {
268 - cmake_src_install
269 -
270 - # config
271 - insinto /etc/i2pd
272 - doins contrib/i2pd.conf
273 - doins contrib/tunnels.conf
274 -
275 - # working directory
276 - insinto /var/lib/i2pd
277 - doins -r contrib/certificates
278 -
279 - # add /var/lib/i2pd/certificates to CONFIG_PROTECT
280 - doenvd "${FILESDIR}/99i2pd"
281 -
282 - # openrc and systemd daemon routines
283 - newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
284 - newinitd "${FILESDIR}/i2pd-2.39.0.initd" i2pd
285 - systemd_newunit "${FILESDIR}/i2pd-2.38.0.service" i2pd.service
286 -
287 - # logrotate
288 - insinto /etc/logrotate.d
289 - newins "${FILESDIR}/i2pd-2.38.0-r1.logrotate" i2pd
290 -}
291 -
292 -pkg_postinst() {
293 - if [[ -f ${EROOT}/etc/i2pd/subscriptions.txt ]]; then
294 - ewarn
295 - ewarn "Configuration of the subscriptions has been moved from"
296 - ewarn "subscriptions.txt to i2pd.conf. We recommend updating"
297 - ewarn "i2pd.conf accordingly and deleting subscriptions.txt."
298 - fi
299 -}
300
301 diff --git a/net-vpn/i2pd/metadata.xml b/net-vpn/i2pd/metadata.xml
302 deleted file mode 100644
303 index 0c76e2d..0000000
304 --- a/net-vpn/i2pd/metadata.xml
305 +++ /dev/null
306 @@ -1,24 +0,0 @@
307 -<?xml version="1.0" encoding="UTF-8"?>
308 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
309 -<pkgmetadata>
310 - <maintainer type="person" proxied="yes">
311 - <email>kaikaikai@××××××.ru</email>
312 - <name>Alexey Korepanov</name>
313 - </maintainer>
314 - <maintainer type="project" proxied="proxy">
315 - <email>proxy-maint@g.o</email>
316 - <name>Proxy Maintainers</name>
317 - </maintainer>
318 - <maintainer type="person" proxied="yes">
319 - <email>klondike@g.o</email>
320 - <name>Francisco Blas Izquierdo Riera</name>
321 - </maintainer>
322 - <use>
323 - <flag name="i2p-hardening">
324 - Compile with hardening on vanilla compilers/linkers
325 - </flag>
326 - </use>
327 - <upstream>
328 - <remote-id type="github">PurpleI2P/i2pd</remote-id>
329 - </upstream>
330 -</pkgmetadata>