From b7e20b9b86165a0eb2ba5bcf9a580f3824a38462 Mon Sep 17 00:00:00 2001 From: R4SAS Date: Sun, 20 Feb 2022 14:29:44 +0300 Subject: [PATCH] 2.41.0 Signed-off-by: R4SAS --- .gitattributes | 1 + ChangeLog | 13 +++++++------ Win32/Resource.rc2 | 2 +- build/build_mingw.cmd | 30 +++++++++++++++--------------- contrib/rpm/i2pd-git.spec | 3 ++- contrib/rpm/i2pd.spec | 2 +- debian/changelog | 2 +- 7 files changed, 28 insertions(+), 25 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000..488400a3e66 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +/build/build_mingw.cmd eol=crlf \ No newline at end of file diff --git a/ChangeLog b/ChangeLog index 530c3569b65..3200df21703 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ # for this file format description, # see https://github.com/olivierlacan/keep-a-changelog -## [2.41.0] - 2022-02-21 +## [2.41.0] - 2022-02-20 ### Added - Clock syncronization through SSU - Drop routers older than 6 months on start @@ -11,21 +11,22 @@ - Restart webconsole's acceptor in case of exception ### Changed - Use builtin bitswap for endian on windows -- Send SessionCreated before connection close if slock skew +- Send SessionCreated before connection close if clock skew - Try another floodfill for publishing if no compatible tunnels found - Reduce memory usage for RouterInfo structures -- Avoid duplicated addresses in RouterInfo. Check presence of netId and version +- Avoid duplicated addresses in RouterInfo. Check presence of netId and version - Use TCP/IP sockets for I2CP on Android instead local sockets - Return uptime as integer in I2PControl - Reseed servers list/cerificates -- Webconsole's dark style colors +- Webconsole's dark style colors ### Fixed -- Yggdrasil transport and reseeds on Android +- Attempt to use Yggdrasil on start on Android - Attempts to send peer tests to itself -- Severe packets drop in SSU +- Severe packets drop in SSU - Crash on tunnel tests - Loading addressbook subscriptions from config - Multiple I2CP session to the same destination +- Build on Apple Silicon ## [2.40.0] - 2021-11-29 ### Added diff --git a/Win32/Resource.rc2 b/Win32/Resource.rc2 index 9eecbc1fc13..873d640239d 100644 --- a/Win32/Resource.rc2 +++ b/Win32/Resource.rc2 @@ -25,7 +25,7 @@ BEGIN VALUE "FileDescription", "C++ I2P daemon" VALUE "FileVersion", I2PD_VERSION VALUE "InternalName", CODENAME - VALUE "LegalCopyright", "Copyright (C) 2013-2020, The PurpleI2P Project" + VALUE "LegalCopyright", "Copyright (C) 2013-2022, The PurpleI2P Project" VALUE "OriginalFilename", "i2pd" VALUE "ProductName", "Purple I2P" VALUE "ProductVersion", I2P_VERSION diff --git a/build/build_mingw.cmd b/build/build_mingw.cmd index e1b45b17a55..6540f83377b 100644 --- a/build/build_mingw.cmd +++ b/build/build_mingw.cmd @@ -12,13 +12,12 @@ REM UCRT64: mingw-w64-ucrt-x86_64-boost mingw-w64-ucrt-x86_64-openssl mingw-w64- REM MINGW32: mingw-w64-i686-boost mingw-w64-i686-openssl mingw-w64-i686-gcc REM setting up variables for MSYS -REM Note: if you installed MSYS64 to different path, edit WD variable (only C:\msys64 needed to edit)! -set "WD=C:\msys64\usr\bin\" +REM Note: if you installed MSYS64 to different path, edit WD variable (only C:\msys64 needed to edit) set MSYS2_PATH_TYPE=inherit set CHERE_INVOKING=enabled_from_arguments -REM set MSYSTEM=MSYS set MSYSTEM=MINGW32 +set "WD=C:\msys64\usr\bin\" set "xSH=%WD%bash -lc" set "FILELIST=i2pd.exe README.txt contrib/i2pd.conf contrib/tunnels.conf contrib/certificates contrib/tunnels.d contrib/webconsole" @@ -55,12 +54,12 @@ REM converting configuration files to DOS format (make usable in Windows Notepad REM Prepare binary signing command if signing key and password provided if defined SIGNKEY ( if defined SIGNPASS ( - echo Signing options found^^! + echo Signing options found for %%X in (signtool.exe) do (set xSIGNTOOL=%%~$PATH:X) if not defined xSIGNTOOL ( if not defined SIGNTOOL ( - echo Error: Can't find signtool^^! Please provide path to binary using SIGNTOOL variable^^! + echo Error: Can't find signtool. Please provide path to binary using SIGNTOOL variable. exit /b 1 ) else ( set "xSIGNTOOL=%SIGNTOOL%" @@ -80,15 +79,10 @@ set MSYSTEM=UCRT64 set bitness=64 call :BUILDING -if exist C:\msys64-xp\ ( - REM building for WinXP - set "WD=C:\msys64-xp\usr\bin\" - set MSYSTEM=MINGW32 - set bitness=32 - set "xSH=%WD%bash -lc" - call :BUILDING_XP - echo. -) +REM build for Windows XP +if exist C:\msys64-xp\ ( call :BUILDING_XP ) + +echo. REM compile installer echo Building installer... @@ -125,6 +119,11 @@ REM Clean work directory goto EOF :BUILDING_XP +set MSYSTEM=MINGW32 +set bitness=32 +set "WD=C:\msys64-xp\usr\bin\" +set "xSH=%WD%bash -lc" + %xSH% "make clean" >> nul echo Building i2pd %tag% for winxp... %xSH% "make DEBUG=no USE_UPNP=yes USE_WINXP_FLAGS=yes -j%threads%" > build\build_winxp_%tag%.log 2>&1 @@ -139,5 +138,6 @@ REM Copy binary for installer and create distribution archive REM Clean work directory %xSH% "make clean" >> build\build_winxp_%tag%.log 2>&1 +goto EOF -:EOF \ No newline at end of file +:EOF diff --git a/contrib/rpm/i2pd-git.spec b/contrib/rpm/i2pd-git.spec index ac6ca2faef2..261834d8058 100644 --- a/contrib/rpm/i2pd-git.spec +++ b/contrib/rpm/i2pd-git.spec @@ -146,8 +146,9 @@ getent passwd i2pd >/dev/null || \ %changelog -* Mon Feb 21 2022 orignal - 2.41.0 +* Sun Feb 20 2022 r4sas - 2.41.0 - update to 2.41.0 +- fixed build on Fedora Copr over openssl trunk code * Mon Nov 29 2021 orignal - 2.40.0 - update to 2.40.0 diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec index 11618b24a76..6fa94b66cc7 100644 --- a/contrib/rpm/i2pd.spec +++ b/contrib/rpm/i2pd.spec @@ -143,7 +143,7 @@ getent passwd i2pd >/dev/null || \ %changelog -* Mon Feb 21 2022 orignal - 2.41.0 +* Sun Feb 20 2022 r4sas - 2.41.0 - update to 2.41.0 * Mon Nov 29 2021 orignal - 2.40.0 diff --git a/debian/changelog b/debian/changelog index 8754ed31a1d..9a0bf0a2c11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ i2pd (2.41.0-1) unstable; urgency=medium * updated to version 2.41.0/0.9.53 - -- orignal Mon, 21 Feb 2022 16:00:00 +0000 + -- r4sas Sun, 20 Feb 2022 13:00:00 +0000 i2pd (2.40.0-1) unstable; urgency=medium