* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/, net-vpn/i2pd/files/
@ 2020-11-08 13:05 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2020-11-08 13:05 UTC (permalink / raw
To: gentoo-commits
commit: 2dc991f1c8c86ce3c77d4400489aabc4705a72a3
Author: Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru>
AuthorDate: Sun Nov 8 12:40:57 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 8 12:57:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dc991f1
net-vpn/i2pd: drop old 2.31.0
Signed-off-by: Alexey Korepanov <kaikaikai <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/18182
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-vpn/i2pd/Manifest | 1 -
.../i2pd-2.14.0-fix_installed_components.patch | 31 -------
net-vpn/i2pd/i2pd-2.31.0.ebuild | 94 ----------------------
3 files changed, 126 deletions(-)
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 1d0836fa3d8..db90e6f4267 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -1,4 +1,3 @@
-DIST i2pd-2.31.0.tar.gz 1092238 BLAKE2B 61424b8d5796511a1bae4d0274b86fa198e0fb2e590312e7e5039533bca2ded494f9bdd7406951c82a99259772581ee716159f6500921f9fb8b5fd4aa217ce9a SHA512 af1583c6c2fb2073d6d3d32f0b394da3f1bc4a3d232aa47880f457447c6592801c48f6a05b1a7d2955c58d888c4c574e15082bf2583921797e24e5cda4c188e0
DIST i2pd-2.32.0.tar.gz 1098880 BLAKE2B 0b5db302cac78c6993fd7c25362bad512c0597222059c21d0902c1378228425bafc6e39040c1a99122b66dfca106db64ff69783b23e40caf528764f7ec1709c6 SHA512 f76eb2744b55b4099914cb42e7fe6821e3b7b3dbbc93d491a83cfb8cd9fb67e6559f20891874215060a3797b5f66051480e49670032c952fcddf91aa96e0e41e
DIST i2pd-2.32.1.tar.gz 1099034 BLAKE2B be32443d2d686247459e74396202ff5fc595be27b7a4e207aa756f35c6b65fe05b006491bb9b8a564bc2b3c1144dae1dcba8dcfdff95cedfb032ca137f30d617 SHA512 2c492942526b5d6dd787baaf6ad31b036c593d633a36ba951c02d3289607be5e43562057622deee51db724854eef6f4bd67eaec62699b07aad47ee49fd291783
DIST i2pd-2.33.0.tar.gz 1101578 BLAKE2B d569a7900bda1fecc19f6ec966cd004d04599993193de9bcda89620dff9909889c14165aca457e6a5fa0539614304af11be573329b9a54596684d3232ee28833 SHA512 7a3e7a8a908be8a12b675fda4ce923cb2b0eaf3e9b12a513b9ae7b56e9ecb593eef0ea278debb4027406d50ee9a46599a6792a54ce2e2f4e2c44c1fc82479910
diff --git a/net-vpn/i2pd/files/i2pd-2.14.0-fix_installed_components.patch b/net-vpn/i2pd/files/i2pd-2.14.0-fix_installed_components.patch
deleted file mode 100644
index fe7bdcc4083..00000000000
--- a/net-vpn/i2pd/files/i2pd-2.14.0-fix_installed_components.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/build/CMakeLists.txt
-+++ b/build/CMakeLists.txt
-@@ -455,20 +455,7 @@ if (WITH_BINARY)
- endif ()
- endif ()
-
--install(FILES ../LICENSE
-- DESTINATION .
-- COMPONENT Runtime
-- )
--# Take a copy on Appveyor
--install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICENSE"
-- DESTINATION .
-- COMPONENT Runtime
-- RENAME LICENSE_OPENSSL
-- OPTIONAL # for local builds only!
-- )
--
- file(GLOB_RECURSE I2PD_SOURCES "../libi2pd/*.cpp" "../libi2pd_client/*.cpp" "../daemon/*.cpp" "../build" "../Win32" "../Makefile*")
--install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source)
- # install(DIRECTORY ../ DESTINATION src/
- # # OPTIONAL
- # COMPONENT Source FILES_MATCHING
-@@ -477,7 +464,6 @@ install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source)
- # )
-
- file(GLOB I2PD_HEADERS "../libi2pd/*.h" "../libi2pd_client/*.h" "../daemon/*.h")
--install(FILES ${I2PD_HEADERS} DESTINATION src/ COMPONENT Headers)
- # install(DIRECTORY ../ DESTINATION src/
- # # OPTIONAL
- # COMPONENT Headers FILES_MATCHING
diff --git a/net-vpn/i2pd/i2pd-2.31.0.ebuild b/net-vpn/i2pd/i2pd-2.31.0.ebuild
deleted file mode 100644
index a83bf4a4cda..00000000000
--- a/net-vpn/i2pd/i2pd-2.31.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd cmake toolchain-funcs
-
-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 ~x86"
-IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp"
-
-RDEPEND="
- acct-user/i2pd
- acct-group/i2pd
- !static? (
- dev-libs/boost:=[threads]
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- upnp? ( net-libs/miniupnpc )
- )"
-DEPEND="${RDEPEND}
- static? (
- dev-libs/boost:=[static-libs,threads]
- !libressl? ( dev-libs/openssl:0=[static-libs] )
- libressl? ( dev-libs/libressl:0=[static-libs] )
- sys-libs/zlib:=[static-libs]
- upnp? ( net-libs/miniupnpc[static-libs] )
- )"
-
-CMAKE_USE_DIR="${S}/build"
-
-DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
-
-PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch"
- "${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() {
- mycmakeargs=(
- -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
- -DWITH_AVX=$(usex cpu_flags_x86_avx ON OFF)
- -DWITH_HARDENING=$(usex i2p-hardening ON OFF)
- -DWITH_PCH=OFF
- -DWITH_STATIC=$(usex static ON 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.6.0-r3.service" i2pd.service
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}/i2pd-2.6.0-r3.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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/, net-vpn/i2pd/files/
@ 2021-01-09 12:55 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-01-09 12:55 UTC (permalink / raw
To: gentoo-commits
commit: 9d525905e50dc0b4902b9811db594af913e5d60d
Author: Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru>
AuthorDate: Fri Jan 8 16:13:25 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 12:45:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d525905
net-vpn/i2pd: version bump to 2.35.0
Signed-off-by: Alexey Korepanov <kaikaikai <AT> yandex.ru>
Closes: https://bugs.gentoo.org/763033
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-vpn/i2pd/Manifest | 1 +
net-vpn/i2pd/files/i2pd-2.35.0-avx-detection.patch | 32 ++++++++
net-vpn/i2pd/i2pd-2.35.0.ebuild | 95 ++++++++++++++++++++++
3 files changed, 128 insertions(+)
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index db90e6f4267..e95441059af 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -2,3 +2,4 @@ DIST i2pd-2.32.0.tar.gz 1098880 BLAKE2B 0b5db302cac78c6993fd7c25362bad512c059722
DIST i2pd-2.32.1.tar.gz 1099034 BLAKE2B be32443d2d686247459e74396202ff5fc595be27b7a4e207aa756f35c6b65fe05b006491bb9b8a564bc2b3c1144dae1dcba8dcfdff95cedfb032ca137f30d617 SHA512 2c492942526b5d6dd787baaf6ad31b036c593d633a36ba951c02d3289607be5e43562057622deee51db724854eef6f4bd67eaec62699b07aad47ee49fd291783
DIST i2pd-2.33.0.tar.gz 1101578 BLAKE2B d569a7900bda1fecc19f6ec966cd004d04599993193de9bcda89620dff9909889c14165aca457e6a5fa0539614304af11be573329b9a54596684d3232ee28833 SHA512 7a3e7a8a908be8a12b675fda4ce923cb2b0eaf3e9b12a513b9ae7b56e9ecb593eef0ea278debb4027406d50ee9a46599a6792a54ce2e2f4e2c44c1fc82479910
DIST i2pd-2.34.0.tar.gz 1103199 BLAKE2B 16e16a0e396b22f5de797455a97322e51bc2289e770617106d4daa9a7cd6d1d94d4d84955e182493f3c11dbacd527fbb3f127bd4e2e555a7b04f7eb697213dcb SHA512 74c8234b850159c6e680fa61b20e2c22a0f04ca8397b4aa68f92fa20520fb74a63e442ac75c2fbb17dc1e5a193011b9b38085cee08746de4496620778aa7f027
+DIST i2pd-2.35.0.tar.gz 1105837 BLAKE2B 4480b3b4922d2a51d158366674ad7880b7710d3c2bc45d3e403330d3a8ea04a7803a1a7826b0d60c4f9837e84c2900b9635024846d0fce7d585e30ad658fbd27 SHA512 cffc41484a63eba7c7091957cd4d8b8584bb02580d70c69132f1447018be5b3cde7893ae4a0bcb914d53e95c089d4253ece6e20442c9da7810e7800a2b99b117
diff --git a/net-vpn/i2pd/files/i2pd-2.35.0-avx-detection.patch b/net-vpn/i2pd/files/i2pd-2.35.0-avx-detection.patch
new file mode 100644
index 00000000000..6e407f1978c
--- /dev/null
+++ b/net-vpn/i2pd/files/i2pd-2.35.0-avx-detection.patch
@@ -0,0 +1,32 @@
+From ca3b8191510c1006d031d02c50edcf6b4f6a6e8f Mon Sep 17 00:00:00 2001
+From: R4SAS <r4sas@i2pmail.org>
+Date: Thu, 10 Dec 2020 18:32:41 +0300
+Subject: [PATCH] [avx] check ig c++ target supports AVX
+
+Signed-off-by: R4SAS <r4sas@i2pmail.org>
+---
+ libi2pd/Crypto.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libi2pd/Crypto.cpp
++++ b/libi2pd/Crypto.cpp
+@@ -638,7 +638,7 @@ namespace crypto
+ {
+ uint64_t buf[256];
+ uint64_t hash[12]; // 96 bytes
+-#if defined(__x86_64__) || defined(__i386__)
++#if (defined(__x86_64__) || defined(__i386__)) && defined(__AVX__) // not all X86 targets supports AVX (like old Pentium, see #1600)
+ if(i2p::cpu::avx)
+ {
+ __asm__
+--- a/libi2pd/Identity.cpp
++++ b/libi2pd/Identity.cpp
+@@ -828,7 +828,7 @@ namespace data
+ XORMetric operator^(const IdentHash& key1, const IdentHash& key2)
+ {
+ XORMetric m;
+-#if defined(__x86_64__) || defined(__i386__)
++#if (defined(__x86_64__) || defined(__i386__)) && defined(__AVX__) // not all X86 targets supports AVX (like old Pentium, see #1600)
+ if(i2p::cpu::avx)
+ {
+ __asm__
diff --git a/net-vpn/i2pd/i2pd-2.35.0.ebuild b/net-vpn/i2pd/i2pd-2.35.0.ebuild
new file mode 100644
index 00000000000..b33e89eb849
--- /dev/null
+++ b/net-vpn/i2pd/i2pd-2.35.0.ebuild
@@ -0,0 +1,95 @@
+# 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 libressl static +upnp"
+
+RDEPEND="
+ acct-user/i2pd
+ acct-group/i2pd
+ !static? (
+ dev-libs/boost:=[threads]
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+ upnp? ( net-libs/miniupnpc:= )
+ )"
+DEPEND="${RDEPEND}
+ static? (
+ dev-libs/boost:=[static-libs,threads]
+ sys-libs/zlib[static-libs]
+ !libressl? ( dev-libs/openssl:0=[static-libs] )
+ libressl? ( dev-libs/libressl:0=[static-libs] )
+ upnp? ( net-libs/miniupnpc:=[static-libs] )
+ )"
+
+CMAKE_USE_DIR="${S}/build"
+
+DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
+
+PATCHES=(
+ "${FILESDIR}/i2pd-2.25.0-lib-path.patch"
+ "${FILESDIR}/i2pd-2.35.0-avx-detection.patch"
+)
+
+pkg_pretend() {
+ if use i2p-hardening && ! tc-is-gcc; then
+ die "i2p-hardening requires gcc"
+ fi
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+ -DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+ -DWITH_PCH=OFF
+ -DWITH_STATIC=$(usex static ON 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.6.0-r3.service" i2pd.service
+
+ # logrotate
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/i2pd-2.6.0-r3.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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/, net-vpn/i2pd/files/
@ 2021-06-15 14:42 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-06-15 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 9f98f4254c4abca5ccb691e83614386866942f2a
Author: Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru>
AuthorDate: Tue Jun 15 14:19:52 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 14:39:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f98f425
net-vpn/i2pd: fix logrotate #795123
Signed-off-by: Alexey Korepanov <kaikaikai <AT> yandex.ru>
Closes: https://bugs.gentoo.org/795123
Closes: https://github.com/gentoo/gentoo/pull/21254
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../i2pd/files/{i2pd-2.6.0-r3.logrotate => i2pd-2.38.0-r1.logrotate} | 4 +++-
net-vpn/i2pd/{i2pd-2.38.0.ebuild => i2pd-2.38.0-r1.ebuild} | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate b/net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate
similarity index 53%
rename from net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate
rename to net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate
index 251128b7be7..9245bca8c48 100644
--- a/net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate
+++ b/net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate
@@ -5,7 +5,9 @@
notifempty
create 640 i2pd i2pd
postrotate
- /bin/kill -HUP $(cat /run/i2pd/i2pd.pid)
+ if [ -f /run/i2pd/i2pd.pid ]; then
+ /bin/kill -HUP $(/bin/cat /run/i2pd/i2pd.pid)
+ fi
endscript
}
diff --git a/net-vpn/i2pd/i2pd-2.38.0.ebuild b/net-vpn/i2pd/i2pd-2.38.0-r1.ebuild
similarity index 97%
rename from net-vpn/i2pd/i2pd-2.38.0.ebuild
rename to net-vpn/i2pd/i2pd-2.38.0-r1.ebuild
index 847dab8ce29..b77a5dab495 100644
--- a/net-vpn/i2pd/i2pd-2.38.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.38.0-r1.ebuild
@@ -79,7 +79,7 @@ src_install() {
# logrotate
insinto /etc/logrotate.d
- newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd
+ newins "${FILESDIR}/i2pd-2.38.0-r1.logrotate" i2pd
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/, net-vpn/i2pd/files/
@ 2021-09-21 7:03 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2021-09-21 7:03 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/, net-vpn/i2pd/files/
@ 2024-06-24 14:17 Stefan Strogin
0 siblings, 0 replies; 5+ messages in thread
From: Stefan Strogin @ 2024-06-24 14:17 UTC (permalink / raw
To: gentoo-commits
commit: bc250091db4bbc7b446ca0a816fba4035e6a6d3c
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 14:14:57 2024 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 14:17:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc250091
net-vpn/i2pd: add patch for miniupnp-2.2.8
Closes: https://bugs.gentoo.org/934058
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
net-vpn/i2pd/files/i2pd-2.52.0-miniupnp.patch | 37 +++++++++++++++++++++++++++
net-vpn/i2pd/i2pd-2.52.0.ebuild | 2 ++
2 files changed, 39 insertions(+)
diff --git a/net-vpn/i2pd/files/i2pd-2.52.0-miniupnp.patch b/net-vpn/i2pd/files/i2pd-2.52.0-miniupnp.patch
new file mode 100644
index 000000000000..5c9ef9231351
--- /dev/null
+++ b/net-vpn/i2pd/files/i2pd-2.52.0-miniupnp.patch
@@ -0,0 +1,37 @@
+commit 192e9ad7f6a6995ecb843fbbefe5425d0b37f6ee
+Author: Stefan Strogin <stefan@steils.org>
+Date: Mon Jun 17 17:10:23 2024 +0000
+
+ Support miniupnp-2.2.8 (fixes #2071)
+
+ Use UPNP_GetValidIGD for getting external IP.
+
+diff --git a/daemon/UPnP.cpp b/daemon/UPnP.cpp
+index 043d935e..7885578e 100644
+--- a/daemon/UPnP.cpp
++++ b/daemon/UPnP.cpp
+@@ -115,10 +115,16 @@ namespace transport
+ return;
+ }
+
++#if (MINIUPNPC_API_VERSION >= 18)
++ err = UPNP_GetValidIGD (m_Devlist, &m_upnpUrls, &m_upnpData, m_NetworkAddr, sizeof (m_NetworkAddr),
++ m_externalIPAddress, sizeof (m_externalIPAddress));
++#else
+ err = UPNP_GetValidIGD (m_Devlist, &m_upnpUrls, &m_upnpData, m_NetworkAddr, sizeof (m_NetworkAddr));
++#endif
+ m_upnpUrlsInitialized=err!=0;
+ if (err == UPNP_IGD_VALID_CONNECTED)
+ {
++#if (MINIUPNPC_API_VERSION < 18)
+ err = UPNP_GetExternalIPAddress (m_upnpUrls.controlURL, m_upnpData.first.servicetype, m_externalIPAddress);
+ if(err != UPNPCOMMAND_SUCCESS)
+ {
+@@ -126,6 +132,7 @@ namespace transport
+ return;
+ }
+ else
++#endif
+ {
+ LogPrint (eLogError, "UPnP: Found Internet Gateway Device ", m_upnpUrls.controlURL);
+ if (!m_externalIPAddress[0])
diff --git a/net-vpn/i2pd/i2pd-2.52.0.ebuild b/net-vpn/i2pd/i2pd-2.52.0.ebuild
index 0346c80cb527..504fce8a853d 100644
--- a/net-vpn/i2pd/i2pd-2.52.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.52.0.ebuild
@@ -27,6 +27,8 @@ CMAKE_USE_DIR="${WORKDIR}/${P}/build"
DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf )
+PATCHES=( "${FILESDIR}/${P}-miniupnp.patch" )
+
pkg_pretend() {
if use i2p-hardening && ! tc-is-gcc; then
die "i2p-hardening requires gcc"
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-24 14:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-24 14:17 [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/, net-vpn/i2pd/files/ Stefan Strogin
-- strict thread matches above, loose matches on Subject: below --
2021-09-21 7:03 Joonas Niilola
2021-06-15 14:42 Sam James
2021-01-09 12:55 Sam James
2020-11-08 13:05 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox