From 9f98f4254c4abca5ccb691e83614386866942f2a Mon Sep 17 00:00:00 2001 From: Alexey Korepanov Date: Tue, 15 Jun 2021 15:19:52 +0100 Subject: net-vpn/i2pd: fix logrotate #795123 Signed-off-by: Alexey Korepanov Closes: https://bugs.gentoo.org/795123 Closes: https://github.com/gentoo/gentoo/pull/21254 Signed-off-by: Sam James --- net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate | 13 ++++ net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate | 11 ---- net-vpn/i2pd/i2pd-2.38.0-r1.ebuild | 92 +++++++++++++++++++++++++++++ net-vpn/i2pd/i2pd-2.38.0.ebuild | 92 ----------------------------- 4 files changed, 105 insertions(+), 103 deletions(-) create mode 100644 net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate delete mode 100644 net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate create mode 100644 net-vpn/i2pd/i2pd-2.38.0-r1.ebuild delete mode 100644 net-vpn/i2pd/i2pd-2.38.0.ebuild (limited to 'net-vpn') diff --git a/net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate b/net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate new file mode 100644 index 000000000000..9245bca8c48e --- /dev/null +++ b/net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate @@ -0,0 +1,13 @@ +/var/log/i2pd.log { + rotate 4 + weekly + missingok + notifempty + create 640 i2pd i2pd + postrotate + if [ -f /run/i2pd/i2pd.pid ]; then + /bin/kill -HUP $(/bin/cat /run/i2pd/i2pd.pid) + fi + endscript +} + diff --git a/net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate b/net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate deleted file mode 100644 index 251128b7be78..000000000000 --- a/net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate +++ /dev/null @@ -1,11 +0,0 @@ -/var/log/i2pd.log { - rotate 4 - weekly - missingok - notifempty - create 640 i2pd i2pd - postrotate - /bin/kill -HUP $(cat /run/i2pd/i2pd.pid) - endscript -} - diff --git a/net-vpn/i2pd/i2pd-2.38.0-r1.ebuild b/net-vpn/i2pd/i2pd-2.38.0-r1.ebuild new file mode 100644 index 000000000000..b77a5dab495a --- /dev/null +++ b/net-vpn/i2pd/i2pd-2.38.0-r1.ebuild @@ -0,0 +1,92 @@ +# 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 static +upnp" + +RDEPEND=" + acct-user/i2pd + acct-group/i2pd + !static? ( + dev-libs/boost:=[threads] + dev-libs/openssl:0=[-bindist] + upnp? ( net-libs/miniupnpc:= ) + )" +DEPEND="${RDEPEND} + static? ( + dev-libs/boost:=[static-libs,threads] + sys-libs/zlib[static-libs] + dev-libs/openssl: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" +) + +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.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.38.0.ebuild b/net-vpn/i2pd/i2pd-2.38.0.ebuild deleted file mode 100644 index 847dab8ce292..000000000000 --- a/net-vpn/i2pd/i2pd-2.38.0.ebuild +++ /dev/null @@ -1,92 +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 static +upnp" - -RDEPEND=" - acct-user/i2pd - acct-group/i2pd - !static? ( - dev-libs/boost:=[threads] - dev-libs/openssl:0=[-bindist] - upnp? ( net-libs/miniupnpc:= ) - )" -DEPEND="${RDEPEND} - static? ( - dev-libs/boost:=[static-libs,threads] - sys-libs/zlib[static-libs] - dev-libs/openssl: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" -) - -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.38.0.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 -} -- cgit v1.2.3-65-gdbad