From c719fdcee603a5a706a45d10cb598762d56a727d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Sep 2021 20:21:45 +0100 Subject: gentoo resync : 25.09.2021 --- net-vpn/i2pd/Manifest | 7 +-- net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch | 22 ------- net-vpn/i2pd/files/i2pd-2.39.0.initd | 52 +++++++++++++++++ net-vpn/i2pd/files/i2pd-2.6.0-r3.initd | 47 --------------- net-vpn/i2pd/i2pd-2.38.0-r4.ebuild | 84 --------------------------- net-vpn/i2pd/i2pd-2.39.0.ebuild | 81 ++++++++++++++++++++++++++ 6 files changed, 136 insertions(+), 157 deletions(-) delete mode 100644 net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch create mode 100644 net-vpn/i2pd/files/i2pd-2.39.0.initd delete mode 100644 net-vpn/i2pd/files/i2pd-2.6.0-r3.initd delete mode 100644 net-vpn/i2pd/i2pd-2.38.0-r4.ebuild create mode 100644 net-vpn/i2pd/i2pd-2.39.0.ebuild (limited to 'net-vpn/i2pd') diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest index ec696ad3245d..a59062f0e7ac 100644 --- a/net-vpn/i2pd/Manifest +++ b/net-vpn/i2pd/Manifest @@ -1,9 +1,8 @@ AUX 99i2pd 44 BLAKE2B d7a2d45f79ecb34f50eaddc09f318339eedfb2444d0a96d97691c6f3950e63f8f827ec3697ec52f60e29c3e01f232d6c12cf776883672203f01645e5e2d5d994 SHA512 0bd08ff5b1b2ad8d91572efee848a760e2fb46d9c1a5ead3fbdde91d679d832d985905952b393eb523ec9d8f1815bf1512ae61fbc059d10f0773991ac097c23f -AUX i2pd-2.25.0-lib-path.patch 725 BLAKE2B ad87fbfae2cb78945d0e0f62ea9d0ab45e1676908ebb11d6c4844a6160e0eb2714fa1221e886d158454a7ba3c19af7d1bb672035195993fb4633162a761e3bcb SHA512 1e1942c8c424ecefb0b62ee96973b2b238553a887a42cb5d9206cbea31e3136b7b3ad0b8ff1f290cbb507f1cc404e8a6e3c1a52551ac0aa719fbadbcf5ccc43b AUX i2pd-2.38.0-r1.logrotate 294 BLAKE2B 183e9d0a88a3ff4b1116d4f8475862ed110cf2bad43a1858b55fb6b502bf0c7fc975958e7a88fe9cf2bb331330e7aa70f13a3d9ce64fb525060bd84e965af5f2 SHA512 d2460d1d1b65222a0e3b89e464e75b2fd94fc65a49afe78a26c19e7a3c097b2334c02d58faad5f4ff06e3e4847425ed383f1963be2dbb9282a77c5b287a30fe2 AUX i2pd-2.38.0.service 906 BLAKE2B 583c1856ceada5e60b7f595452afbe3e254616185d641e63f7931ccc972a52123745f72f1fffaf122be6fd3d4dadb311d58f4d639e0d2ba2187bde21f5340d2d SHA512 233722990f5e9934558b05a0aee5e0ef6af9bcd0b5f9c38cb9d1e61ffa37a4d80f403047dc15ec706bc03185d2e1ca27015210b6757a71786ad0bb4b75662981 +AUX i2pd-2.39.0.initd 1440 BLAKE2B 081cc813db1cf25b81d3c2b51315eb6f6d6e95cf1350c5ded76107361b13f3add2e3d583e7cee177e22ce2a4c9bc99183af8145fd08145e531afd55cb9255438 SHA512 b16a49e72a0c0a0a2fd2f067bc35b4374de8fc606c9ea5830b84b630b793ce4bb7e0fa41ffd95bc651bd20e9e13889b05be49d868c2c67bbdb7e690b70281dc9 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9 -AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5 -DIST i2pd-2.38.0.tar.gz 555543 BLAKE2B a47c4b77e3a1d4c88cfd18b288b53592a8096509e0bed01bbf57f8d81b715699f822059cd9eecc0deb8fc82d98c23a8c0f6a67ac71654da528f81785338bfe54 SHA512 01e160394dc07621b3d236fcc13d78b46e109290f59dbb77f282c05f4d80fdfa01c9b062de5ca91d6d6e739beb8a5b6f731508b48d9483f1a132a93a71d88e6f -EBUILD i2pd-2.38.0-r4.ebuild 2020 BLAKE2B ee4bfa727f8ebc50d1b8d5970db42bee3ea85b20fcf1c908280f9999bc63ec802ee29d7b45b15b403bf8477e7c2819231417095b335a3cb8546ada6e14b2485d SHA512 9c74c5774ba3e5565cdbcbf679b144e02c9ffee00eef28aa3c8bea71bee6d1011914ac1ca39748ab80a55a28b4b9e69e5efcaf4b1083e6229e166f443e4ddcdd +DIST i2pd-2.39.0.tar.gz 579825 BLAKE2B 14f4167fd7752529f513f89cf9d08fd9dbf086f9336c5dae47ef30fa81a753c955de7e622131214f6924a7af8fb62e6a3b5b59c8ae0d407ed7305c3c6dc8a692 SHA512 6b38e6e2e763e94ffe9d11eb2f9a0e9554560bb4fec95891240adf5bc0a9639f879dac4ff3712a9f8e00895b7bbeabc854887e61fe9f9755c33f96899e20aa76 +EBUILD i2pd-2.39.0.ebuild 1978 BLAKE2B 03990127224de9dab073e6079891d077625701c91bf1d704b468dfdb5a1f2ee03ef2eb844bff6dad95c8b5f1e07feed64afb018f7b8f0d801269a742883f1115 SHA512 26eec820e07dbc1a1bb5a524c621dc251227c384a2743b1a3e1d61357a507b1d57c0c64c7ede910ee739050ee5a021459faabd0e6d09a91a3e12a687517fc245 MISC metadata.xml 728 BLAKE2B 37fbc9a6966478aa61c9c67e20835bd759dc46ec88e4a575974acb872e3f73d093ec354399441b64b283d16ebbd9b6d23bdbd40e38c483a184f0700d01e1f179 SHA512 927d1fb8cafb87bf199e7e67bbc6edffd08eb7e7b50c8b7a7bf16cf5cbe3dfef32fca387b5c861c8e4aa3336687022a6978a7084e730d1dc6308c3db6152d309 diff --git a/net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch b/net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch deleted file mode 100644 index af0590be32f7..000000000000 --- a/net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt -index 949f6a46..a6d29990 100644 ---- a/build/CMakeLists.txt -+++ b/build/CMakeLists.txt -@@ -103,8 +103,6 @@ set_target_properties(libi2pd PROPERTIES PREFIX "") - if (WITH_LIBRARY) - install(TARGETS libi2pd - EXPORT libi2pd -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib - COMPONENT Libraries) - # TODO Make libi2pd available to 3rd party projects via CMake as imported target - # FIXME This pulls stdafx -@@ -135,8 +133,6 @@ set_target_properties(libi2pdclient PROPERTIES PREFIX "") - if (WITH_LIBRARY) - install(TARGETS libi2pdclient - EXPORT libi2pdclient -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib - COMPONENT Libraries) - endif() - diff --git a/net-vpn/i2pd/files/i2pd-2.39.0.initd b/net-vpn/i2pd/files/i2pd-2.39.0.initd new file mode 100644 index 000000000000..c5248b20cfee --- /dev/null +++ b/net-vpn/i2pd/files/i2pd-2.39.0.initd @@ -0,0 +1,52 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="C++ daemon for accessing the I2P network" +description_graceful="Graceful shutdown, takes 10 minutes" + +command="/usr/bin/i2pd" +command_args="${I2PD_OPTIONS}" +user="${I2PD_USER}:${I2PD_GROUP}" +start_stop_daemon_args=" + --user \"${user}\" + --pidfile \"${I2PD_PID}\" + --progress +" +retry="SIGTERM/20/SIGKILL/20" + +I2PD_PID_DIR=$(dirname "${I2PD_PID}") + +extra_started_commands="graceful" + +depend() { + use dns logger netmount +} + +start_pre() { + if [ -z "${I2PD_USER}" ] || \ + [ -z "${I2PD_GROUP}" ] || \ + [ -z "${I2PD_PID}" ] || \ + [ -z "${I2PD_LOG}" ] || \ + [ -z "${I2PD_OPTIONS}" ] ; then + eerror "Not all variables I2PD_USER, I2PD_GROUP, I2PD_PID, I2PD_OPTIONS, I2PD_LOG are defined." + eerror "Check your /etc/conf.d/i2pd." + return 1 + fi + checkpath -f -o "${user}" "${I2PD_LOG}" + checkpath -d -m 0750 -o "${user}" "${I2PD_PID_DIR}" +} + +stop_post() { + # #808845 + rm -f "${I2PD_PID}" +} + +graceful() { + # on SIGINT, i2pd stops accepting tunnels and shuts down in 600 seconds + ebegin "Gracefully stopping i2pd, this takes 10 minutes" + mark_service_stopping + eval start-stop-daemon --stop ${start_stop_daemon_args} \ + --exec "${command}" --retry 'SIGINT/620/SIGTERM/20/SIGKILL/20' + eend $? && mark_service_stopped +} diff --git a/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd b/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd deleted file mode 100644 index b09b4454e96d..000000000000 --- a/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd +++ /dev/null @@ -1,47 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="C++ daemon for accessing the I2P network" -description_graceful="Graceful shutdown, takes 10 minutes" - -command="/usr/bin/i2pd" -command_args="${I2PD_OPTIONS}" -user="${I2PD_USER}:${I2PD_GROUP}" -start_stop_daemon_args=" - --user \"${user}\" - --pidfile \"${I2PD_PID}\" - --progress -" -retry="SIGTERM/20/SIGKILL/20" - -I2PD_PID_DIR=$(dirname "${I2PD_PID}") - -extra_started_commands="graceful" - -depend() { - use dns logger netmount -} - -start_pre() { - if [ -z "${I2PD_USER}" ] || \ - [ -z "${I2PD_GROUP}" ] || \ - [ -z "${I2PD_PID}" ] || \ - [ -z "${I2PD_LOG}" ] || \ - [ -z "${I2PD_OPTIONS}" ] ; then - eerror "Not all variables I2PD_USER, I2PD_GROUP, I2PD_PID, I2PD_OPTIONS, I2PD_LOG are defined." - eerror "Check your /etc/conf.d/i2pd." - return 1 - fi - checkpath -f -o "${user}" "${I2PD_LOG}" - checkpath -d -m 0750 -o "${user}" "${I2PD_PID_DIR}" -} - -graceful() { - # on SIGINT, i2pd stops accepting tunnels and shuts down in 600 seconds - ebegin "Gracefully stopping i2pd, this takes 10 minutes" - mark_service_stopping - eval start-stop-daemon --stop ${start_stop_daemon_args} \ - --exec "${command}" --retry 'SIGINT/620/SIGTERM/20/SIGKILL/20' - eend $? && mark_service_stopped -} diff --git a/net-vpn/i2pd/i2pd-2.38.0-r4.ebuild b/net-vpn/i2pd/i2pd-2.38.0-r4.ebuild deleted file mode 100644 index 48d52261fdc7..000000000000 --- a/net-vpn/i2pd/i2pd-2.38.0-r4.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake toolchain-funcs systemd - -DESCRIPTION="A C++ daemon for accessing the I2P anonymous network" -HOMEPAGE="https://github.com/PurpleI2P/i2pd" -SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening +upnp" - -RDEPEND=" - acct-user/i2pd - acct-group/i2pd - dev-libs/boost:=[threads(+)] - dev-libs/openssl:0=[-bindist(-)] - upnp? ( net-libs/miniupnpc:= )" -DEPEND="${RDEPEND}" - -CMAKE_USE_DIR="${S}/build" - -DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf ) - -PATCHES=( - "${FILESDIR}/i2pd-2.25.0-lib-path.patch" -) - -pkg_pretend() { - if use i2p-hardening && ! tc-is-gcc; then - die "i2p-hardening requires gcc" - fi -} - -src_configure() { - local mycmakeargs=( - -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF) - -DWITH_HARDENING=$(usex i2p-hardening ON OFF) - -DWITH_PCH=OFF - -DWITH_STATIC=OFF - -DWITH_UPNP=$(usex upnp ON OFF) - -DWITH_LIBRARY=ON - -DWITH_BINARY=ON - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - # config - insinto /etc/i2pd - doins contrib/i2pd.conf - doins contrib/tunnels.conf - - # working directory - insinto /var/lib/i2pd - doins -r contrib/certificates - - # add /var/lib/i2pd/certificates to CONFIG_PROTECT - doenvd "${FILESDIR}/99i2pd" - - # openrc and systemd daemon routines - newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd - newinitd "${FILESDIR}/i2pd-2.6.0-r3.initd" i2pd - systemd_newunit "${FILESDIR}/i2pd-2.38.0.service" i2pd.service - - # logrotate - insinto /etc/logrotate.d - newins "${FILESDIR}/i2pd-2.38.0-r1.logrotate" i2pd -} - -pkg_postinst() { - if [[ -f ${EROOT}/etc/i2pd/subscriptions.txt ]]; then - ewarn - ewarn "Configuration of the subscriptions has been moved from" - ewarn "subscriptions.txt to i2pd.conf. We recommend updating" - ewarn "i2pd.conf accordingly and deleting subscriptions.txt." - fi -} diff --git a/net-vpn/i2pd/i2pd-2.39.0.ebuild b/net-vpn/i2pd/i2pd-2.39.0.ebuild new file mode 100644 index 000000000000..a97df49807db --- /dev/null +++ b/net-vpn/i2pd/i2pd-2.39.0.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake toolchain-funcs systemd + +DESCRIPTION="A C++ daemon for accessing the I2P anonymous network" +HOMEPAGE="https://github.com/PurpleI2P/i2pd" +SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening +upnp" + +RDEPEND=" + acct-user/i2pd + acct-group/i2pd + dev-libs/boost:=[threads(+)] + dev-libs/openssl:0=[-bindist(-)] + sys-libs/zlib + upnp? ( net-libs/miniupnpc:= )" +DEPEND="${RDEPEND}" + +CMAKE_USE_DIR="${S}/build" + +DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf ) + +pkg_pretend() { + if use i2p-hardening && ! tc-is-gcc; then + die "i2p-hardening requires gcc" + fi +} + +src_configure() { + local mycmakeargs=( + -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF) + -DWITH_HARDENING=$(usex i2p-hardening ON OFF) + -DWITH_PCH=OFF + -DWITH_STATIC=OFF + -DWITH_UPNP=$(usex upnp ON OFF) + -DWITH_LIBRARY=ON + -DWITH_BINARY=ON + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # config + insinto /etc/i2pd + doins contrib/i2pd.conf + doins contrib/tunnels.conf + + # working directory + insinto /var/lib/i2pd + doins -r contrib/certificates + + # add /var/lib/i2pd/certificates to CONFIG_PROTECT + doenvd "${FILESDIR}/99i2pd" + + # openrc and systemd daemon routines + newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd + newinitd "${FILESDIR}/i2pd-2.39.0.initd" i2pd + systemd_newunit "${FILESDIR}/i2pd-2.38.0.service" i2pd.service + + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}/i2pd-2.38.0-r1.logrotate" i2pd +} + +pkg_postinst() { + if [[ -f ${EROOT}/etc/i2pd/subscriptions.txt ]]; then + ewarn + ewarn "Configuration of the subscriptions has been moved from" + ewarn "subscriptions.txt to i2pd.conf. We recommend updating" + ewarn "i2pd.conf accordingly and deleting subscriptions.txt." + fi +} -- cgit v1.2.3