commit: dad5a334c9ba1451055879cc6747edc1a95e1d20
Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Thu Mar 24 12:06:53 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 22:35:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad5a334
net-misc/i2pd: revbump
- fixes to config files so the i2pd service actually starts
- conversion to EAPI6
- minor beautifications
Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches
.../i2pd-2.5.1-disable_ipv6_in_i2pd_conf.patch | 9 +++++++
.../i2pd-2.5.1-fix_installed_components.patch | 30 ++++++++++++++++++++++
net-misc/i2pd/files/i2pd-2.5.1.confd | 9 +++++++
net-misc/i2pd/files/i2pd-2.5.1.initd | 26 +++++++++++++++++++
net-misc/i2pd/files/i2pd-2.5.1.service | 18 +++++++++++++
net-misc/i2pd/i2pd-2.5.1-r1.ebuild | 6 ++---
.../{i2pd-2.5.1-r1.ebuild => i2pd-2.5.1-r2.ebuild} | 22 +++++++++-------
7 files changed, 108 insertions(+), 12 deletions(-)
diff --git a/net-misc/i2pd/files/i2pd-2.5.1-disable_ipv6_in_i2pd_conf.patch
b/net-misc/i2pd/files/i2pd-2.5.1-disable_ipv6_in_i2pd_conf.patch
new file mode 100644
index 0000000..0617b65
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.5.1-disable_ipv6_in_i2pd_conf.patch
@@ -0,0 +1,9 @@
+diff -Naur i2pd-2.5.1/debian/i2pd.conf i2pd-2.5.1b/debian/i2pd.conf
+--- i2pd-2.5.1/debian/i2pd.conf 2016-03-10 19:34:16.000000000 +0100
++++ i2pd-2.5.1b/debian/i2pd.conf 2016-03-24 22:30:51.490011172 +0100
+@@ -1,4 +1,4 @@
+-ipv6
++#ipv6
+
+ [httpproxy]
+ address = 127.0.0.1
diff --git a/net-misc/i2pd/files/i2pd-2.5.1-fix_installed_components.patch
b/net-misc/i2pd/files/i2pd-2.5.1-fix_installed_components.patch
new file mode 100644
index 0000000..0416901
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.5.1-fix_installed_components.patch
@@ -0,0 +1,30 @@
+--- 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
diff --git a/net-misc/i2pd/files/i2pd-2.5.1.confd
b/net-misc/i2pd/files/i2pd-2.5.1.confd
new file mode 100644
index 0000000..af0de2f
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.5.1.confd
@@ -0,0 +1,9 @@
+I2PD_USER="${I2PD_USER:-i2pd}"
+I2PD_GROUP="${I2PD_GROUP:-i2pd}"
+I2PD_LOG="/var/log/i2pd.log"
+I2PD_PID="/var/run/i2pd.pid"
+I2PD_CFGDIR="/etc/i2pd/"
+# Options to i2pd
+I2PDOPTIONS="--daemon --service --pidfile=${I2PD_PID} \
+--log=file --logfile=${I2PD_LOG} \
+--conf=${I2PD_CFGDIR}i2pd.conf --tunconf=${I2PD_CFGDIR}tunnels.cfg"
diff --git a/net-misc/i2pd/files/i2pd-2.5.1.initd
b/net-misc/i2pd/files/i2pd-2.5.1.initd
new file mode 100644
index 0000000..3bcdd31
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.5.1.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="C++ daemon for accessing the I2P network"
+
+depend() {
+ use dns logger netmount
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ checkpath -f "${I2PD_LOG}" -o "${I2PD_USER}:${I2PD_GROUP}"
+ checkpath -f "${I2PD_PID}" -o "${I2PD_USER}:${I2PD_GROUP}"
+ start-stop-daemon -S -u "${I2PD_USER}:${I2PD_GROUP}" -p
"${I2PD_PID}.pid" /usr/bin/i2pd -- ${I2PDOPTIONS}
+ sleep 1
+ [ -e "$I2PD_PID" -a -e /proc/$(cat "$I2PD_PID") ]
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon -K -p "${I2PD_PID}" -R SIGTERM/20 SIGKILL/20 -P
+ eend $?
+}
diff --git a/net-misc/i2pd/files/i2pd-2.5.1.service
b/net-misc/i2pd/files/i2pd-2.5.1.service
new file mode 100644
index 0000000..4f79124
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.5.1.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=C++ daemon for accessing the I2P network
+After=network.target
+
+[Service]
+Type=forking
+Restart=on-abnormal
+PIDFile=/var/run/i2pd.pid
+User=i2pd
+Group=i2pd
+PermissionsStartOnly=yes
+ExecStartPre=/bin/touch /var/run/i2pd.pid /var/log/i2pd.log
+ExecStartPre=/bin/chown i2pd:i2pd /run/i2pd.pid /var/log/i2pd.log
+ExecStart=/usr/bin/i2pd --daemon --service --pidfile=/var/run/i2pd.pid
--log=file --logfile=/var/log/i2pd.log --conf=/etc/i2pd/i2pd.conf
--tunconf=/etc/i2pd/tunnels.cfg
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-misc/i2pd/i2pd-2.5.1-r1.ebuild
b/net-misc/i2pd/i2pd-2.5.1-r1.ebuild
index 73d79de..31385b5 100644
--- a/net-misc/i2pd/i2pd-2.5.1-r1.ebuild
+++ b/net-misc/i2pd/i2pd-2.5.1-r1.ebuild
@@ -68,9 +68,9 @@ src_install() {
fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf"
fperms 600 "/etc/${PN}/${PN}.conf"
dodir /usr/share/i2pd
- newconfd "${FILESDIR}/${PN}-2.5.0.confd" "${PN}"
- newinitd "${FILESDIR}/${PN}-2.5.0.initd" "${PN}"
- systemd_newunit "${FILESDIR}/${PN}-2.5.0.service" "${PN}.service"
+ newconfd "${FILESDIR}/${PN}-2.5.1.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}-2.5.1.initd" "${PN}"
+ systemd_newunit "${FILESDIR}/${PN}-2.5.1.service" "${PN}.service"
doenvd "${FILESDIR}/99${PN}"
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}-2.5.0.logrotate" "${PN}"
diff --git a/net-misc/i2pd/i2pd-2.5.1-r1.ebuild
b/net-misc/i2pd/i2pd-2.5.1-r2.ebuild
similarity index 80%
copy from net-misc/i2pd/i2pd-2.5.1-r1.ebuild
copy to net-misc/i2pd/i2pd-2.5.1-r2.ebuild
index 73d79de..30b46b3 100644
--- a/net-misc/i2pd/i2pd-2.5.1-r1.ebuild
+++ b/net-misc/i2pd/i2pd-2.5.1-r2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils systemd user cmake-utils
DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
@@ -22,7 +22,7 @@ RDEPEND="!static? ( >=dev-libs/boost-1.46[threads]
DEPEND="${RDEPEND}
static? ( >=dev-libs/boost-1.46[static-libs,threads]
dev-libs/crypto++[static-libs]
- !libressl? ( dev-libs/openssl:0[static-libs] )
+ !libressl? ( dev-libs/openssl:0[-bindist,static-libs] )
libressl? ( dev-libs/libressl[static-libs] )
upnp? ( net-libs/miniupnpc[static-libs] ) )
i2p-hardening? ( >=sys-devel/gcc-4.7 )
@@ -34,7 +34,9 @@ I2PD_GROUP="${I2PD_GROUP:-i2pd}"
CMAKE_USE_DIR="${S}/build"
src_prepare() {
- epatch "${FILESDIR}/i2pd-2.4.0-fix_installed_components.patch"
+ eapply "${FILESDIR}/${P}-fix_installed_components.patch"
+ eapply "${FILESDIR}/${P}-disable_ipv6_in_i2pd_conf.patch"
+ eapply_user
}
src_configure() {
@@ -63,17 +65,19 @@ src_install() {
dodir "/etc/${PN}"
insinto "/etc/${PN}"
doins "${S}/debian/${PN}.conf"
- doins "${FILESDIR}/tunnels.cfg"
doins "${S}/debian/subscriptions.txt"
- fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf"
- fperms 600 "/etc/${PN}/${PN}.conf"
+ doins "${FILESDIR}/tunnels.cfg"
dodir /usr/share/i2pd
- newconfd "${FILESDIR}/${PN}-2.5.0.confd" "${PN}"
- newinitd "${FILESDIR}/${PN}-2.5.0.initd" "${PN}"
- systemd_newunit "${FILESDIR}/${PN}-2.5.0.service" "${PN}.service"
+ newconfd "${FILESDIR}/${PN}-2.5.1.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}-2.5.1.initd" "${PN}"
+ systemd_newunit "${FILESDIR}/${PN}-2.5.1.service" "${PN}.service"
doenvd "${FILESDIR}/99${PN}"
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}-2.5.0.logrotate" "${PN}"
+ fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf" \
+ "/etc/${PN}/subscriptions.txt" \
+ "/etc/${PN}/tunnels.cfg"
+ fperms 600 "/etc/${PN}/"*
}
pkg_setup() {
