I2P -> .NET

This commit is contained in:
Михаил Подивилов 2019-05-11 18:25:50 +03:00
parent f176f1909b
commit fdb0ce6703
272 changed files with 5702 additions and 8931 deletions

View file

@ -1,2 +1,2 @@
archive
i2pd_*_android_binary.zip
dotnet_*_android_binary.zip

View file

@ -2,7 +2,7 @@
# Copyright (c) 2013-2017, The PurpleI2P Project
#
# This file is part of Purple i2pd project and licensed under BSD3
# This file is part of Purple dotnet project and licensed under BSD3
#
# See full license text in LICENSE file at top of project tree
@ -20,25 +20,25 @@ if [ -d archive ]; then
rm -r archive
fi
if [ -f i2pd_*_android_binary.zip ]; then
rm i2pd_*_android_binary.zip
if [ -f dotnet_*_android_binary.zip ]; then
rm dotnet_*_android_binary.zip
fi
# Prepare files for package
mkdir archive
for ABI in "${!ABILIST[@]}"; do
if [ -f ../../android_binary_only/libs/${ABI}/i2pd ]; then
cp ../../android_binary_only/libs/${ABI}/i2pd archive/i2pd-${ABILIST[$ABI]}
if [ -f ../../android_binary_only/libs/${ABI}/dotnet ]; then
cp ../../android_binary_only/libs/${ABI}/dotnet archive/dotnet-${ABILIST[$ABI]}
fi
done
cp i2pd archive/i2pd
cp dotnet archive/dotnet
cp -rH ../../android/assets/* archive/
# Compress files
cd archive
zip -r6 ../i2pd_${GITDESC}_android_binary.zip .
zip -r6 ../dotnet_${GITDESC}_android_binary.zip .
# Remove temporary folder
cd ..

View file

@ -2,7 +2,7 @@
# Copyright (c) 2013-2019, The PurpleI2P Project
#
# This file is part of Purple i2pd project and licensed under BSD3
# This file is part of Purple dotnet project and licensed under BSD3
#
# See full license text in LICENSE file at top of project tree
#
@ -25,9 +25,9 @@ if [ -z $screenfind ]; then
exit 1;
fi
if [ -z i2pd-$arch ]; then
echo "Can't find i2pd binary for your archtecture.";
if [ -z dotnet-$arch ]; then
echo "Can't find dotnet binary for your archtecture.";
exit 1;
fi
screen -AmdS i2pd ./i2pd-$arch --datadir=$DIR
screen -AmdS dotnet ./dotnet-$arch --datadir=$DIR

View file

@ -1,10 +1,10 @@
# Basic profile for i2pd
# Basic profile for dotnet
# Should work without modifications with Ubuntu/Debian packages
# Author: Darknet Villain <supervillain@riseup.net>
#
#include <tunables/global>
/usr/sbin/i2pd {
/usr/sbin/dotnet {
#include <abstractions/base>
network inet dgram,
@ -22,15 +22,15 @@
/run/systemd/resolve/stub-resolv.conf r,
# path specific (feel free to modify if you have another paths)
/etc/i2pd/** r,
/run/i2pd/i2pd.pid rwk,
/var/lib/i2pd/** rw,
/var/log/i2pd/i2pd.log w,
/var/run/i2pd/i2pd.pid rwk,
/usr/sbin/i2pd mr,
/usr/share/i2pd/** r,
/etc/dotnet/** r,
/run/dotnet/dotnet.pid rwk,
/var/lib/dotnet/** rw,
/var/log/dotnet/dotnet.log w,
/var/run/dotnet/dotnet.pid rwk,
/usr/sbin/dotnet mr,
/usr/share/dotnet/** r,
# user homedir (if started not by init.d or systemd)
owner @{HOME}/.i2pd/ rw,
owner @{HOME}/.i2pd/** rwk,
owner @{HOME}/.dotnet/ rw,
owner @{HOME}/.dotnet/** rwk,
}

View file

@ -1,2 +1,2 @@
d /var/run/i2pd 0755 i2pd i2pd - -
d /var/log/i2pd 0755 i2pd i2pd - -
d /var/run/dotnet 0755 dotnet dotnet - -
d /var/log/dotnet 0755 dotnet dotnet - -

View file

@ -6,18 +6,18 @@ ARG GIT_BRANCH="openssl"
ENV GIT_BRANCH=${GIT_BRANCH}
ARG GIT_TAG=""
ENV GIT_TAG=${GIT_TAG}
ARG REPO_URL="https://github.com/PurpleI2P/i2pd.git"
ARG REPO_URL="https://github.com/PurpleI2P/dotnet.git"
ENV REPO_URL=${REPO_URL}
ENV I2PD_HOME="/home/i2pd"
ENV DATA_DIR="${I2PD_HOME}/data"
ENV DOTNET_HOME="/home/dotnet"
ENV DATA_DIR="${DOTNET_HOME}/data"
RUN mkdir -p "$I2PD_HOME" "$DATA_DIR" \
&& adduser -S -h "$I2PD_HOME" i2pd \
&& chown -R i2pd:nobody "$I2PD_HOME"
RUN mkdir -p "$DOTNET_HOME" "$DATA_DIR" \
&& adduser -S -h "$DOTNET_HOME" dotnet \
&& chown -R dotnet:nobody "$DOTNET_HOME"
#
# Each RUN is a layer, adding the dependencies and building i2pd in one layer takes around 8-900Mb, so to keep the
# Each RUN is a layer, adding the dependencies and building dotnet in one layer takes around 8-900Mb, so to keep the
# image under 20mb we need to remove all the build dependencies in the same "RUN" / layer.
#
@ -27,20 +27,20 @@ RUN mkdir -p "$I2PD_HOME" "$DATA_DIR" \
RUN apk --no-cache --virtual build-dependendencies add make gcc g++ libtool zlib-dev boost-dev build-base openssl-dev openssl git \
&& mkdir -p /tmp/build \
&& cd /tmp/build && git clone -b ${GIT_BRANCH} ${REPO_URL} \
&& cd i2pd \
&& cd dotnet \
&& if [ -n "${GIT_TAG}" ]; then git checkout tags/${GIT_TAG}; fi \
&& make \
&& cp -R contrib/certificates /i2pd_certificates \
&& cp -R contrib/certificates /dotnet_certificates \
&& mkdir -p /usr/local/bin \
&& mv i2pd /usr/local/bin \
&& mv dotnet /usr/local/bin \
&& cd /usr/local/bin \
&& strip i2pd \
&& strip dotnet \
&& rm -fr /tmp/build && apk --no-cache --purge del build-dependendencies build-base fortify-headers boost-dev zlib-dev openssl-dev \
boost-python3 python3 gdbm boost-unit_test_framework boost-python linux-headers boost-prg_exec_monitor \
boost-serialization boost-signals boost-wave boost-wserialization boost-math boost-graph boost-regex git pcre \
libtool g++ gcc pkgconfig
# 2. Adding required libraries to run i2pd to ensure it will run.
# 2. Adding required libraries to run dotnet to ensure it will run.
RUN apk --no-cache add boost-filesystem boost-system boost-program_options boost-date_time boost-thread boost-iostreams openssl musl-utils libstdc++
COPY entrypoint.sh /entrypoint.sh
@ -49,6 +49,6 @@ RUN chmod a+x /entrypoint.sh
RUN echo "export DATA_DIR=${DATA_DIR}" >> /etc/profile
VOLUME "$DATA_DIR"
EXPOSE 7070 4444 4447 7656 2827 7654 7650
USER i2pd
USER dotnet
ENTRYPOINT [ "/entrypoint.sh" ]

View file

@ -1,5 +1,5 @@
#!/bin/sh
COMMAND=/usr/local/bin/i2pd
COMMAND=/usr/local/bin/dotnet
# To make ports exposeable
# Note: $DATA_DIR is defined in /etc/profile
DEFAULT_ARGS=" --datadir=$DATA_DIR --reseed.verify=true --upnp.enabled=false --http.enabled=true --http.address=0.0.0.0 --httpproxy.enabled=true --httpproxy.address=0.0.0.0 --socksproxy.enabled=true --socksproxy.address=0.0.0.0 --sam.enabled=true --sam.address=0.0.0.0"
@ -7,7 +7,7 @@ DEFAULT_ARGS=" --datadir=$DATA_DIR --reseed.verify=true --upnp.enabled=false --h
if [ "$1" = "--help" ]; then
set -- $COMMAND --help
else
ln -s /i2pd_certificates "$DATA_DIR"/certificates
ln -s /dotnet_certificates "$DATA_DIR"/certificates
set -- $COMMAND $DEFAULT_ARGS $@
fi

View file

@ -1,5 +1,5 @@
## Configuration file for a typical i2pd user
## See https://i2pd.readthedocs.io/en/latest/user-guide/configuration/
## Configuration file for a typical dotnet user
## See https://dotnet.readthedocs.io/en/latest/user-guide/configuration/
## for more options you can use in this file.
## Lines that begin with "## " try to explain what's going on. Lines
@ -7,16 +7,16 @@
## by removing the "#" symbol.
## Tunnels config file
## Default: ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf
# tunconf = /var/lib/i2pd/tunnels.conf
## Default: ~/.dotnet/tunnels.conf or /var/lib/dotnet/tunnels.conf
# tunconf = /var/lib/dotnet/tunnels.conf
## Tunnels config files path
## Use that path to store separated tunnels in different config files.
## Default: ~/.i2pd/tunnels.d or /var/lib/i2pd/tunnels.d
# tunnelsdir = /var/lib/i2pd/tunnels.conf.d
## Default: ~/.dotnet/tunnels.d or /var/lib/dotnet/tunnels.d
# tunnelsdir = /var/lib/dotnet/tunnels.conf.d
## Where to write pidfile (don't write by default)
# pidfile = /var/run/i2pd.pid
# pidfile = /var/run/dotnet.pid
## Logging configuration section
## By default logs go to stdout with level 'info' and higher
@ -27,7 +27,7 @@
## * syslog - use syslog, see man 3 syslog
# log = file
## Path to logfile (default - autodetect)
# logfile = /var/log/i2pd.log
# logfile = /var/log/dotnet.log
## Log messages above this level (debug, *info, warn, error, none)
## If you set it to none, logging will be disabled
# loglevel = info
@ -41,11 +41,11 @@
# family =
## External IP address to listen for connections
## By default i2pd sets IP automatically
## By default dotnet sets IP automatically
# host = 1.2.3.4
## Port to listen for connections
## By default i2pd picks random port. You MUST pick a random number too,
## By default dotnet picks random port. You MUST pick a random number too,
## don't just uncomment this
# port = 4567
@ -62,7 +62,7 @@ ipv6 = false
## Enable NTCP transport (default = true)
# ntcp = true
## If you run i2pd behind a proxy server, you can only use NTCP transport with ntcpproxy option
## If you run dotnet behind a proxy server, you can only use NTCP transport with ntcpproxy option
## Should be http://address:port or socks://address:port
# ntcpproxy = http://127.0.0.1:8118
## Enable SSU transport (default = true)
@ -97,7 +97,7 @@ port = 7070
# webroot = /
## Uncomment following lines to enable Web Console authentication
# auth = true
# user = i2pd
# user = dotnet
# pass = changeme
[httpproxy]
@ -108,11 +108,11 @@ address = 127.0.0.1
port = 4444
## Optional keys file for proxy local destination
# keys = http-proxy-keys.dat
## Enable address helper for adding .i2p domains with "jump URLs" (default: true)
## Enable address helper for adding .dotnet domains with "jump URLs" (default: true)
# addresshelper = true
## Address of a proxy server inside I2P, which is used to visit regular Internet
# outproxy = http://false.i2p
## httpproxy section also accepts I2CP parameters, like "inbound.length" etc.
## Address of a proxy server inside DOTNET, which is used to visit regular Internet
# outproxy = http://false.dotnet
## httpproxy section also accepts DNCP parameters, like "inbound.length" etc.
[socksproxy]
## Uncomment and set to 'false' to disable SOCKS Proxy
@ -122,13 +122,13 @@ address = 127.0.0.1
port = 4447
## Optional keys file for proxy local destination
# keys = socks-proxy-keys.dat
## Socks outproxy. Example below is set to use Tor for all connections except i2p
## Socks outproxy. Example below is set to use Tor for all connections except dotnet
## Uncomment and set to 'true' to enable using of SOCKS outproxy
# outproxy.enabled = false
## Address and port of outproxy
# outproxy = 127.0.0.1
# outproxyport = 9050
## socksproxy section also accepts I2CP parameters, like "inbound.length" etc.
## socksproxy section also accepts DNCP parameters, like "inbound.length" etc.
[sam]
## Uncomment and set to 'true' to enable SAM Bridge
@ -144,21 +144,21 @@ enabled = true
# address = 127.0.0.1
# port = 2827
[i2cp]
## Uncomment and set to 'true' to enable I2CP protocol
[dncp]
## Uncomment and set to 'true' to enable DNCP protocol
# enabled = false
## Address and port service will listen on
# address = 127.0.0.1
# port = 7654
[i2pcontrol]
## Uncomment and set to 'true' to enable I2PControl protocol
[dotnetcontrol]
## Uncomment and set to 'true' to enable DotNetControl protocol
# enabled = false
## Address and port service will listen on
# address = 127.0.0.1
# port = 7650
## Authentication password. "itoopie" by default
# password = itoopie
## Authentication password. "dotnet" by default
# password = dotnet
[precomputation]
## Enable or disable elgamal precomputation table
@ -168,34 +168,34 @@ enabled = true
[upnp]
## Enable or disable UPnP: automatic port forwarding (enabled by default in WINDOWS, ANDROID)
# enabled = false
## Name i2pd appears in UPnP forwardings list (default = I2Pd)
# name = I2Pd
## Name dotnet appears in UPnP forwardings list (default = DOTNET)
# name = DOTNET
[reseed]
## Options for bootstrapping into I2P network, aka reseeding
## Options for bootstrapping into DOTNET network, aka reseeding
## Enable or disable reseed data verification.
verify = true
## URLs to request reseed data from, separated by comma
## Default: "mainline" I2P Network reseeds
# urls = https://reseed.i2p-projekt.de/,https://i2p.mooo.com/netDb/,https://netdb.i2p2.no/
## Default: "mainline" DOTNET Network reseeds
# urls = https://reseed.dotnet-projekt.de/,https://dotnet.mooo.com/netDb/,https://netdb.dotnet2.no/
## Path to local reseed data file (.su3) for manual reseeding
# file = /path/to/i2pseeds.su3
# file = /path/to/dotnetseeds.su3
## or HTTPS URL to reseed from
# file = https://legit-website.com/i2pseeds.su3
# file = https://legit-website.com/dotnetseeds.su3
## Path to local ZIP file or HTTPS URL to reseed from
# zipfile = /path/to/netDb.zip
## If you run i2pd behind a proxy server, set proxy server for reseeding here
## If you run dotnet behind a proxy server, set proxy server for reseeding here
## Should be http://address:port or socks://address:port
# proxy = http://127.0.0.1:8118
## Minimum number of known routers, below which i2pd triggers reseeding. 25 by default
## Minimum number of known routers, below which dotnet triggers reseeding. 25 by default
# threshold = 25
[addressbook]
## AddressBook subscription URL for initial setup
## Default: inr.i2p at "mainline" I2P Network
# defaulturl = http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt
## Default: inr.dotnet at "mainline" DOTNET Network
# defaulturl = http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.dotnet/export/alive-hosts.txt
## Optional subscriptions URLs, separated by comma
# subscriptions = http://inr.i2p/export/alive-hosts.txt,http://stats.i2p/cgi-bin/newhosts.txt,http://rus.i2p/hosts.txt
# subscriptions = http://inr.dotnet/export/alive-hosts.txt,http://stats.dotnet/cgi-bin/newhosts.txt,http://rus.dotnet/hosts.txt
[limits]
## Maximum active transit sessions (default:2500)
@ -212,9 +212,9 @@ verify = true
[trust]
## Enable explicit trust options. false by default
# enabled = true
## Make direct I2P connections only to routers in specified Family.
## Make direct DOTNET connections only to routers in specified Family.
# family = MyFamily
## Make direct I2P connections only to routers specified here. Comma separated list of base64 identities.
## Make direct DOTNET connections only to routers specified here. Comma separated list of base64 identities.
# routers =
## Should we hide our router from other routers? false by default
# hidden = true

View file

@ -1,29 +1,29 @@
[Unit]
Description=I2P Router written in C++
Documentation=man:i2pd(1) https://i2pd.readthedocs.io/en/latest/
Description=DOTNET Router written in C++
Documentation=man:dotnet(1) https://dotnet.readthedocs.io/en/latest/
After=network.target
[Service]
User=i2pd
Group=i2pd
RuntimeDirectory=i2pd
User=dotnet
Group=dotnet
RuntimeDirectory=dotnet
RuntimeDirectoryMode=0700
LogsDirectory=i2pd
LogsDirectory=dotnet
LogsDirectoryMode=0700
Type=forking
ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/var/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
ExecStart=/usr/sbin/dotnet --conf=/etc/dotnet/dotnet.conf --tunconf=/etc/dotnet/tunnels.conf --tunnelsdir=/etc/dotnet/tunnels.conf.d --pidfile=/var/run/dotnet/dotnet.pid --logfile=/var/log/dotnet/dotnet.log --daemon --service
ExecReload=/bin/kill -HUP $MAINPID
PIDFile=/var/run/i2pd/i2pd.pid
PIDFile=/var/run/dotnet/dotnet.pid
### Uncomment, if auto restart needed
#Restart=on-failure
KillSignal=SIGQUIT
# If you have the patience waiting 10 min on restarting/stopping it, uncomment this.
# i2pd stops accepting new tunnels and waits ~10 min while old ones do not die.
# dotnet stops accepting new tunnels and waits ~10 min while old ones do not die.
#KillSignal=SIGINT
#TimeoutStopSec=10m
# If you have problems with hanging i2pd, you can try increase this
# If you have problems with hanging dotnet, you can try increase this
LimitNOFILE=4096
# To enable write of coredump uncomment this
#LimitCORE=infinity

View file

@ -1,14 +1,14 @@
%define git_hash %(git rev-parse HEAD | cut -c -7)
Name: i2pd-git
Name: dotnet-git
Version: 2.25.0
Release: git%{git_hash}%{?dist}
Summary: I2P router written in C++
Conflicts: i2pd
Summary: DOTNET router written in C++
Conflicts: dotnet
License: BSD
URL: https://github.com/PurpleI2P/i2pd
Source0: https://github.com/PurpleI2P/i2pd/archive/openssl/i2pd-openssl.tar.gz
URL: https://github.com/PurpleI2P/dotnet
Source0: https://github.com/PurpleI2P/dotnet/archive/openssl/dotnet-openssl.tar.gz
%if 0%{?rhel} == 7
BuildRequires: cmake3
@ -28,7 +28,7 @@ Requires: systemd
Requires(pre): %{_sbindir}/useradd %{_sbindir}/groupadd
%description
C++ implementation of I2P.
C++ implementation of DOTNET.
%prep
%setup -q
@ -63,64 +63,64 @@ cd build
%if 0%{?mageia}
cd build
%endif
chrpath -d i2pd
%{__install} -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd
%{__install} -D -m 755 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}%{_sysconfdir}/i2pd/i2pd.conf
%{__install} -D -m 755 %{_builddir}/%{name}-%{version}/contrib/subscriptions.txt %{buildroot}%{_sysconfdir}/i2pd/subscriptions.txt
%{__install} -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf
%{__install} -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.d/README %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d/README
%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}%{_unitdir}/i2pd.service
%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/debian/i2pd.1 %{buildroot}%{_mandir}/man1/i2pd.1
%{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
%{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
chrpath -d dotnet
%{__install} -D -m 755 dotnet %{buildroot}%{_sbindir}/dotnet
%{__install} -D -m 755 %{_builddir}/%{name}-%{version}/contrib/dotnet.conf %{buildroot}%{_sysconfdir}/dotnet/dotnet.conf
%{__install} -D -m 755 %{_builddir}/%{name}-%{version}/contrib/subscriptions.txt %{buildroot}%{_sysconfdir}/dotnet/subscriptions.txt
%{__install} -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/dotnet/tunnels.conf
%{__install} -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.d/README %{buildroot}%{_sysconfdir}/dotnet/tunnels.conf.d/README
%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/dotnet.service %{buildroot}%{_unitdir}/dotnet.service
%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/debian/dotnet.1 %{buildroot}%{_mandir}/man1/dotnet.1
%{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/dotnet
%{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/dotnet
%{__install} -d -m 755 %{buildroot}%{_datadir}/%{name}
%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/%{name}/certificates
ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates
ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/dotnet/certificates
%pre
getent group i2pd >/dev/null || %{_sbindir}/groupadd -r i2pd
getent passwd i2pd >/dev/null || \
%{_sbindir}/useradd -r -g i2pd -s %{_sbindir}/nologin \
-d %{_sharedstatedir}/i2pd -c 'I2P Service' i2pd
getent group dotnet >/dev/null || %{_sbindir}/groupadd -r dotnet
getent passwd dotnet >/dev/null || \
%{_sbindir}/useradd -r -g dotnet -s %{_sbindir}/nologin \
-d %{_sharedstatedir}/dotnet -c 'DOTNET Service' dotnet
%post
%systemd_post i2pd.service
%systemd_post dotnet.service
%preun
%systemd_preun i2pd.service
%systemd_preun dotnet.service
%postun
%systemd_postun_with_restart i2pd.service
%systemd_postun_with_restart dotnet.service
%files
%doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d
%{_sbindir}/i2pd
%config(noreplace) %{_sysconfdir}/i2pd/*
%{_unitdir}/i2pd.service
%{_mandir}/man1/i2pd.1*
%dir %attr(0700,i2pd,i2pd) %{_sharedstatedir}/i2pd
%dir %attr(0700,i2pd,i2pd) %{_localstatedir}/log/i2pd
%doc LICENSE README.md contrib/dotnet.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d
%{_sbindir}/dotnet
%config(noreplace) %{_sysconfdir}/dotnet/*
%{_unitdir}/dotnet.service
%{_mandir}/man1/dotnet.1*
%dir %attr(0700,dotnet,dotnet) %{_sharedstatedir}/dotnet
%dir %attr(0700,dotnet,dotnet) %{_localstatedir}/log/dotnet
%{_datadir}/%{name}/certificates
%{_sharedstatedir}/i2pd/certificates
%{_sharedstatedir}/dotnet/certificates
%changelog
* Thu May 9 2019 orignal <i2porignal@yandex.ru> - 2.25.0
* Thu May 9 2019 orignal <dotnetorignal@yandex.ru> - 2.25.0
- update to 2.25.0
* Thu Mar 21 2019 orignal <i2porignal@yandex.ru> - 2.24.0
* Thu Mar 21 2019 orignal <dotnetorignal@yandex.ru> - 2.24.0
- update to 2.24.0
* Mon Jan 21 2019 orignal <i2porignal@yandex.ru> - 2.23.0
* Mon Jan 21 2019 orignal <dotnetorignal@yandex.ru> - 2.23.0
- update to 2.23.0
* Fri Nov 09 2018 r4sas <r4sas@i2pmail.org> - 2.22.0
* Fri Nov 09 2018 r4sas <r4sas@dotnetmail.org> - 2.22.0
- add support of tunnelsdir option
* Thu Feb 01 2018 r4sas <r4sas@i2pmail.org> - 2.18.0
- Initial i2pd-git based on i2pd 2.18.0-1 spec
* Thu Feb 01 2018 r4sas <r4sas@dotnetmail.org> - 2.18.0
- Initial dotnet-git based on dotnet 2.18.0-1 spec

View file

@ -1,12 +1,12 @@
Name: i2pd
Name: dotnet
Version: 2.25.0
Release: 1%{?dist}
Summary: I2P router written in C++
Conflicts: i2pd-git
Summary: DOTNET router written in C++
Conflicts: dotnet-git
License: BSD
URL: https://github.com/PurpleI2P/i2pd
Source0: https://github.com/PurpleI2P/i2pd/archive/%{version}/%name-%version.tar.gz
URL: https://github.com/PurpleI2P/dotnet
Source0: https://github.com/PurpleI2P/dotnet/archive/%{version}/%name-%version.tar.gz
%if 0%{?rhel} == 7
BuildRequires: cmake3
@ -26,7 +26,7 @@ Requires: systemd
Requires(pre): %{_sbindir}/useradd %{_sbindir}/groupadd
%description
C++ implementation of I2P.
C++ implementation of DOTNET.
%prep
%setup -q
@ -61,113 +61,113 @@ cd build
%if 0%{?mageia}
cd build
%endif
chrpath -d i2pd
install -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd
install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}%{_sysconfdir}/i2pd/i2pd.conf
install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf
install -d -m 755 %{buildroot}%{_datadir}/i2pd
install -d -m 755 %{buildroot}%{_datadir}/i2pd/tunnels.conf.d
%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates
%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/tunnels.d/ %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d
install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}%{_unitdir}/i2pd.service
install -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
install -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates
ln -s %{_datadir}/i2pd/tunnels.conf.d %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d
chrpath -d dotnet
install -D -m 755 dotnet %{buildroot}%{_sbindir}/dotnet
install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/dotnet.conf %{buildroot}%{_sysconfdir}/dotnet/dotnet.conf
install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/dotnet/tunnels.conf
install -d -m 755 %{buildroot}%{_datadir}/dotnet
install -d -m 755 %{buildroot}%{_datadir}/dotnet/tunnels.conf.d
%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/dotnet/certificates
%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/tunnels.d/ %{buildroot}%{_sysconfdir}/dotnet/tunnels.conf.d
install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/dotnet.service %{buildroot}%{_unitdir}/dotnet.service
install -d -m 700 %{buildroot}%{_sharedstatedir}/dotnet
install -d -m 700 %{buildroot}%{_localstatedir}/log/dotnet
ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/dotnet/certificates
ln -s %{_datadir}/dotnet/tunnels.conf.d %{buildroot}%{_sysconfdir}/dotnet/tunnels.conf.d
%pre
getent group i2pd >/dev/null || %{_sbindir}/groupadd -r i2pd
getent passwd i2pd >/dev/null || \
%{_sbindir}/useradd -r -g i2pd -s %{_sbindir}/nologin \
-d %{_sharedstatedir}/i2pd -c 'I2P Service' i2pd
getent group dotnet >/dev/null || %{_sbindir}/groupadd -r dotnet
getent passwd dotnet >/dev/null || \
%{_sbindir}/useradd -r -g dotnet -s %{_sbindir}/nologin \
-d %{_sharedstatedir}/dotnet -c 'DOTNET Service' dotnet
%post
%systemd_post i2pd.service
%systemd_post dotnet.service
%preun
%systemd_preun i2pd.service
%systemd_preun dotnet.service
%postun
%systemd_postun_with_restart i2pd.service
%systemd_postun_with_restart dotnet.service
%files
%doc LICENSE README.md
%{_sbindir}/i2pd
%{_datadir}/i2pd/certificates
%config(noreplace) %{_sysconfdir}/i2pd/*
%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*
/%{_unitdir}/i2pd.service
%dir %attr(0700,i2pd,i2pd) %{_localstatedir}/log/i2pd
%dir %attr(0700,i2pd,i2pd) %{_sharedstatedir}/i2pd
%{_sharedstatedir}/i2pd/certificates
%{_sbindir}/dotnet
%{_datadir}/dotnet/certificates
%config(noreplace) %{_sysconfdir}/dotnet/*
%config(noreplace) %{_sysconfdir}/dotnet/tunnels.conf.d/*
/%{_unitdir}/dotnet.service
%dir %attr(0700,dotnet,dotnet) %{_localstatedir}/log/dotnet
%dir %attr(0700,dotnet,dotnet) %{_sharedstatedir}/dotnet
%{_sharedstatedir}/dotnet/certificates
%changelog
* Thu May 9 2019 orignal <i2porignal@yandex.ru> - 2.25.0
* Thu May 9 2019 orignal <dotnetorignal@yandex.ru> - 2.25.0
- update to 2.25.0
* Thu Mar 21 2019 orignal <i2porignal@yandex.ru> - 2.24.0
* Thu Mar 21 2019 orignal <dotnetorignal@yandex.ru> - 2.24.0
- update to 2.24.0
* Mon Jan 21 2019 orignal <i2porignal@yandex.ru> - 2.23.0
* Mon Jan 21 2019 orignal <dotnetorignal@yandex.ru> - 2.23.0
- update to 2.23.0
* Fri Nov 09 2018 r4sas <r4sas@i2pmail.org> - 2.22.0
* Fri Nov 09 2018 r4sas <r4sas@dotnetmail.org> - 2.22.0
- update to 2.22.0
- add support of tunnelsdir option
* Thu Oct 22 2018 orignal <i2porignal@yandex.ru> - 2.21.1
* Thu Oct 22 2018 orignal <dotnetorignal@yandex.ru> - 2.21.1
- update to 2.21.1
* Thu Oct 4 2018 orignal <i2porignal@yandex.ru> - 2.21.0
* Thu Oct 4 2018 orignal <dotnetorignal@yandex.ru> - 2.21.0
- update to 2.21.0
* Thu Aug 23 2018 orignal <i2porignal@yandex.ru> - 2.20.0
* Thu Aug 23 2018 orignal <dotnetorignal@yandex.ru> - 2.20.0
- update to 2.20.0
* Tue Jun 26 2018 orignal <i2porignal@yandex.ru> - 2.19.0
* Tue Jun 26 2018 orignal <dotnetorignal@yandex.ru> - 2.19.0
- update to 2.19.0
* Mon Feb 05 2018 r4sas <r4sas@i2pmail.org> - 2.18.0-2
* Mon Feb 05 2018 r4sas <r4sas@dotnetmail.org> - 2.18.0-2
- Fixed blocking system shutdown for 10 minutes (#1089)
* Thu Feb 01 2018 r4sas <r4sas@i2pmail.org> - 2.18.0-1
- Added to conflicts i2pd-git package
* Thu Feb 01 2018 r4sas <r4sas@dotnetmail.org> - 2.18.0-1
- Added to conflicts dotnet-git package
- Fixed release versioning
- Fixed paths with double slashes
* Tue Jan 30 2018 orignal <i2porignal@yandex.ru> - 2.18.0
* Tue Jan 30 2018 orignal <dotnetorignal@yandex.ru> - 2.18.0
- update to 2.18.0
* Sat Jan 27 2018 l-n-s <supervillain@riseup.net> - 2.17.0-1
- Added certificates and default configuration files
- Merge i2pd with i2pd-systemd package
- Merge dotnet with dotnet-systemd package
- Fixed package changelogs to comply with guidelines
* Mon Dec 04 2017 orignal <i2porignal@yandex.ru> - 2.17.0
* Mon Dec 04 2017 orignal <dotnetorignal@yandex.ru> - 2.17.0
- update to 2.17.0
* Mon Nov 13 2017 orignal <i2porignal@yandex.ru> - 2.16.0
* Mon Nov 13 2017 orignal <dotnetorignal@yandex.ru> - 2.16.0
- update to 2.16.0
* Thu Aug 17 2017 orignal <i2porignal@yandex.ru> - 2.15.0
* Thu Aug 17 2017 orignal <dotnetorignal@yandex.ru> - 2.15.0
- update to 2.15.0
* Thu Jun 01 2017 orignal <i2porignal@yandex.ru> - 2.14.0
* Thu Jun 01 2017 orignal <dotnetorignal@yandex.ru> - 2.14.0
- update to 2.14.0
* Thu Apr 06 2017 orignal <i2porignal@yandex.ru> - 2.13.0
* Thu Apr 06 2017 orignal <dotnetorignal@yandex.ru> - 2.13.0
- update to 2.13.0
* Tue Feb 14 2017 orignal <i2porignal@yandex.ru> - 2.12.0
* Tue Feb 14 2017 orignal <dotnetorignal@yandex.ru> - 2.12.0
- update to 2.12.0
* Mon Dec 19 2016 orignal <i2porignal@yandex.ru> - 2.11.0
* Mon Dec 19 2016 orignal <dotnetorignal@yandex.ru> - 2.11.0
- update to 2.11.0
* Thu Oct 20 2016 Anatolii Vorona <vorona.tolik@gmail.com> - 2.10.0-3
@ -185,7 +185,7 @@ getent passwd i2pd >/dev/null || \
* Sat Aug 06 2016 Oleg Girko <ol@infoserver.lv> - 2.8.0-1
- update to 2.8.0
- remove wrong rpath from i2pd binary
- remove wrong rpath from dotnet binary
- add daemon subpackage with systemd unit file
* Sat May 21 2016 Oleg Girko <ol@infoserver.lv> - 2.7.0-1

View file

@ -1,3 +1,3 @@
http://inr.i2p/export/alive-hosts.txt
http://stats.i2p/cgi-bin/newhosts.txt
http://i2p-projekt.i2p/hosts.txt
http://inr.dotnet/export/alive-hosts.txt
http://stats.dotnet/cgi-bin/newhosts.txt
http://dotnet-projekt.dotnet/hosts.txt

View file

@ -2,7 +2,7 @@
type = client
address = 127.0.0.1
port = 6668
destination = irc.postman.i2p
destination = irc.postman.dotnet
destinationport = 6667
keys = irc-keys.dat
@ -10,7 +10,7 @@ keys = irc-keys.dat
#type = client
#address = 127.0.0.1
#port = 6669
#destination = irc.ilita.i2p
#destination = irc.ilita.dotnet
#destinationport = 6667
#keys = irc-keys.dat
@ -18,7 +18,7 @@ keys = irc-keys.dat
#type = client
#address = 127.0.0.1
#port = 7659
#destination = smtp.postman.i2p
#destination = smtp.postman.dotnet
#destinationport = 25
#keys = smtp-keys.dat
@ -26,8 +26,8 @@ keys = irc-keys.dat
#type = client
#address = 127.0.0.1
#port = 7660
#destination = pop.postman.i2p
#destination = pop.postman.dotnet
#destinationport = 110
#keys = pop3-keys.dat
# see more examples at https://i2pd.readthedocs.io/en/latest/user-guide/tunnels/
# see more examples at https://dotnet.readthedocs.io/en/latest/user-guide/tunnels/

View file

@ -2,6 +2,6 @@
#type = client
#address = 127.0.0.1
#port = 6669
#destination = irc.ilita.i2p
#destination = irc.ilita.dotnet
#destinationport = 6667
#keys = irc-keys.dat

View file

@ -2,6 +2,6 @@
#type = client
#address = 127.0.0.1
#port = 6668
#destination = irc.postman.i2p
#destination = irc.postman.dotnet
#destinationport = 6667
#keys = irc-keys.dat

View file

@ -1,4 +1,4 @@
# In that directory you can store separated config files for every tunnel.
# Please read documentation for more info.
#
# You can find examples in /usr/share/doc/i2pd/tunnels.d directory
# You can find examples in /usr/share/doc/dotnet/tunnels.d directory