Merge remote-tracking branch 'github/pr/790'.

This commit is contained in:
Patrice Clement
2016-02-06 10:15:34 +00:00
11 changed files with 137 additions and 215 deletions

View File

@@ -1,3 +1,2 @@
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

View File

@@ -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

View File

@@ -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}"

View File

@@ -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 $?
}

View File

@@ -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

View File

@@ -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

View File

@@ -1,63 +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 ~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
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)
-D WITH_LIBRARY=OFF
)
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
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}"
}

View File

@@ -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 ~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}"
}

View File

@@ -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}"
}

View File

@@ -1,76 +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 git-2 cmake-multilib
DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
HOMEPAGE="https://github.com/PrivacySolutions/i2pd"
SRC_URI=""
EGIT_REPO_URI="git://github.com/PrivacySolutions/i2pd"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
IUSE="cpu_flags_x86_aes i2p-hardening library static"
RDEPEND="!static? ( >=dev-libs/boost-1.46[threads] )
!static? ( dev-libs/crypto++ )
library? ( >=dev-libs/boost-1.46[threads,${MULTILIB_USEDEP}] )
library? ( dev-libs/crypto++[${MULTILIB_USEDEP}] )"
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"
multilib_src_configure() {
mycmakeargs=(
$(cmake-utils_use_with cpu_flags_x86_aes AESNI)
$(cmake-utils_use_with i2p-hardening HARDENING)
$(cmake-utils_use_with library LIBRARY)
$(cmake-utils_use_with static STATIC)
$(multilib_is_native_abi && echo -DWITH_BINARY=ON \
|| echo -DWITH_BINARY=OFF)
)
(multilib_is_native_abi || use library) && cmake-utils_src_configure
}
multilib_src_compile() {
(multilib_is_native_abi || use library) && cmake-utils_src_compile
}
multilib_src_install() {
(multilib_is_native_abi || use library) && cmake-utils_src_install
}
multilib_src_install_all() {
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}"
}

View File

@@ -13,9 +13,6 @@
<flag name="i2p-hardening">
Compile with hardening on vanilla compilers/linkers
</flag>
<flag name="library">
Build the libi2pd library
</flag>
</use>
<upstream>
<remote-id type="github">PrivacySolutions/i2pd</remote-id>