From 779228857e5b212fbeff161dced60a61e1bc0c3e Mon Sep 17 00:00:00 2001 From: R4SAS Date: Fri, 9 Nov 2018 02:03:13 +0000 Subject: [PATCH] 2.22.0 --- ChangeLog | 9 +++++++++ Win32/installer.iss | 2 +- android/AndroidManifest.xml | 2 +- android/assets/i2pd.conf | 1 + android/assets/tunnels.d | 1 + android/build.gradle | 2 +- appveyor.yml | 2 +- contrib/rpm/i2pd-git.spec | 5 ++++- contrib/rpm/i2pd.spec | 6 +++++- debian/.gitignore | 4 ++-- debian/changelog | 9 +++++++++ debian/patches/{fix-#1210 => 02-fix-1210.patch} | 6 +++--- debian/patches/series | 2 +- libi2pd/version.h | 4 ++-- qt/i2pd_qt/android/AndroidManifest.xml | 2 +- 15 files changed, 42 insertions(+), 15 deletions(-) create mode 120000 android/assets/tunnels.d rename debian/patches/{fix-#1210 => 02-fix-1210.patch} (75%) diff --git a/ChangeLog b/ChangeLog index 0d6881ee862..9013ede857f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,15 @@ # for this file format description, # see https://github.com/olivierlacan/keep-a-changelog +## [2.22.0] - 2018-11-09 +### Added +- Multiple tunnel config files from tunnels.d folder +### Changed +- Fetch own RouterInfo upon SessionRequest for NTCP2 +- Faster XOR between AES blocks for non AVX capable CPUs +### Fixed +- Fixed NTCP2 termination send + ## [2.21.1] - 2018-10-22 ### Changed - cost=13 for unpublished NTCP2 address diff --git a/Win32/installer.iss b/Win32/installer.iss index 6f17993b159..787eebeb128 100644 --- a/Win32/installer.iss +++ b/Win32/installer.iss @@ -1,5 +1,5 @@ #define I2Pd_AppName "i2pd" -#define I2Pd_ver "2.21.1" +#define I2Pd_ver "2.22.0" #define I2Pd_Publisher "PurpleI2P" [Setup] diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index dee23f15454..5ad3834edf6 100755 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -3,7 +3,7 @@ package="org.purplei2p.i2pd" android:installLocation="auto" android:versionCode="1" - android:versionName="2.21.1"> + android:versionName="2.22.0"> /dev/null || \ %changelog +* Fri Nov 09 2018 r4sas - 2.22.0 +- add support of tunnelsdir option + * Thu Feb 01 2018 r4sas - 2.18.0 - Initial i2pd-git based on i2pd 2.18.0-1 spec diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec index 20fedff76e4..5daeef2c8b1 100644 --- a/contrib/rpm/i2pd.spec +++ b/contrib/rpm/i2pd.spec @@ -1,5 +1,5 @@ Name: i2pd -Version: 2.21.1 +Version: 2.22.0 Release: 1%{?dist} Summary: I2P router written in C++ Conflicts: i2pd-git @@ -100,6 +100,10 @@ getent passwd i2pd >/dev/null || \ %changelog +* Fri Nov 09 2018 r4sas - 2.22.0 +- update to 2.22.0 +- add support of tunnelsdir option + * Thu Oct 22 2018 orignal - 2.21.1 - update to 2.21.1 diff --git a/debian/.gitignore b/debian/.gitignore index 6bc6bcf2ebe..b03f9e2498b 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,9 +1,9 @@ +debhelper-build-stamp files i2pd-dbg.substvars -i2pd-dbg/ i2pd.postinst.debhelper i2pd.postrm.debhelper i2pd.prerm.debhelper i2pd.substvars i2pd/ - +i2pd-dbg/ diff --git a/debian/changelog b/debian/changelog index 605c40f8ce8..eb48dbdfbb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +i2pd (2.22.0-1) unstable; urgency=medium + + * updated to version 2.22.0/0.9.37 + * update manpage (1) + * update links, install files to support tunnelsdir option + * renamed and updated patch (#1210) + + -- r4sas Fri, 09 Nov 2018 02:00:00 +0000 + i2pd (2.21.1-1) unstable; urgency=medium * updated to version 2.21.1 diff --git a/debian/patches/fix-#1210 b/debian/patches/02-fix-1210.patch similarity index 75% rename from debian/patches/fix-#1210 rename to debian/patches/02-fix-1210.patch index 7e68135c7b0..6a4caf944e4 100644 --- a/debian/patches/fix-#1210 +++ b/debian/patches/02-fix-1210.patch @@ -6,8 +6,8 @@ Bug: https://github.com/PurpleI2P/i2pd/issues/1210 Reviewed-By: r4sas Last-Update: 2018-08-25 ---- i2pd-2.20.0.orig/contrib/i2pd.service -+++ i2pd-2.20.0/contrib/i2pd.service +--- a/contrib/i2pd.service ++++ b/contrib/i2pd.service @@ -6,10 +6,10 @@ After=network.target [Service] User=i2pd @@ -21,5 +21,5 @@ Last-Update: 2018-08-25 +#LogsDirectory=i2pd +#LogsDirectoryMode=0700 Type=forking - ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --pidfile=/var/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service + 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 ExecReload=/bin/kill -HUP $MAINPID diff --git a/debian/patches/series b/debian/patches/series index 5a9712bd033..002802b53aa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ 01-tune-build-opts.patch -fix-#1210 +02-fix-1210.patch diff --git a/libi2pd/version.h b/libi2pd/version.h index 40d7d2236d8..22990219766 100644 --- a/libi2pd/version.h +++ b/libi2pd/version.h @@ -7,8 +7,8 @@ #define MAKE_VERSION(a,b,c) STRINGIZE(a) "." STRINGIZE(b) "." STRINGIZE(c) #define I2PD_VERSION_MAJOR 2 -#define I2PD_VERSION_MINOR 21 -#define I2PD_VERSION_MICRO 1 +#define I2PD_VERSION_MINOR 22 +#define I2PD_VERSION_MICRO 0 #define I2PD_VERSION_PATCH 0 #define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO) #define VERSION I2PD_VERSION diff --git a/qt/i2pd_qt/android/AndroidManifest.xml b/qt/i2pd_qt/android/AndroidManifest.xml index cd687a428bc..8eb723e7b66 100644 --- a/qt/i2pd_qt/android/AndroidManifest.xml +++ b/qt/i2pd_qt/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - +