PurpleI2P
/
i2pd
mirror of https://github.com/PurpleI2P/i2pd.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

moved binary to /usr/bin (closes #2053 #2068) 

Signed-off-by: r4sas <r4sas@i2pmail.org>
pull/2094/head 2.53.0
R4SAS 4 months ago
parent
bed5a18294
commit
9a6654943d
Signed by: r4sas
GPG Key ID: 66F6C87B98EBCFE2
14 changed files with 30 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      ChangeLog
  2. 2
      build/win_installer.iss
  3. 6
      contrib/apparmor/usr.bin.i2pd
  4. 4
      contrib/debian/trusty/patches/02-service.patch
  5. 4
      contrib/debian/xenial/patches/02-service.patch
  6. 2
      contrib/i2pd.service
  7. 2
      contrib/openrc/i2pd.openrc
  8. 4
      contrib/rpm/i2pd-git.spec
  9. 4
      contrib/rpm/i2pd.spec
  10. 2
      contrib/upstart/i2pd.upstart
  11. 5
      debian/NEWS
  12. 3
      debian/changelog
  13. 2
      debian/i2pd.init
  14. 4
      debian/i2pd.install

10
ChangeLog
Unescape View File

@ -5,22 +5,22 @@
### Added ### Added
- New congestion control algorithm for streaming - New congestion control algorithm for streaming
- Support miniupnp-2.2.8 - Support miniupnp-2.2.8
- Limit stream's outbound speed - Limit stream's outbound speed
- Flood to next day closest floodfills before UTC midnight - Flood to next day closest floodfills before UTC midnight
- Recognize duplicated routers and bypass them - Recognize duplicated routers and bypass them
- Random SSU2 resend interval - Random SSU2 resend interval
### Changed ### Changed
- Set minimal version to 0.9.69 for floodfills and 0.9.58 for client tunnels - Set minimal version to 0.9.69 for floodfills and 0.9.58 for client tunnels
- Removed openssl 1.0.2 support - Removed openssl 1.0.2 support
- Move unsent I2NP messages to the new session if replaced - Move unsent I2NP messages to the new session if replaced
- Use mt19937 RNG instead rand() - Use mt19937 RNG instead rand()
- Update router's congestion caps before initial publishing - Update router's congestion caps before initial publishing
- Don't try introducer with invalid address - Don't try introducer with invalid address
- Select newest introducers to publish - Select newest introducers to publish
- Don't request relay tag for every session if we have enough introducers - Don't request relay tag for every session if we have enough introducers
- Update timestamp for non-reachable or hidden router - Update timestamp for non-reachable or hidden router
- Reset streaming routing path if duplicated SYN received - Reset streaming routing path if duplicated SYN received
- Update LeaseSet if inbound tunnel failed - Update LeaseSet if inbound tunnel failed
- Reseeds list - Reseeds list
### Fixed ### Fixed
- Crash when a destination gets terminated - Crash when a destination gets terminated

2
build/win_installer.iss
Unescape View File

@ -24,7 +24,7 @@ ExtraDiskSpaceRequired=15
AppID={{621A23E0-3CF4-4BD6-97BC-4835EA5206A2} AppID={{621A23E0-3CF4-4BD6-97BC-4835EA5206A2}
AppVerName={#I2Pd_AppName} AppVerName={#I2Pd_AppName}
AppCopyright=Copyright (c) 2013-2022, The PurpleI2P Project AppCopyright=Copyright (c) 2013-2024, The PurpleI2P Project
AppPublisherURL=http://i2pd.website/ AppPublisherURL=http://i2pd.website/
AppSupportURL=https://github.com/PurpleI2P/i2pd/issues AppSupportURL=https://github.com/PurpleI2P/i2pd/issues
AppUpdatesURL=https://github.com/PurpleI2P/i2pd/releases AppUpdatesURL=https://github.com/PurpleI2P/i2pd/releases

6
contrib/apparmor/usr.sbin.i2pd → contrib/apparmor/usr.bin.i2pd
Unescape View File

@ -4,7 +4,7 @@
# #
#include <tunables/global> #include <tunables/global>
profile i2pd /{usr/,}sbin/i2pd { profile i2pd /{usr/,}bin/i2pd {
#include <abstractions/base> #include <abstractions/base>
#include <abstractions/openssl> #include <abstractions/openssl>
#include <abstractions/nameservice> #include <abstractions/nameservice>
@ -14,12 +14,12 @@ profile i2pd /{usr/,}sbin/i2pd {
/var/lib/i2pd/** rw, /var/lib/i2pd/** rw,
/var/log/i2pd/i2pd.log w, /var/log/i2pd/i2pd.log w,
/{var/,}run/i2pd/i2pd.pid rwk, /{var/,}run/i2pd/i2pd.pid rwk,
/{usr/,}sbin/i2pd mr, /{usr/,}bin/i2pd mr,
@{system_share_dirs}/i2pd/** r, @{system_share_dirs}/i2pd/** r,
# user homedir (if started not by init.d or systemd) # user homedir (if started not by init.d or systemd)
owner @{HOME}/.i2pd/ rw, owner @{HOME}/.i2pd/ rw,
owner @{HOME}/.i2pd/** rwk, owner @{HOME}/.i2pd/** rwk,
#include if exists <local/usr.sbin.i2pd> #include if exists <local/usr.bin.i2pd>
} }

4
contrib/debian/trusty/patches/02-service.patch vendored
Unescape View File

@ -2,7 +2,7 @@ Description: Disable LogsDirectory and LogsDirectoryMode options in service
Author: r4sas <r4sas@i2pmail.org> Author: r4sas <r4sas@i2pmail.org>
Reviewed-By: r4sas <r4sas@i2pmail.org> Reviewed-By: r4sas <r4sas@i2pmail.org>
Last-Update: 2023-05-17 Last-Update: 2024-07-19
--- a/contrib/i2pd.service --- a/contrib/i2pd.service
+++ b/contrib/i2pd.service +++ b/contrib/i2pd.service
@ -15,5 +15,5 @@ Last-Update: 2023-05-17
+#LogsDirectory=i2pd +#LogsDirectory=i2pd
+#LogsDirectoryMode=0700 +#LogsDirectoryMode=0700
Type=forking Type=forking
ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service ExecStart=/usr/bin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
ExecReload=/bin/sh -c "kill -HUP $MAINPID" ExecReload=/bin/sh -c "kill -HUP $MAINPID"

4
contrib/debian/xenial/patches/02-service.patch vendored
Unescape View File

@ -2,7 +2,7 @@ Description: Disable LogsDirectory and LogsDirectoryMode options in service
Author: r4sas <r4sas@i2pmail.org> Author: r4sas <r4sas@i2pmail.org>
Reviewed-By: r4sas <r4sas@i2pmail.org> Reviewed-By: r4sas <r4sas@i2pmail.org>
Last-Update: 2023-05-17 Last-Update: 2024-07-19
--- a/contrib/i2pd.service --- a/contrib/i2pd.service
+++ b/contrib/i2pd.service +++ b/contrib/i2pd.service
@ -15,5 +15,5 @@ Last-Update: 2023-05-17
+#LogsDirectory=i2pd +#LogsDirectory=i2pd
+#LogsDirectoryMode=0700 +#LogsDirectoryMode=0700
Type=forking Type=forking
ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service ExecStart=/usr/bin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
ExecReload=/bin/sh -c "kill -HUP $MAINPID" ExecReload=/bin/sh -c "kill -HUP $MAINPID"

2
contrib/i2pd.service
Unescape View File

@ -11,7 +11,7 @@ RuntimeDirectoryMode=0700
LogsDirectory=i2pd LogsDirectory=i2pd
LogsDirectoryMode=0700 LogsDirectoryMode=0700
Type=forking Type=forking
ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service ExecStart=/usr/bin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
ExecReload=/bin/sh -c "kill -HUP $MAINPID" ExecReload=/bin/sh -c "kill -HUP $MAINPID"
PIDFile=/run/i2pd/i2pd.pid PIDFile=/run/i2pd/i2pd.pid
### Uncomment, if auto restart needed ### Uncomment, if auto restart needed

2
contrib/openrc/i2pd.openrc
Unescape View File

@ -7,7 +7,7 @@ tunconf="/etc/i2pd/tunnels.conf"
tundir="/etc/i2pd/tunnels.conf.d" tundir="/etc/i2pd/tunnels.conf.d"
name="i2pd" name="i2pd"
command="/usr/sbin/i2pd" command="/usr/bin/i2pd"
command_args="--service --daemon --log=file --logfile=$logfile --conf=$mainconf --tunconf=$tunconf --tunnelsdir=$tundir --pidfile=$pidfile" command_args="--service --daemon --log=file --logfile=$logfile --conf=$mainconf --tunconf=$tunconf --tunnelsdir=$tundir --pidfile=$pidfile"
description="i2p router written in C++" description="i2p router written in C++"
required_dirs="/var/lib/i2pd" required_dirs="/var/lib/i2pd"

4
contrib/rpm/i2pd-git.spec
Unescape View File

@ -93,7 +93,7 @@ pushd build
%endif %endif
chrpath -d i2pd chrpath -d i2pd
%{__install} -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd %{__install} -D -m 755 i2pd %{buildroot}%{_bindir}/i2pd
%{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd %{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd
%{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd %{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
%{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd %{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
@ -129,7 +129,7 @@ getent passwd i2pd >/dev/null || \
%files %files
%doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d %doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d
%{_sbindir}/i2pd %{_bindir}/i2pd
%config(noreplace) %{_sysconfdir}/i2pd/*.conf %config(noreplace) %{_sysconfdir}/i2pd/*.conf
%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*.conf %config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*.conf
%config %{_sysconfdir}/i2pd/subscriptions.txt %config %{_sysconfdir}/i2pd/subscriptions.txt

4
contrib/rpm/i2pd.spec
Unescape View File

@ -91,7 +91,7 @@ pushd build
%endif %endif
chrpath -d i2pd chrpath -d i2pd
%{__install} -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd %{__install} -D -m 755 i2pd %{buildroot}%{_bindir}/i2pd
%{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd %{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd
%{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd %{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
%{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd %{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
@ -127,7 +127,7 @@ getent passwd i2pd >/dev/null || \
%files %files
%doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d %doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d
%{_sbindir}/i2pd %{_bindir}/i2pd
%config(noreplace) %{_sysconfdir}/i2pd/*.conf %config(noreplace) %{_sysconfdir}/i2pd/*.conf
%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*.conf %config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*.conf
%config %{_sysconfdir}/i2pd/subscriptions.txt %config %{_sysconfdir}/i2pd/subscriptions.txt

2
contrib/upstart/i2pd.upstart
Unescape View File

@ -8,4 +8,4 @@ env LOGFILE="/var/log/i2pd/i2pd.log"
expect fork expect fork
exec /usr/sbin/i2pd --daemon --service --log=file --logfile=$LOGFILE exec /usr/bin/i2pd --daemon --service --log=file --logfile=$LOGFILE

5
debian/NEWS vendored
Unescape View File

@ -0,0 +1,5 @@
i2pd (2.53.0-1) unstable; urgency=medium
i2pd binary moved from /usr/sbin to /usr/bin. Please check your scripts if you used the old path.
-- r4sas <r4sas@i2pmail.org> Fri, 19 Jul 2024 16:00:00 +0000

3
debian/changelog vendored
Unescape View File

@ -1,8 +1,9 @@
i2pd (2.53.0-1) unstable; urgency=medium i2pd (2.53.0-1) unstable; urgency=medium
* updated to version 2.53.0/0.9.63 * updated to version 2.53.0/0.9.63
* binary moved from /usr/sbin to /usr/bin
-- orignal <orignal@i2pmail.org> Fri, 19 Jul 2024 16:00:00 +0000 -- r4sas <r4sas@i2pmail.org> Sat, 20 Jul 2024 15:10:00 +0000
i2pd (2.52.0-1) unstable; urgency=medium i2pd (2.52.0-1) unstable; urgency=medium

2
debian/i2pd.init vendored
Unescape View File

@ -13,7 +13,7 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC=i2pd # Introduce a short description here DESC=i2pd # Introduce a short description here
NAME=i2pd # Introduce the short server's name here NAME=i2pd # Introduce the short server's name here
DAEMON=/usr/sbin/$NAME # Introduce the server's location here DAEMON=/usr/bin/$NAME # Introduce the server's location here
DAEMON_OPTS="" # Arguments to run the daemon with DAEMON_OPTS="" # Arguments to run the daemon with
PIDFILE=/var/run/$NAME/$NAME.pid PIDFILE=/var/run/$NAME/$NAME.pid
I2PCONF=/etc/$NAME/i2pd.conf I2PCONF=/etc/$NAME/i2pd.conf

4
debian/i2pd.install vendored
Unescape View File

@ -1,6 +1,6 @@
i2pd usr/sbin/ i2pd usr/bin/
contrib/i2pd.conf etc/i2pd/ contrib/i2pd.conf etc/i2pd/
contrib/tunnels.conf etc/i2pd/ contrib/tunnels.conf etc/i2pd/
contrib/certificates/ usr/share/i2pd/ contrib/certificates/ usr/share/i2pd/
contrib/tunnels.d/README etc/i2pd/tunnels.conf.d/ contrib/tunnels.d/README etc/i2pd/tunnels.conf.d/
contrib/apparmor/usr.sbin.i2pd etc/apparmor.d contrib/apparmor/usr.bin.i2pd etc/apparmor.d

Write Preview
Loading…
Cancel
Save