[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/files/, app-crypt/gnupg-pkcs11-scd/files/, ...
commit: 86ec09ccd9e60551fabbe263ea25f58dfcac59a2 Author: Ulrich Müller gentoo org> AuthorDate: Sun Apr 3 11:33:56 2022 + Commit: Ulrich Müller gentoo org> CommitDate: Sun Apr 3 11:33:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ec09cc */*: Update copyright notices per GLEP 76 Signed-off-by: Ulrich Müller gentoo.org> app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd | 2 +- net-analyzer/munin/files/munin-asyncd.init.2 | 2 +- net-misc/ser2net/files/ser2net.initd | 2 +- net-vpn/i2pd/files/i2pd-2.39.0.initd | 2 +- net-wireless/unifi/files/unifi.initd-r2 | 2 +- profiles/default/linux/musl/mips/package.mask | 2 +- www-apps/tt-rss/files/ttrssd.initd-r4 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd b/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd index 2861293e0ef0..eb6b3cc62c9b 100644 --- a/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd +++ b/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="gnupg-pkcs11-scd proxy." diff --git a/net-analyzer/munin/files/munin-asyncd.init.2 b/net-analyzer/munin/files/munin-asyncd.init.2 index 15a17a7bef6c..c9fc267f12ea 100644 --- a/net-analyzer/munin/files/munin-asyncd.init.2 +++ b/net-analyzer/munin/files/munin-asyncd.init.2 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command=/usr/libexec/munin/munin-asyncd diff --git a/net-misc/ser2net/files/ser2net.initd b/net-misc/ser2net/files/ser2net.initd index 7652bc9b0350..f7e22509e72a 100644 --- a/net-misc/ser2net/files/ser2net.initd +++ b/net-misc/ser2net/files/ser2net.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="Serial to network proxy (${RC_SVCNAME#*.})" diff --git a/net-vpn/i2pd/files/i2pd-2.39.0.initd b/net-vpn/i2pd/files/i2pd-2.39.0.initd index c5248b20cfee..fb4e0336fb43 100644 --- a/net-vpn/i2pd/files/i2pd-2.39.0.initd +++ b/net-vpn/i2pd/files/i2pd-2.39.0.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="C++ daemon for accessing the I2P network" diff --git a/net-wireless/unifi/files/unifi.initd-r2 b/net-wireless/unifi/files/unifi.initd-r2 index ccab8df7fd7a..a92172fffb97 100644 --- a/net-wireless/unifi/files/unifi.initd-r2 +++ b/net-wireless/unifi/files/unifi.initd-r2 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 unifi_exec="/usr/bin/unifi" diff --git a/profiles/default/linux/musl/mips/package.mask b/profiles/default/linux/musl/mips/package.mask index 038026c2c214..b102791cad4a 100644 --- a/profiles/default/linux/musl/mips/package.mask +++ b/profiles/default/linux/musl/mips/package.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Foundation. +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 >sys-apps/kbd-1.15.5-r99 diff --git a/www-apps/tt-rss/files/ttrssd.initd-r4 b/www-apps/tt-rss/files/ttrssd.initd-r4 index 9dbfa157ce43..82bfdd00461e 100644 --- a/www-apps/tt-rss/files/ttrssd.initd-r4 +++ b/www-apps/tt-rss/files/ttrssd.initd-r4 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command="/usr/bin/php"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/files/, net-vpn/i2pd/
commit: 5dfa1de38dfbaf3e3e70bd0151d36dab66adc0fa Author: Alexey Korepanov yandex ru> AuthorDate: Thu May 27 20:35:37 2021 + Commit: Sam James gentoo org> CommitDate: Fri May 28 02:00:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dfa1de3 net-vpn/i2pd: update systemd service Signed-off-by: Alexey Korepanov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/21009 Signed-off-by: Sam James gentoo.org> net-vpn/i2pd/files/i2pd-2.38.0.service | 37 net-vpn/i2pd/files/i2pd-2.6.0-r3.service | 21 -- net-vpn/i2pd/i2pd-2.38.0.ebuild | 2 +- 3 files changed, 38 insertions(+), 22 deletions(-) diff --git a/net-vpn/i2pd/files/i2pd-2.38.0.service b/net-vpn/i2pd/files/i2pd-2.38.0.service new file mode 100644 index 000..99c1bf20225 --- /dev/null +++ b/net-vpn/i2pd/files/i2pd-2.38.0.service @@ -0,0 +1,37 @@ +[Unit] +Description=C++ daemon for accessing the I2P network +After=network.target + +[Service] +Type=forking +Restart=on-abnormal +User=i2pd +Group=i2pd +LimitNOFILE=4096 + +# restrictions +ProtectSystem=full +ProtectHome=yes +ProtectControlGroups=yes +ProtectKernelLogs=yes +ProtectKernelModules=yes +ProtectKernelTunables=yes +ProtectClock=yes +PrivateUsers=yes +PrivateDevices=yes +PrivateTmp=yes +RestrictNamespaces=yes +RestrictSUIDSGID=yes +CapabilityBoundingSet= +NoNewPrivileges=yes + +RuntimeDirectory=i2pd +RuntimeDirectoryMode=0700 +PIDFile=/run/i2pd/i2pd.pid +ExecStartPre=+/bin/touch /var/log/i2pd.log +ExecStartPre=+/bin/chown i2pd:i2pd /var/log/i2pd.log +ExecStartPre=+/bin/chmod 600 /var/log/i2pd.log +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 + +[Install] +WantedBy=multi-user.target diff --git a/net-vpn/i2pd/files/i2pd-2.6.0-r3.service b/net-vpn/i2pd/files/i2pd-2.6.0-r3.service deleted file mode 100644 index 6821a00552d..000 --- a/net-vpn/i2pd/files/i2pd-2.6.0-r3.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=C++ daemon for accessing the I2P network -After=network.target - -[Service] -Type=forking -Restart=on-abnormal -PIDFile=/run/i2pd/i2pd.pid -User=i2pd -Group=i2pd -LimitNOFILE=4096 -PermissionsStartOnly=yes -ExecStartPre=/bin/mkdir -p /run/i2pd -ExecStartPre=/bin/chown i2pd:i2pd /run/i2pd -ExecStartPre=/bin/touch /run/i2pd/i2pd.pid /var/log/i2pd.log -ExecStartPre=/bin/chown i2pd:i2pd /run/i2pd/i2pd.pid /var/log/i2pd.log -ExecStart=/usr/bin/i2pd --daemon --service --pidfile=/run/i2pd/i2pd.pid --log=file --logfile=/var/log/i2pd.log --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf - -[Install] -WantedBy=multi-user.target - diff --git a/net-vpn/i2pd/i2pd-2.38.0.ebuild b/net-vpn/i2pd/i2pd-2.38.0.ebuild index 2422eec0aa6..847dab8ce29 100644 --- a/net-vpn/i2pd/i2pd-2.38.0.ebuild +++ b/net-vpn/i2pd/i2pd-2.38.0.ebuild @@ -75,7 +75,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 - systemd_newunit "${FILESDIR}/i2pd-2.6.0-r3.service" i2pd.service + systemd_newunit "${FILESDIR}/i2pd-2.38.0.service" i2pd.service # logrotate insinto /etc/logrotate.d
[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/files/
commit: 95a4eb3373930e682d11c74d1e3f101306eb9eb8 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Mar 23 20:00:11 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Mar 24 11:41:04 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a4eb33 net-vpn/i2pd: remove unused patch Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/20085 Signed-off-by: Joonas Niilola gentoo.org> net-vpn/i2pd/files/i2pd-2.35.0-avx-detection.patch | 32 -- 1 file changed, 32 deletions(-) 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 deleted file mode 100644 index 6e407f1978c..000 --- a/net-vpn/i2pd/files/i2pd-2.35.0-avx-detection.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ca3b8191510c1006d031d02c50edcf6b4f6a6e8f Mon Sep 17 00:00:00 2001 -From: R4SAS -Date: Thu, 10 Dec 2020 18:32:41 +0300 -Subject: [PATCH] [avx] check ig c++ target supports AVX - -Signed-off-by: R4SAS - 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__
[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/files/
commit: e6062546830080e8559eb4f6f08b6818509facbc Author: Michael Mair-Keimberger gmail com> AuthorDate: Mon Oct 21 18:20:34 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Tue Oct 22 05:27:18 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6062546 net-vpn/i2pd: remove unused patch Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/13374 Signed-off-by: Joonas Niilola gentoo.org> net-vpn/i2pd/files/i2pd-2.25.0-link.patch | 13 - 1 file changed, 13 deletions(-) diff --git a/net-vpn/i2pd/files/i2pd-2.25.0-link.patch b/net-vpn/i2pd/files/i2pd-2.25.0-link.patch deleted file mode 100644 index 52c5dc74527..000 --- a/net-vpn/i2pd/files/i2pd-2.25.0-link.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt -index e50bbc865..949f6a46e 100644 -https://github.com/PurpleI2P/i2pd/issues/1353 a/build/CMakeLists.txt -+++ b/build/CMakeLists.txt -@@ -470,6 +470,7 @@ if (WITH_BINARY) - if (WITH_STATIC) - set(DL_LIB ${CMAKE_DL_LIBS}) - endif() -+ target_link_libraries(libi2pd ${Boost_LIBRARIES} ${ZLIB_LIBRARY}) - target_link_libraries( "${PROJECT_NAME}" libi2pd libi2pdclient ${DL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_EXTRA} ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES}) - - install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime)
[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/files/, net-vpn/i2pd/
commit: 4246473bb004e13e13f1f0b79c9a612dfa881836 Author: Alexey Korepanov yandex ru> AuthorDate: Tue May 21 23:10:23 2019 + Commit: Michał Górny gentoo org> CommitDate: Thu Jun 6 17:11:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4246473b net-vpn/i2pd: bump EAPI to 7 Signed-off-by: Alexey Korepanov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/11998 Signed-off-by: Michał Górny gentoo.org> net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch | 22 + net-vpn/i2pd/files/i2pd-2.25.0-link.patch | 13 +++ net-vpn/i2pd/i2pd-2.25.0-r1.ebuild| 123 ++ 3 files changed, 158 insertions(+) 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 new file mode 100644 index 000..af0590be32f --- /dev/null +++ b/net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch @@ -0,0 +1,22 @@ +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.25.0-link.patch b/net-vpn/i2pd/files/i2pd-2.25.0-link.patch new file mode 100644 index 000..52c5dc74527 --- /dev/null +++ b/net-vpn/i2pd/files/i2pd-2.25.0-link.patch @@ -0,0 +1,13 @@ +diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt +index e50bbc865..949f6a46e 100644 +https://github.com/PurpleI2P/i2pd/issues/1353 +--- a/build/CMakeLists.txt b/build/CMakeLists.txt +@@ -470,6 +470,7 @@ if (WITH_BINARY) + if (WITH_STATIC) + set(DL_LIB ${CMAKE_DL_LIBS}) + endif() ++ target_link_libraries(libi2pd ${Boost_LIBRARIES} ${ZLIB_LIBRARY}) + target_link_libraries( "${PROJECT_NAME}" libi2pd libi2pdclient ${DL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_EXTRA} ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES}) + + install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime) diff --git a/net-vpn/i2pd/i2pd-2.25.0-r1.ebuild b/net-vpn/i2pd/i2pd-2.25.0-r1.ebuild new file mode 100644 index 000..43a6b4401bd --- /dev/null +++ b/net-vpn/i2pd/i2pd-2.25.0-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit systemd user cmake-utils 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 websocket" + +# if using libressl, require >=boost-1.65, see #597798 +RDEPEND=" + !static? ( + dev-libs/boost:=[threads] + !libressl? ( dev-libs/openssl:0=[-bindist] ) + libressl? ( + dev-libs/libressl:0= + >=dev-libs/boost-1.65:= + ) + 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] + >=dev-libs/boost-1.65:= + ) + sys-libs/zlib:=[static-libs] + upnp? ( net-libs/miniupnpc[static-libs] ) + ) + websocket? ( dev-cpp/websocketpp )" + +I2PD_USER=i2pd +I2PD_GROUP=i2pd + +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-link.patch" + "${FILESDIR}/i2pd-2.25.0-lib-path.patch" ) + +pkg_pretend() { + if tc-is-gcc && ! ver_test "$(gcc-version)" -ge "4.7"; then + die "At least gcc 4.7 is required" + fi + 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) +
[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/files/
commit: 0a11f9b2d753d304a11f9091895d1b7dc0448913 Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Nov 28 19:07:08 2017 + Commit: Anthony G. Basile gentoo org> CommitDate: Tue Nov 28 20:05:05 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a11f9b2 net-vpn/i2pd: remove unused patch .../i2pd-2.5.1-fix_installed_components.patch | 30 -- 1 file changed, 30 deletions(-) diff --git a/net-vpn/i2pd/files/i2pd-2.5.1-fix_installed_components.patch b/net-vpn/i2pd/files/i2pd-2.5.1-fix_installed_components.patch deleted file mode 100644 index 0416901117c..000 --- a/net-vpn/i2pd/files/i2pd-2.5.1-fix_installed_components.patch +++ /dev/null @@ -1,30 +0,0 @@ a/build/CMakeLists.txt.old 2016-02-04 21:30:50.954251000 +0100 -+++ b/build/CMakeLists.txt 2016-02-04 21:34:50.457793484 +0100 -@@ -356,10 +356,6 @@ - endif () - endif () - --install(FILES ../LICENSE -- DESTINATION . -- COMPONENT Runtime -- ) - # Take a copy on Appveyor - install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICENSE" - DESTINATION . -@@ -369,7 +365,6 @@ - ) - - file(GLOB_RECURSE I2PD_SOURCES "../*.cpp" "../build" "../Win32" "../Makefile*") --install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source) - # install(DIRECTORY ../ DESTINATION src/ - # # OPTIONAL - # COMPONENT Source FILES_MATCHING -@@ -378,7 +373,7 @@ - # ) - - file(GLOB I2PD_HEADERS "../*.h") --install(FILES ${I2PD_HEADERS} DESTINATION src/ COMPONENT Headers) -+install(FILES ${I2PD_HEADERS} DESTINATION "include/${PROJECT_NAME}" COMPONENT Headers) - # install(DIRECTORY ../ DESTINATION src/ - # # OPTIONAL - # COMPONENT Headers FILES_MATCHING
[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/files/
commit: 56f24d9297c16a46d3f5854ac57df4e371930ad0 Author: Alexey Korepanov yandex ru> AuthorDate: Wed Nov 15 20:37:50 2017 + Commit: Anthony G. Basile gentoo org> CommitDate: Fri Nov 17 09:57:19 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56f24d92 net-vpn/i2pd: update init script Signed-off-by: Anthony G. Basile gentoo.org> net-vpn/i2pd/files/i2pd-2.6.0-r3.initd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd b/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd index 09c83927b20..b09b4454e96 100644 --- a/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd +++ b/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd @@ -11,8 +11,10 @@ user="${I2PD_USER}:${I2PD_GROUP}" start_stop_daemon_args=" --user \"${user}\" --pidfile \"${I2PD_PID}\" ---progress --retry 'SIGTERM/20/SIGKILL/20' +--progress " +retry="SIGTERM/20/SIGKILL/20" + I2PD_PID_DIR=$(dirname "${I2PD_PID}") extra_started_commands="graceful"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/files/, net-vpn/i2pd/
commit: 9b6ae0631b52d5dd18c7af7f89494972974beb9f Author: Alexey Korepanov yandex ru> AuthorDate: Mon Jun 5 10:26:22 2017 + Commit: Anthony G. Basile gentoo org> CommitDate: Mon Jun 5 11:23:25 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b6ae063 net-vpn/i2pd: 2.14.0 version bump net-vpn/i2pd/Manifest | 1 + .../i2pd-2.14.0-fix_installed_components.patch | 31 +++ net-vpn/i2pd/i2pd-2.14.0.ebuild| 98 ++ 3 files changed, 130 insertions(+) diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest index 228b6d925b7..d9ed33b3c30 100644 --- a/net-vpn/i2pd/Manifest +++ b/net-vpn/i2pd/Manifest @@ -1,3 +1,4 @@ DIST i2pd-2.11.0.tar.gz 3091516 SHA256 4d7946e33a6a1dd4439590ea23b494f36e6fbcb81f7b36857bf264413a19e9db SHA512 c4964c23f6852e6ce225de6f6f03ce4e5c52a6ec2b925b82c01be574b14196112079ada5864b10f353c3dd385645db550d5ce290647b6d980225a79c64f19ddb WHIRLPOOL f2a4c42ad2df09188b5be8fad23f7f2ec2080e17b980b55c1647c13499c6b3cce88d6e9c2fbfd34bf8783a0b52c15659775351835ae181e58357c455ebb1dea1 DIST i2pd-2.12.0.tar.gz 3150471 SHA256 afb763aea2a4f4b51e327352d5da82ec08e84735d28db9af7710563a117fc648 SHA512 70b6143e713d43e24b780239aed899fb17d6224ef053020c738369ca110241e4624ae5c69b04a75a037b68094d3030be5296509ff699905ef7c175447d093232 WHIRLPOOL 8b5fb9a5123ce700a646de72a81e476b3545ad62f4bb8d143438bc1e1b6393b381e13224b3d538fa063d24b732588df5b3abe9b2d5485473d83038f01d296b4e DIST i2pd-2.13.0.tar.gz 3131893 SHA256 9fbf9750503dd565ba5b31b16e1de959bda59530f088d40b14618d3ef238b065 SHA512 146e68559f44bcc8447857a0deb8be4a59d1b8032826af368355f9e9309b619a3575f99fed2b45071784c728a2265cb6446e816baf797b71aeffa09d1cbdd004 WHIRLPOOL 62b65f1b0cd8f9bf04bbaae61604e664f1b7f6f8eea30b9b41227659f6237e2739d3943ad91852462b229b0b4a718213b96aed63758680af135598224ca2d50f +DIST i2pd-2.14.0.tar.gz 1906272 SHA256 3cb5751d9584449721e2f3ae878411b652863fa7093994f1d8cce1fd3b40bf71 SHA512 39e6cc0ed0456b93c9a7462e5630d7be87c3dda91887bef7aec50b404212f1cef02b94488ded1918eaf4264d9be5da767dab4652cf2b8470fadfa89886e42e7b WHIRLPOOL fcfb403889f33a0cce4ed9d9508b59c5deeade85230aec4929b0ee3a00ec57d9c3bf9644e13796e158bd1cd893f69b0cb9f86dba25543e0348ed743188dd3d2c 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 new file mode 100644 index 000..fe7bdcc4083 --- /dev/null +++ b/net-vpn/i2pd/files/i2pd-2.14.0-fix_installed_components.patch @@ -0,0 +1,31 @@ +--- 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.14.0.ebuild b/net-vpn/i2pd/i2pd-2.14.0.ebuild new file mode 100644 index 000..752102811a0 --- /dev/null +++ b/net-vpn/i2pd/i2pd-2.14.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils systemd user cmake-utils + +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 ~x86" +IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp" + +RDEPEND="!static? ( >=dev-libs/boost-1.49[threads] + !libressl? ( dev-libs/openssl:0[-bindist] ) + libressl? ( dev-libs/libressl ) + upnp? ( net-libs/miniupnpc ) + )" +DEPEND="${RDEPEND} + static? ( >=dev-libs/boost-1.49[static-libs,threads] + !libressl? ( dev-libs/openssl:0[static-libs] ) + libressl? ( dev-libs/libressl[static-libs] ) + upnp? ( net-libs/miniupnpc[static-libs] ) ) + i2p-hardening? ( >=sys-devel/gcc-4.7 ) + || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )" + +I2PD_USER=i2pd +I2PD_GROUP=i2pd +