* [gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/files/, net-misc/i2pd/
@ 2016-02-06 10:17 Patrice Clement
0 siblings, 0 replies; 10+ messages in thread
From: Patrice Clement @ 2016-02-06 10:17 UTC (permalink / raw
To: gentoo-commits
commit: d7f91b1cff28c329e5e0515ff5a67ef0bca1dd25
Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Wed Feb 3 21:41:46 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Feb 4 21:18:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f91b1c
net-misc/i2pd: version bump 2.4.0
- rewrote configuration to use ECDSA-P256 for signed messages
- default config now includes irc pre-setup (irc.postman.i2p)
Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches
net-misc/i2pd/Manifest | 1 +
.../i2pd-2.4.0-fix_installed_components.patch | 30 ++++++++
net-misc/i2pd/files/i2pd.confd | 5 +-
net-misc/i2pd/files/i2pd.initd | 8 +--
net-misc/i2pd/files/i2pd.service | 2 +-
net-misc/i2pd/files/tunnels.cfg | 17 +++++
net-misc/i2pd/i2pd-2.4.0.ebuild | 80 ++++++++++++++++++++++
7 files changed, 137 insertions(+), 6 deletions(-)
diff --git a/net-misc/i2pd/Manifest b/net-misc/i2pd/Manifest
index a4e7a86..c41232f 100644
--- a/net-misc/i2pd/Manifest
+++ b/net-misc/i2pd/Manifest
@@ -1,3 +1,4 @@
DIST i2pd-0.10.0.tar.gz 391777 SHA256 5195e01a2e5ebad580631fbf3e5f17cf158f4ee323cbc4b0200ae046fbefc733 SHA512 ab0d32108f8ca1093ae3fcd752deeb8bed018074a8dd04fbcbffe49f1a2a78c3f2cf00341ddad18e8c8007edba6b75e45bce4357a621540fcdf7c2b74a26e726 WHIRLPOOL 19e8a92e20ae6fe1500a3f5462580d4896d5906be6ef307e48ea465712f5266b5251d75ad8b5636a3b894da3b3100dde329ddc733f7cd394499810d1bc65a083
DIST i2pd-0.5.0.tar.gz 352460 SHA256 7f2033fe1c380c458722d68f611d0fa69a844ceba71db13a918adac6e01a0594 SHA512 08c51dc5fa3712af54b7dcc9f4524fb19d7b42a279646c7852efdf1fd49cf4ea24192c936229954c3733ba4bcbc480205bcfeca739ffae3642f5c62bd24e0cf6 WHIRLPOOL 1812a8733f17cd6b9885cf8af3ad0412f238356121118d46fbed53cb826aaa6c878a045adb69e0a692fd5cd3fc720192c635f4e594d3d42efb2116f14bbba9e9
DIST i2pd-0.6.0.tar.gz 360829 SHA256 149a8c2d870ebc3988aea06eec906c9e968b3d89ae282bd3b2b5ead205f7c3b7 SHA512 084c75c5f972dbc07740119c3ae1711924cf740391703a95752164eab7a04d6cea0cfb302530e1e1bebafb54f9eed552e747479ae55fb053e824cdf059ab3266 WHIRLPOOL a858a49173755e052f31a95f4f7075965dac0c89943a7dc05c3c88d51b646ab86a7510a9533e33d9c5f0e7736e9f702f6fd0de4e6a841cc3ec57ea5aaf2b991c
+DIST i2pd-2.4.0.tar.gz 379197 SHA256 a77ce5f48796229ab7e1fd98ca0168d336efa65eb3ff6e70ece056564c943094 SHA512 37a896c4ea6cfa118edcbed279e9ff886625f72289bf919ea0f8f801e82dbac959e4754e3729c6ef4cdc593c7fcb412685d30375f484cd0285e9f70f1a3702d8 WHIRLPOOL cd624db15e290c3d4b2090538e9872db3c5d90ce3fdd33bc871842c29a25515f474f55e2daac95a2fd32a052593bb5ef2fb18ce328ff282a3669aa19046b2e65
diff --git a/net-misc/i2pd/files/i2pd-2.4.0-fix_installed_components.patch b/net-misc/i2pd/files/i2pd-2.4.0-fix_installed_components.patch
new file mode 100644
index 0000000..84749c8
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.4.0-fix_installed_components.patch
@@ -0,0 +1,30 @@
+--- build/CMakeLists.txt.old 2016-02-04 21:30:50.954251000 +0100
++++ 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.confd b/net-misc/i2pd/files/i2pd.confd
index 7913af7..fb93755 100644
--- a/net-misc/i2pd/files/i2pd.confd
+++ b/net-misc/i2pd/files/i2pd.confd
@@ -2,5 +2,8 @@ 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="--conf=/etc/i2pd.conf"
+I2PDOPTIONS="--conf=${I2PD_CFGDIR}i2pd.conf --tunconf=${I2PD_CFGDIR}tunnels.cfg"
+# for debugging purposes
+#I2PDOPTIONS="--conf=${I2PD_CFGDIR}i2pd.conf --tunconf=${I2PD_CFGDIR}tunnels.cfg --log=file --logfile=${I2PD_LOG}"
diff --git a/net-misc/i2pd/files/i2pd.initd b/net-misc/i2pd/files/i2pd.initd
index cc3d234..1c12209 100644
--- a/net-misc/i2pd/files/i2pd.initd
+++ b/net-misc/i2pd/files/i2pd.initd
@@ -11,14 +11,14 @@ depend() {
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 -b -u "${I2PD_USER}:${I2PD_GROUP}" /usr/bin/i2pd -- ${I2PDOPTIONS}
+ checkpath -f "${I2PD_LOG}" -o "${I2PD_USER}:${I2PD_GROUP}"
+ checkpath -f "${I2PD_PID}" -o "${I2PD_USER}:${I2PD_GROUP}"
+ start-stop-daemon -S -b -u "${I2PD_USER}:${I2PD_GROUP}" /usr/bin/i2pd -- ${I2PDOPTIONS}
eend $?
}
stop() {
ebegin "Stopping ${SVCNAME}"
- start-stop-daemon -K -p "${I2PD_PID}"
+ start-stop-daemon -K -p "${I2PD_PID}" -R SIGTERM/20 SIGKILL/20 -P
eend $?
}
diff --git a/net-misc/i2pd/files/i2pd.service b/net-misc/i2pd/files/i2pd.service
index 7f44cde..2eee094 100644
--- a/net-misc/i2pd/files/i2pd.service
+++ b/net-misc/i2pd/files/i2pd.service
@@ -11,7 +11,7 @@ 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/lib/i2pd/i2p --conf=/etc/i2pd.conf
+ExecStart=/usr/lib/i2pd/i2p --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.cfg
[Install]
WantedBy=multi-user.target
diff --git a/net-misc/i2pd/files/tunnels.cfg b/net-misc/i2pd/files/tunnels.cfg
new file mode 100644
index 0000000..e35504a
--- /dev/null
+++ b/net-misc/i2pd/files/tunnels.cfg
@@ -0,0 +1,17 @@
+# outgoing tunnel sample, to remote service
+# mandatory parameters:
+# * type -- always "client"
+# * port -- local port to listen to
+# * destination -- i2p hostname
+# optional parameters (may be omitted)
+# * keys -- our identity, if unset, will be generated on every startup,
+# if set and file missing, keys will be generated and placed to this file
+# * address -- local interface to bind
+# * signaturetype -- signature type for new destination. 0,1 or 7
+[IRC]
+type = client
+address = 127.0.0.1
+port = 6668
+destination = irc.postman.i2p
+keys = irc-keys.dat
+signaturetype = 1
diff --git a/net-misc/i2pd/i2pd-2.4.0.ebuild b/net-misc/i2pd/i2pd-2.4.0.ebuild
new file mode 100644
index 0000000..bf59082
--- /dev/null
+++ b/net-misc/i2pd/i2pd-2.4.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
+
+RDEPEND="!static? ( >=dev-libs/boost-1.46[threads]
+ dev-libs/crypto++
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ upnp? ( net-libs/miniupnpc )
+ )"
+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/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_USER:-i2pd}"
+I2PD_GROUP="${I2PD_GROUP:-i2pd}"
+
+CMAKE_USE_DIR="${S}/build"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-fix_installed_components.patch"
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+ -DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+ -DWITH_PCH=$(usex pch ON OFF)
+ -DWITH_STATIC=$(usex static ON OFF)
+ -DWITH_UPNP=$(usex upnp ON OFF)
+ -DWITH_LIBRARY=ON
+ -DWITH_BINARY=ON
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ dodoc README.md
+ doman "${FILESDIR}/${PN}.1"
+ keepdir /var/lib/i2pd/
+ insinto "/var/lib/i2pd"
+ doins -r "${S}/contrib/certificates"
+ fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
+ fperms 700 /var/lib/i2pd/
+ dodir "/etc/${PN}"
+ insinto "/etc/${PN}"
+ doins "${FILESDIR}/${PN}.conf"
+ doins "${FILESDIR}/tunnels.cfg"
+ fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf"
+ fperms 600 "/etc/${PN}/${PN}.conf"
+ dodir /usr/share/i2pd
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ doenvd "${FILESDIR}/99${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+}
+
+pkg_setup() {
+ enewgroup "${I2PD_GROUP}"
+ enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/files/, net-misc/i2pd/
@ 2016-02-18 19:42 Patrice Clement
0 siblings, 0 replies; 10+ messages in thread
From: Patrice Clement @ 2016-02-18 19:42 UTC (permalink / raw
To: gentoo-commits
commit: 8993bcdf6bd7cbfe5e55142f666dc4be52941dd2
Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Sun Feb 14 14:44:42 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 14:52:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8993bcdf
net-misc/i2pd: adjust systemd .service to point to /usr/bin/i2pd
Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches
net-misc/i2pd/files/i2pd-2.4.0.service | 18 ++++++++++++++++++
.../i2pd/{i2pd-2.4.0.ebuild => i2pd-2.4.0-r1.ebuild} | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/net-misc/i2pd/files/i2pd-2.4.0.service b/net-misc/i2pd/files/i2pd-2.4.0.service
new file mode 100644
index 0000000..c5acee0
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.4.0.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 --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.cfg
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-misc/i2pd/i2pd-2.4.0.ebuild b/net-misc/i2pd/i2pd-2.4.0-r1.ebuild
similarity index 97%
rename from net-misc/i2pd/i2pd-2.4.0.ebuild
rename to net-misc/i2pd/i2pd-2.4.0-r1.ebuild
index bf59082..bf6489c 100644
--- a/net-misc/i2pd/i2pd-2.4.0.ebuild
+++ b/net-misc/i2pd/i2pd-2.4.0-r1.ebuild
@@ -68,7 +68,7 @@ src_install() {
dodir /usr/share/i2pd
newconfd "${FILESDIR}/${PN}.confd" "${PN}"
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_newunit "${FILESDIR}/${PN}-2.4.0.service" "${PN}.service"
doenvd "${FILESDIR}/99${PN}"
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotate" "${PN}"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/files/, net-misc/i2pd/
@ 2016-03-19 16:28 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2016-03-19 16:28 UTC (permalink / raw
To: gentoo-commits
commit: c5e7dbfc1b9e551937649a864ed0649e02625ac4
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 16:27:25 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 16:27:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5e7dbfc
net-misc/i2pd: remove older version
Package-Manager: portage-2.2.26
net-misc/i2pd/Manifest | 2 -
net-misc/i2pd/files/i2pd.confd | 9 -----
net-misc/i2pd/files/i2pd.initd | 24 ------------
net-misc/i2pd/files/i2pd.logrotate | 14 -------
net-misc/i2pd/files/i2pd.service | 18 ---------
net-misc/i2pd/i2pd-0.10.0.ebuild | 65 -------------------------------
net-misc/i2pd/i2pd-2.4.0-r1.ebuild | 80 --------------------------------------
net-misc/i2pd/i2pd-2.5.0.ebuild | 80 --------------------------------------
8 files changed, 292 deletions(-)
diff --git a/net-misc/i2pd/Manifest b/net-misc/i2pd/Manifest
index 143c572..34387a1 100644
--- a/net-misc/i2pd/Manifest
+++ b/net-misc/i2pd/Manifest
@@ -1,4 +1,2 @@
-DIST i2pd-0.10.0.tar.gz 391777 SHA256 5195e01a2e5ebad580631fbf3e5f17cf158f4ee323cbc4b0200ae046fbefc733 SHA512 ab0d32108f8ca1093ae3fcd752deeb8bed018074a8dd04fbcbffe49f1a2a78c3f2cf00341ddad18e8c8007edba6b75e45bce4357a621540fcdf7c2b74a26e726 WHIRLPOOL 19e8a92e20ae6fe1500a3f5462580d4896d5906be6ef307e48ea465712f5266b5251d75ad8b5636a3b894da3b3100dde329ddc733f7cd394499810d1bc65a083
-DIST i2pd-2.4.0.tar.gz 379197 SHA256 a77ce5f48796229ab7e1fd98ca0168d336efa65eb3ff6e70ece056564c943094 SHA512 37a896c4ea6cfa118edcbed279e9ff886625f72289bf919ea0f8f801e82dbac959e4754e3729c6ef4cdc593c7fcb412685d30375f484cd0285e9f70f1a3702d8 WHIRLPOOL cd624db15e290c3d4b2090538e9872db3c5d90ce3fdd33bc871842c29a25515f474f55e2daac95a2fd32a052593bb5ef2fb18ce328ff282a3669aa19046b2e65
DIST i2pd-2.5.0.tar.gz 391637 SHA256 ea01cc99c443f838ab8faf3440da45dd2ca666ab627aa54b17c565c37782b01d SHA512 77be4f2b3baf86bcf0c8f4aebd7c5fbef80654d99ff332aafcf1cd717271d80fcfe717047ac47599cb0ecfdf32347cf1c0e0be2b79759f5194c1a7e7910a42ca WHIRLPOOL 929cb33849a51c5c214c64bef0e431c62738a6584fe63aa6ebcbd2febeb854135e5e16ed0f95c64bdfc241b15faaf45226347d3851a64421dd53e53932e03456
DIST i2pd-2.5.1.tar.gz 394332 SHA256 4cdc98676eb1d020dc11c8f2c7c5d0e739bf8c858c97eab235449cea98ca9d2c SHA512 33293e96a2715696a8cb7bcabe995ffc9a5b374e4fa4b72eebf878a8b4603600a910ded1dc775d08d89eb881f0492118ef837a0432664f4a492008b31dafec92 WHIRLPOOL c9b02580d4e6af8430e7ca0d90ad45653df700b4e955f9fcd852301129801ded284b7583c8a9a1398457caa04c8ca5080655c6bbb94686ee56af9547752c753b
diff --git a/net-misc/i2pd/files/i2pd.confd b/net-misc/i2pd/files/i2pd.confd
deleted file mode 100644
index fb93755..0000000
--- a/net-misc/i2pd/files/i2pd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-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="--conf=${I2PD_CFGDIR}i2pd.conf --tunconf=${I2PD_CFGDIR}tunnels.cfg"
-# for debugging purposes
-#I2PDOPTIONS="--conf=${I2PD_CFGDIR}i2pd.conf --tunconf=${I2PD_CFGDIR}tunnels.cfg --log=file --logfile=${I2PD_LOG}"
diff --git a/net-misc/i2pd/files/i2pd.initd b/net-misc/i2pd/files/i2pd.initd
deleted file mode 100644
index 1c12209..0000000
--- a/net-misc/i2pd/files/i2pd.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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 -b -u "${I2PD_USER}:${I2PD_GROUP}" /usr/bin/i2pd -- ${I2PDOPTIONS}
- 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.logrotate b/net-misc/i2pd/files/i2pd.logrotate
deleted file mode 100644
index 790cd2a..0000000
--- a/net-misc/i2pd/files/i2pd.logrotate
+++ /dev/null
@@ -1,14 +0,0 @@
-/var/log/i2pd.log {
- rotate 4
- weekly
- missingok
- notifempty
- compress
- delaycompress
- copytruncate
- create 640 i2pd i2pd
- postrotate
- /etc/init.d/i2pd restart >/dev/null
- endscript
-}
-
diff --git a/net-misc/i2pd/files/i2pd.service b/net-misc/i2pd/files/i2pd.service
deleted file mode 100644
index 2eee094..0000000
--- a/net-misc/i2pd/files/i2pd.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[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/lib/i2pd/i2p --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.cfg
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/net-misc/i2pd/i2pd-0.10.0.ebuild b/net-misc/i2pd/i2pd-0.10.0.ebuild
deleted file mode 100644
index 29fb6fe..0000000
--- a/net-misc/i2pd/i2pd-0.10.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd user cmake-utils
-
-DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
-HOMEPAGE="https://github.com/PrivacySolutions/i2pd"
-SRC_URI="https://github.com/PrivacySolutions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening static"
-
-RDEPEND="!static? ( >=dev-libs/boost-1.46[threads] )
- !static? ( dev-libs/crypto++ )"
-DEPEND="${RDEPEND}
- static? ( >=dev-libs/boost-1.46[static-libs,threads] )
- static? ( dev-libs/crypto++[static-libs] )
- >=dev-util/cmake-2.8.5
- i2p-hardening? ( >=sys-devel/gcc-4.6 )
- || ( >=sys-devel/gcc-4.6 >=sys-devel/clang-3.3 )"
-
-I2PD_USER="${I2PD_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-
-CMAKE_USE_DIR="${S}/build"
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_with cpu_flags_x86_aes AESNI)
- $(cmake-utils_use_with i2p-hardening HARDENING)
- $(cmake-utils_use_with static STATIC)
- -DWITH_LIBRARY=OFF
- -DWITH_BINARY=ON
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- dodoc README.md
- doman "${FILESDIR}/${PN}.1"
- keepdir /var/lib/i2pd/
- fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
- fperms 700 /var/lib/i2pd/
- insinto /etc/
- doins "${FILESDIR}/${PN}.conf"
- fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}.conf"
- fperms 600 "/etc/${PN}.conf"
- dodir /usr/share/i2pd
- cp -R "${S}/contrib/certificates" "${D}/var/lib/i2pd" || die "Install failed!"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
- doenvd "${FILESDIR}/99${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-}
-
-pkg_setup() {
- enewgroup "${I2PD_GROUP}"
- enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
-}
diff --git a/net-misc/i2pd/i2pd-2.4.0-r1.ebuild b/net-misc/i2pd/i2pd-2.4.0-r1.ebuild
deleted file mode 100644
index bf6489c..0000000
--- a/net-misc/i2pd/i2pd-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-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="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
-
-RDEPEND="!static? ( >=dev-libs/boost-1.46[threads]
- dev-libs/crypto++
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- upnp? ( net-libs/miniupnpc )
- )"
-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/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_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-
-CMAKE_USE_DIR="${S}/build"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-fix_installed_components.patch"
-}
-
-src_configure() {
- mycmakeargs=(
- -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
- -DWITH_HARDENING=$(usex i2p-hardening ON OFF)
- -DWITH_PCH=$(usex pch ON OFF)
- -DWITH_STATIC=$(usex static ON OFF)
- -DWITH_UPNP=$(usex upnp ON OFF)
- -DWITH_LIBRARY=ON
- -DWITH_BINARY=ON
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- dodoc README.md
- doman "${FILESDIR}/${PN}.1"
- keepdir /var/lib/i2pd/
- insinto "/var/lib/i2pd"
- doins -r "${S}/contrib/certificates"
- fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
- fperms 700 /var/lib/i2pd/
- dodir "/etc/${PN}"
- insinto "/etc/${PN}"
- doins "${FILESDIR}/${PN}.conf"
- doins "${FILESDIR}/tunnels.cfg"
- fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf"
- fperms 600 "/etc/${PN}/${PN}.conf"
- dodir /usr/share/i2pd
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- systemd_newunit "${FILESDIR}/${PN}-2.4.0.service" "${PN}.service"
- doenvd "${FILESDIR}/99${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-}
-
-pkg_setup() {
- enewgroup "${I2PD_GROUP}"
- enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
-}
diff --git a/net-misc/i2pd/i2pd-2.5.0.ebuild b/net-misc/i2pd/i2pd-2.5.0.ebuild
deleted file mode 100644
index 1d1fa0e..0000000
--- a/net-misc/i2pd/i2pd-2.5.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-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="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
-
-RDEPEND="!static? ( >=dev-libs/boost-1.46[threads]
- dev-libs/crypto++
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- upnp? ( net-libs/miniupnpc )
- )"
-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/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_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-
-CMAKE_USE_DIR="${S}/build"
-
-src_prepare() {
- epatch "${FILESDIR}/i2pd-2.4.0-fix_installed_components.patch"
-}
-
-src_configure() {
- mycmakeargs=(
- -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
- -DWITH_HARDENING=$(usex i2p-hardening ON OFF)
- -DWITH_PCH=$(usex pch ON OFF)
- -DWITH_STATIC=$(usex static ON OFF)
- -DWITH_UPNP=$(usex upnp ON OFF)
- -DWITH_LIBRARY=ON
- -DWITH_BINARY=ON
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- dodoc README.md
- doman "${FILESDIR}/${PN}.1"
- keepdir /var/lib/i2pd/
- insinto "/var/lib/i2pd"
- doins -r "${S}/contrib/certificates"
- fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
- fperms 700 /var/lib/i2pd/
- dodir "/etc/${PN}"
- insinto "/etc/${PN}"
- doins "${FILESDIR}/${PN}.conf"
- doins "${FILESDIR}/tunnels.cfg"
- fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf"
- fperms 600 "/etc/${PN}/${PN}.conf"
- dodir /usr/share/i2pd
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- systemd_newunit "${FILESDIR}/${PN}-2.4.0.service" "${PN}.service"
- doenvd "${FILESDIR}/99${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-}
-
-pkg_setup() {
- enewgroup "${I2PD_GROUP}"
- enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/files/, net-misc/i2pd/
@ 2016-03-24 22:31 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2016-03-24 22:31 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/files/, net-misc/i2pd/
@ 2016-03-25 1:26 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2016-03-25 1:26 UTC (permalink / raw
To: gentoo-commits
commit: 364d519ede7b3932dcff0b15aad19c375b5de661
Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Fri Mar 25 00:02:40 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 01:28:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=364d519e
net-misc/i2pd: rm 2.5.1-r1 and misc old files
Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches
net-misc/i2pd/files/i2pd-2.4.0.service | 18 -----
...h => i2pd-2.5.0-fix_installed_components.patch} | 0
net-misc/i2pd/files/i2pd.conf | 4 --
net-misc/i2pd/i2pd-2.5.0-r3.ebuild | 2 +-
net-misc/i2pd/i2pd-2.5.1-r1.ebuild | 82 ----------------------
5 files changed, 1 insertion(+), 105 deletions(-)
diff --git a/net-misc/i2pd/files/i2pd-2.4.0.service b/net-misc/i2pd/files/i2pd-2.4.0.service
deleted file mode 100644
index c5acee0..0000000
--- a/net-misc/i2pd/files/i2pd-2.4.0.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[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 --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.cfg
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/net-misc/i2pd/files/i2pd-2.4.0-fix_installed_components.patch b/net-misc/i2pd/files/i2pd-2.5.0-fix_installed_components.patch
similarity index 100%
rename from net-misc/i2pd/files/i2pd-2.4.0-fix_installed_components.patch
rename to net-misc/i2pd/files/i2pd-2.5.0-fix_installed_components.patch
diff --git a/net-misc/i2pd/files/i2pd.conf b/net-misc/i2pd/files/i2pd.conf
deleted file mode 100644
index 10675e6..0000000
--- a/net-misc/i2pd/files/i2pd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-log = 1
-daemon = 1
-service = 1
-
diff --git a/net-misc/i2pd/i2pd-2.5.0-r3.ebuild b/net-misc/i2pd/i2pd-2.5.0-r3.ebuild
index 73d79de..d143616 100644
--- a/net-misc/i2pd/i2pd-2.5.0-r3.ebuild
+++ b/net-misc/i2pd/i2pd-2.5.0-r3.ebuild
@@ -34,7 +34,7 @@ I2PD_GROUP="${I2PD_GROUP:-i2pd}"
CMAKE_USE_DIR="${S}/build"
src_prepare() {
- epatch "${FILESDIR}/i2pd-2.4.0-fix_installed_components.patch"
+ epatch "${FILESDIR}/i2pd-2.5.0-fix_installed_components.patch"
}
src_configure() {
diff --git a/net-misc/i2pd/i2pd-2.5.1-r1.ebuild b/net-misc/i2pd/i2pd-2.5.1-r1.ebuild
deleted file mode 100644
index 31385b5..0000000
--- a/net-misc/i2pd/i2pd-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-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="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
-
-RDEPEND="!static? ( >=dev-libs/boost-1.46[threads]
- dev-libs/crypto++
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- upnp? ( net-libs/miniupnpc )
- )"
-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/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_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-
-CMAKE_USE_DIR="${S}/build"
-
-src_prepare() {
- epatch "${FILESDIR}/i2pd-2.4.0-fix_installed_components.patch"
-}
-
-src_configure() {
- mycmakeargs=(
- -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
- -DWITH_HARDENING=$(usex i2p-hardening ON OFF)
- -DWITH_PCH=$(usex pch ON OFF)
- -DWITH_STATIC=$(usex static ON OFF)
- -DWITH_UPNP=$(usex upnp ON OFF)
- -DWITH_LIBRARY=ON
- -DWITH_BINARY=ON
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- dodoc README.md
- doman "${FILESDIR}/${PN}.1"
- keepdir /var/lib/i2pd/
- insinto "/var/lib/i2pd"
- doins -r "${S}/contrib/certificates"
- dosym /etc/i2pd/subscriptions.txt /var/lib/i2pd/subscriptions.txt
- fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
- fperms 700 /var/lib/i2pd/
- 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"
- dodir /usr/share/i2pd
- 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}"
-}
-
-pkg_setup() {
- enewgroup "${I2PD_GROUP}"
- enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/files/, net-misc/i2pd/
@ 2016-04-03 20:04 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2016-04-03 20:04 UTC (permalink / raw
To: gentoo-commits
commit: 2f789ee74e09e00f070d55cf8be38afa198bbb24
Author: Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru>
AuthorDate: Fri Apr 1 22:27:24 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr 3 20:10:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f789ee7
net-misc/i2pd: revbump 2.6.0: housecleaning
- rename tunnels.cfg to tunnels.conf, and switch to upstream version
- use docs/i2pd.conf instead of debian/i2pd.conf, patch disabling ipv6 is no longer needed
- remove the man page as obsolete; no replacement found
- update required boost version
Author: Alexey Korepanov <kaikaikai <AT> yandex.ru>
Reviewer: M.B. <tomboy64 <AT> sina.cn>
Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches
net-misc/i2pd/files/i2pd-2.6.0.confd | 9 +++++++++
net-misc/i2pd/files/i2pd-2.6.0.service | 18 ++++++++++++++++++
.../i2pd/{i2pd-2.6.0.ebuild => i2pd-2.6.0-r1.ebuild} | 18 ++++++++----------
3 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/net-misc/i2pd/files/i2pd-2.6.0.confd b/net-misc/i2pd/files/i2pd-2.6.0.confd
new file mode 100644
index 0000000..47483ee
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.6.0.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.conf"
diff --git a/net-misc/i2pd/files/i2pd-2.6.0.service b/net-misc/i2pd/files/i2pd-2.6.0.service
new file mode 100644
index 0000000..2f1449a
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.6.0.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 /var/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.conf
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-misc/i2pd/i2pd-2.6.0.ebuild b/net-misc/i2pd/i2pd-2.6.0-r1.ebuild
similarity index 83%
rename from net-misc/i2pd/i2pd-2.6.0.ebuild
rename to net-misc/i2pd/i2pd-2.6.0-r1.ebuild
index d5e9a7d..4af91ea 100644
--- a/net-misc/i2pd/i2pd-2.6.0.ebuild
+++ b/net-misc/i2pd/i2pd-2.6.0-r1.ebuild
@@ -13,14 +13,14 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
-RDEPEND="!static? ( >=dev-libs/boost-1.46[threads]
+RDEPEND="!static? ( >=dev-libs/boost-1.49[threads]
dev-libs/crypto++
!libressl? ( dev-libs/openssl:0 )
libressl? ( dev-libs/libressl )
upnp? ( net-libs/miniupnpc )
)"
DEPEND="${RDEPEND}
- static? ( >=dev-libs/boost-1.46[static-libs,threads]
+ static? ( >=dev-libs/boost-1.49[static-libs,threads]
dev-libs/crypto++[static-libs]
!libressl? ( dev-libs/openssl:0[-bindist,static-libs] )
libressl? ( dev-libs/libressl[static-libs] )
@@ -35,7 +35,6 @@ CMAKE_USE_DIR="${S}/build"
src_prepare() {
eapply "${FILESDIR}/${PN}-2.5.1-fix_installed_components.patch"
- eapply "${FILESDIR}/${PN}-2.5.1-disable_ipv6_in_i2pd_conf.patch"
eapply_user
}
@@ -55,7 +54,6 @@ src_configure() {
src_install() {
cmake-utils_src_install
dodoc README.md
- doman "${FILESDIR}/${PN}.1"
keepdir /var/lib/i2pd/
insinto "/var/lib/i2pd"
doins -r "${S}/contrib/certificates"
@@ -64,22 +62,22 @@ src_install() {
fperms 700 /var/lib/i2pd/
dodir "/etc/${PN}"
insinto "/etc/${PN}"
- doins "${S}/debian/${PN}.conf"
+ doins "${S}/docs/${PN}.conf"
doins "${S}/debian/subscriptions.txt"
- doins "${FILESDIR}/tunnels.cfg"
+ doins "${S}/debian/tunnels.conf"
dodir /usr/share/i2pd
- newconfd "${FILESDIR}/${PN}-2.5.1.confd" "${PN}"
+ newconfd "${FILESDIR}/${PN}-2.6.0.confd" "${PN}"
newinitd "${FILESDIR}/${PN}-2.5.1.initd" "${PN}"
- systemd_newunit "${FILESDIR}/${PN}-2.5.1.service" "${PN}.service"
+ systemd_newunit "${FILESDIR}/${PN}-2.6.0.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"
+ "/etc/${PN}/tunnels.conf"
fperms 600 "/etc/${PN}/${PN}.conf" \
"/etc/${PN}/subscriptions.txt" \
- "/etc/${PN}/tunnels.cfg"
+ "/etc/${PN}/tunnels.conf"
}
pkg_setup() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/files/, net-misc/i2pd/
@ 2016-04-08 9:43 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2016-04-08 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 9c9e4daa436281959325c4cdf7feef84313c2ae8
Author: Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru>
AuthorDate: Thu Apr 7 13:48:35 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr 8 09:49:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c9e4daa
net-misc/i2pd: add graceful shutdown and fix pid file problem
net-misc/i2pd/files/i2pd-2.6.0-r2.confd | 9 ++++
net-misc/i2pd/files/i2pd-2.6.0-r2.initd | 46 +++++++++++++++++
net-misc/i2pd/files/i2pd-2.6.0-r2.service | 20 +++++++
net-misc/i2pd/i2pd-2.6.0-r2.ebuild | 86 +++++++++++++++++++++++++++++++
4 files changed, 161 insertions(+)
diff --git a/net-misc/i2pd/files/i2pd-2.6.0-r2.confd b/net-misc/i2pd/files/i2pd-2.6.0-r2.confd
new file mode 100644
index 0000000..8f5ee8c
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.6.0-r2.confd
@@ -0,0 +1,9 @@
+I2PD_USER="${I2PD_USER:-i2pd}"
+I2PD_GROUP="${I2PD_GROUP:-i2pd}"
+I2PD_LOG="/var/log/i2pd.log"
+I2PD_PID="/run/i2pd/i2pd.pid"
+
+# Options to i2pd
+I2PD_OPTIONS="--daemon --service --pidfile=${I2PD_PID} \
+--log=file --logfile=${I2PD_LOG} \
+--conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf"
diff --git a/net-misc/i2pd/files/i2pd-2.6.0-r2.initd b/net-misc/i2pd/files/i2pd-2.6.0-r2.initd
new file mode 100644
index 0000000..72b9905
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.6.0-r2.initd
@@ -0,0 +1,46 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="C++ daemon for accessing the I2P network"
+description_graceful="Graceful shutdown, takes 10 minutes"
+
+command="/usr/bin/i2pd"
+command_args="${I2PD_OPTIONS}"
+user="${I2PD_USER}:${I2PD_GROUP}"
+start_stop_daemon_args="
+ --user \"${user}\"
+ --pidfile \"${I2PD_PID}\"
+ --progress --retry 'SIGTERM/20 SIGKILL/20'
+"
+I2PD_PID_DIR=$(dirname "${I2PD_PID}")
+
+extra_started_commands="graceful"
+
+depend() {
+ use dns logger netmount
+}
+
+start_pre() {
+ if [ -z "${I2PD_USER}" ] || \
+ [ -z "${I2PD_GROUP}" ] || \
+ [ -z "${I2PD_PID}" ] || \
+ [ -z "${I2PD_LOG}" ] || \
+ [ -z "${I2PD_OPTIONS}" ] ; then
+ eerror "Not all variables I2PD_USER, I2PD_GROUP, I2PD_PID, I2PD_OPTIONS, I2PD_LOG are defined."
+ eerror "Check your /etc/conf.d/i2pd."
+ return 1
+ fi
+ checkpath -f -o "${user}" "${I2PD_LOG}"
+ checkpath -d -m 0750 -o "${user}" "${I2PD_PID_DIR}"
+}
+
+graceful() {
+ # on SIGINT, i2pd stops accepting tunnels and shuts down in 600 seconds
+ ebegin "Gracefully stopping i2pd, this takes 10 minutes"
+ mark_service_stopping
+ eval start-stop-daemon --stop ${start_stop_daemon_args} \
+ --exec "${command}" --retry 'SIGINT/620 SIGTERM/20 SIGKILL/20'
+ eend $? && mark_service_stopped
+}
diff --git a/net-misc/i2pd/files/i2pd-2.6.0-r2.service b/net-misc/i2pd/files/i2pd-2.6.0-r2.service
new file mode 100644
index 0000000..5cc34eb
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.6.0-r2.service
@@ -0,0 +1,20 @@
+[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
+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-misc/i2pd/i2pd-2.6.0-r2.ebuild b/net-misc/i2pd/i2pd-2.6.0-r2.ebuild
new file mode 100644
index 0000000..dfb03b1
--- /dev/null
+++ b/net-misc/i2pd/i2pd-2.6.0-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="GPL-2"
+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]
+ dev-libs/crypto++
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ upnp? ( net-libs/miniupnpc )
+ )"
+DEPEND="${RDEPEND}
+ static? ( >=dev-libs/boost-1.49[static-libs,threads]
+ dev-libs/crypto++[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 )
+ || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
+
+I2PD_USER="${I2PD_USER:-i2pd}"
+I2PD_GROUP="${I2PD_GROUP:-i2pd}"
+
+CMAKE_USE_DIR="${S}/build"
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-2.5.1-fix_installed_components.patch"
+ eapply_user
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+ -DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+ -DWITH_PCH=$(usex pch ON OFF)
+ -DWITH_STATIC=$(usex static ON OFF)
+ -DWITH_UPNP=$(usex upnp ON OFF)
+ -DWITH_LIBRARY=ON
+ -DWITH_BINARY=ON
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ dodoc README.md
+ keepdir /var/lib/i2pd/
+ insinto "/var/lib/i2pd"
+ doins -r "${S}/contrib/certificates"
+ dosym /etc/i2pd/subscriptions.txt /var/lib/i2pd/subscriptions.txt
+ fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
+ fperms 700 /var/lib/i2pd/
+ dodir "/etc/${PN}"
+ insinto "/etc/${PN}"
+ doins "${S}/docs/${PN}.conf"
+ doins "${S}/debian/subscriptions.txt"
+ doins "${S}/debian/tunnels.conf"
+ dodir /usr/share/i2pd
+ newconfd "${FILESDIR}/${PN}-2.6.0-r2.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}-2.6.0-r2.initd" "${PN}"
+ systemd_newunit "${FILESDIR}/${PN}-2.6.0-r2.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.conf"
+ fperms 600 "/etc/${PN}/${PN}.conf" \
+ "/etc/${PN}/subscriptions.txt" \
+ "/etc/${PN}/tunnels.conf"
+}
+
+pkg_setup() {
+ enewgroup "${I2PD_GROUP}"
+ enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/files/, net-misc/i2pd/
@ 2016-05-09 8:07 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2016-05-09 8:07 UTC (permalink / raw
To: gentoo-commits
commit: b0681327d08961e310f204ad2d0f671327480ac1
Author: Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru>
AuthorDate: Tue Apr 12 11:00:59 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon May 9 08:05:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0681327
net-misc/i2pd: use static user and group
net-misc/i2pd/files/i2pd-2.6.0-r3.confd | 9 +++++++++
net-misc/i2pd/i2pd-2.6.0-r3.ebuild | 6 +++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/net-misc/i2pd/files/i2pd-2.6.0-r3.confd b/net-misc/i2pd/files/i2pd-2.6.0-r3.confd
new file mode 100644
index 0000000..9a22d23
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.6.0-r3.confd
@@ -0,0 +1,9 @@
+I2PD_USER=i2pd
+I2PD_GROUP=i2pd
+I2PD_LOG=/var/log/i2pd.log
+I2PD_PID=/run/i2pd/i2pd.pid
+
+# Options to i2pd
+I2PD_OPTIONS="--daemon --service --pidfile=${I2PD_PID} \
+--log=file --logfile=${I2PD_LOG} \
+--conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf"
diff --git a/net-misc/i2pd/i2pd-2.6.0-r3.ebuild b/net-misc/i2pd/i2pd-2.6.0-r3.ebuild
index de78320..6500008 100644
--- a/net-misc/i2pd/i2pd-2.6.0-r3.ebuild
+++ b/net-misc/i2pd/i2pd-2.6.0-r3.ebuild
@@ -28,8 +28,8 @@ DEPEND="${RDEPEND}
i2p-hardening? ( >=sys-devel/gcc-4.7 )
|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
-I2PD_USER="${I2PD_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
+I2PD_USER=i2pd
+I2PD_GROUP=i2pd
CMAKE_USE_DIR="${S}/build"
@@ -85,7 +85,7 @@ src_install() {
doenvd "${FILESDIR}/99i2pd"
# openrc and systemd daemon routines
- newconfd "${FILESDIR}/i2pd-2.6.0-r2.confd" i2pd
+ newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
newinitd "${FILESDIR}/i2pd-2.6.0-r2.initd" i2pd
systemd_newunit "${FILESDIR}/i2pd-2.6.0-r2.service" i2pd.service
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/files/, net-misc/i2pd/
@ 2016-05-09 8:07 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2016-05-09 8:07 UTC (permalink / raw
To: gentoo-commits
commit: 73fd977b40449a5beca1fe80029898a357d98181
Author: Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru>
AuthorDate: Sun Apr 10 21:27:20 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon May 9 08:05:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73fd977b
net-misc/i2pd: correct pid file for logrotate
net-misc/i2pd/files/i2pd-2.6.0-r3.logrotate | 11 +++++++++++
net-misc/i2pd/i2pd-2.6.0-r3.ebuild | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/net-misc/i2pd/files/i2pd-2.6.0-r3.logrotate b/net-misc/i2pd/files/i2pd-2.6.0-r3.logrotate
new file mode 100644
index 0000000..251128b
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.6.0-r3.logrotate
@@ -0,0 +1,11 @@
+/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-misc/i2pd/i2pd-2.6.0-r3.ebuild b/net-misc/i2pd/i2pd-2.6.0-r3.ebuild
index 41d1ad1..de78320 100644
--- a/net-misc/i2pd/i2pd-2.6.0-r3.ebuild
+++ b/net-misc/i2pd/i2pd-2.6.0-r3.ebuild
@@ -91,7 +91,7 @@ src_install() {
# logrotate
insinto /etc/logrotate.d
- newins "${FILESDIR}/i2pd-2.5.0.logrotate" i2pd
+ newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd
}
pkg_setup() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/files/, net-misc/i2pd/
@ 2016-05-09 8:07 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2016-05-09 8:07 UTC (permalink / raw
To: gentoo-commits
commit: 77e39b3f8132f473e6addffd287b0b42f593c967
Author: Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru>
AuthorDate: Tue Apr 12 13:28:41 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon May 9 08:05:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77e39b3f
net-misc/i2pd: start-stop-daemon: remove spaces in --retry
net-misc/i2pd/files/i2pd-2.6.0-r3.initd | 46 +++++++++++++++++++++++++++++++++
net-misc/i2pd/i2pd-2.6.0-r3.ebuild | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/net-misc/i2pd/files/i2pd-2.6.0-r3.initd b/net-misc/i2pd/files/i2pd-2.6.0-r3.initd
new file mode 100644
index 0000000..81739e9
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.6.0-r3.initd
@@ -0,0 +1,46 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="C++ daemon for accessing the I2P network"
+description_graceful="Graceful shutdown, takes 10 minutes"
+
+command="/usr/bin/i2pd"
+command_args="${I2PD_OPTIONS}"
+user="${I2PD_USER}:${I2PD_GROUP}"
+start_stop_daemon_args="
+ --user \"${user}\"
+ --pidfile \"${I2PD_PID}\"
+ --progress --retry 'SIGTERM/20/SIGKILL/20'
+"
+I2PD_PID_DIR=$(dirname "${I2PD_PID}")
+
+extra_started_commands="graceful"
+
+depend() {
+ use dns logger netmount
+}
+
+start_pre() {
+ if [ -z "${I2PD_USER}" ] || \
+ [ -z "${I2PD_GROUP}" ] || \
+ [ -z "${I2PD_PID}" ] || \
+ [ -z "${I2PD_LOG}" ] || \
+ [ -z "${I2PD_OPTIONS}" ] ; then
+ eerror "Not all variables I2PD_USER, I2PD_GROUP, I2PD_PID, I2PD_OPTIONS, I2PD_LOG are defined."
+ eerror "Check your /etc/conf.d/i2pd."
+ return 1
+ fi
+ checkpath -f -o "${user}" "${I2PD_LOG}"
+ checkpath -d -m 0750 -o "${user}" "${I2PD_PID_DIR}"
+}
+
+graceful() {
+ # on SIGINT, i2pd stops accepting tunnels and shuts down in 600 seconds
+ ebegin "Gracefully stopping i2pd, this takes 10 minutes"
+ mark_service_stopping
+ eval start-stop-daemon --stop ${start_stop_daemon_args} \
+ --exec "${command}" --retry 'SIGINT/620/SIGTERM/20/SIGKILL/20'
+ eend $? && mark_service_stopped
+}
diff --git a/net-misc/i2pd/i2pd-2.6.0-r3.ebuild b/net-misc/i2pd/i2pd-2.6.0-r3.ebuild
index a35e3f1..a2d40f4 100644
--- a/net-misc/i2pd/i2pd-2.6.0-r3.ebuild
+++ b/net-misc/i2pd/i2pd-2.6.0-r3.ebuild
@@ -85,7 +85,7 @@ src_install() {
# openrc and systemd daemon routines
newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
- newinitd "${FILESDIR}/i2pd-2.6.0-r2.initd" i2pd
+ newinitd "${FILESDIR}/i2pd-2.6.0-r3.initd" i2pd
systemd_newunit "${FILESDIR}/i2pd-2.6.0-r2.service" i2pd.service
# logrotate
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-05-09 8:08 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-08 9:43 [gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/files/, net-misc/i2pd/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2016-05-09 8:07 Anthony G. Basile
2016-05-09 8:07 Anthony G. Basile
2016-05-09 8:07 Anthony G. Basile
2016-04-03 20:04 Anthony G. Basile
2016-03-25 1:26 Anthony G. Basile
2016-03-24 22:31 Anthony G. Basile
2016-03-19 16:28 Anthony G. Basile
2016-02-18 19:42 Patrice Clement
2016-02-06 10:17 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox