commit: 1c0d7d298402386bf4ac8dd298b22a127c988008 Author: Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru> AuthorDate: Tue Sep 14 08:22:08 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Tue Sep 21 07:03:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0d7d29
net-vpn/i2pd: version bump 2.39.0 Closes: https://bugs.gentoo.org/812843 Bug: https://bugs.gentoo.org/808845 Signed-off-by: Alexey Korepanov <kaikaikai <AT> yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/22289 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-vpn/i2pd/Manifest | 2 +- net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch | 22 ---------------------- .../{i2pd-2.6.0-r3.initd => i2pd-2.39.0.initd} | 7 ++++++- .../{i2pd-2.38.0-r4.ebuild => i2pd-2.39.0.ebuild} | 6 +----- 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest index 17680236dae..055ce2cb5c5 100644 --- a/net-vpn/i2pd/Manifest +++ b/net-vpn/i2pd/Manifest @@ -1 +1 @@ -DIST i2pd-2.38.0.tar.gz 555543 BLAKE2B a47c4b77e3a1d4c88cfd18b288b53592a8096509e0bed01bbf57f8d81b715699f822059cd9eecc0deb8fc82d98c23a8c0f6a67ac71654da528f81785338bfe54 SHA512 01e160394dc07621b3d236fcc13d78b46e109290f59dbb77f282c05f4d80fdfa01c9b062de5ca91d6d6e739beb8a5b6f731508b48d9483f1a132a93a71d88e6f +DIST i2pd-2.39.0.tar.gz 579825 BLAKE2B 14f4167fd7752529f513f89cf9d08fd9dbf086f9336c5dae47ef30fa81a753c955de7e622131214f6924a7af8fb62e6a3b5b59c8ae0d407ed7305c3c6dc8a692 SHA512 6b38e6e2e763e94ffe9d11eb2f9a0e9554560bb4fec95891240adf5bc0a9639f879dac4ff3712a9f8e00895b7bbeabc854887e61fe9f9755c33f96899e20aa76 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 af0590be32f..00000000000 --- 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.6.0-r3.initd b/net-vpn/i2pd/files/i2pd-2.39.0.initd similarity index 93% rename from net-vpn/i2pd/files/i2pd-2.6.0-r3.initd rename to net-vpn/i2pd/files/i2pd-2.39.0.initd index b09b4454e96..c5248b20cfe 100644 --- a/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd +++ b/net-vpn/i2pd/files/i2pd-2.39.0.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 description="C++ daemon for accessing the I2P network" @@ -37,6 +37,11 @@ start_pre() { 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" diff --git a/net-vpn/i2pd/i2pd-2.38.0-r4.ebuild b/net-vpn/i2pd/i2pd-2.39.0.ebuild similarity index 94% rename from net-vpn/i2pd/i2pd-2.38.0-r4.ebuild rename to net-vpn/i2pd/i2pd-2.39.0.ebuild index 48d52261fdc..95c83095ba6 100644 --- a/net-vpn/i2pd/i2pd-2.38.0-r4.ebuild +++ b/net-vpn/i2pd/i2pd-2.39.0.ebuild @@ -26,10 +26,6 @@ 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" @@ -66,7 +62,7 @@ src_install() { # openrc and systemd daemon routines newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd - newinitd "${FILESDIR}/i2pd-2.6.0-r3.initd" i2pd + newinitd "${FILESDIR}/i2pd-2.39.0.initd" i2pd systemd_newunit "${FILESDIR}/i2pd-2.38.0.service" i2pd.service # logrotate
