From f4a3fca1800eb8734fa1313c63e674b2f312d9de Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 6 Nov 2021 21:49:26 +0200 Subject: [PATCH] i2pd: update to 2.39.0 --- packages/i2pd/build.sh | 5 ++--- packages/i2pd/contrib-i2pd.conf.patch | 24 +++++++++++++-------- packages/i2pd/fix-paths.patch | 30 ++++++++++++++------------- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/packages/i2pd/build.sh b/packages/i2pd/build.sh index b5435f48a..39facceb9 100644 --- a/packages/i2pd/build.sh +++ b/packages/i2pd/build.sh @@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="A full-featured C++ implementation of the I2P router" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_LICENSE_FILE="../LICENSE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.38.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=2.39.0 TERMUX_PKG_SRCURL=https://github.com/PurpleI2P/i2pd/archive/$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=8452f5323795a1846d554096c08fffe5ac35897867b93a5079605df8f80a3089 +TERMUX_PKG_SHA256=3ffeb614cec826e13b50e8306177018ecb8d873668dfe66aadc733ca9fcaa568 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="boost, miniupnpc, openssl, zlib" TERMUX_PKG_FORCE_CMAKE=true diff --git a/packages/i2pd/contrib-i2pd.conf.patch b/packages/i2pd/contrib-i2pd.conf.patch index cb274c6ad..8cf8f60c5 100644 --- a/packages/i2pd/contrib-i2pd.conf.patch +++ b/packages/i2pd/contrib-i2pd.conf.patch @@ -1,21 +1,27 @@ -diff -uNr i2pd-2.32.0.orig/contrib/i2pd.conf i2pd-2.32.0/contrib/i2pd.conf ---- i2pd-2.32.0.orig/contrib/i2pd.conf 2020-05-25 16:45:46.000000000 +0300 -+++ i2pd-2.32.0/contrib/i2pd.conf 2020-05-26 16:49:03.680783024 +0300 -@@ -7,16 +7,16 @@ +diff -uNr i2pd-2.39.0/contrib/i2pd.conf i2pd-2.39.0.mod/contrib/i2pd.conf +--- i2pd-2.39.0/contrib/i2pd.conf 2021-08-23 17:03:26.000000000 +0300 ++++ i2pd-2.39.0.mod/contrib/i2pd.conf 2021-11-06 21:40:32.989514517 +0200 +@@ -7,20 +7,20 @@ ## by removing the "#" symbol. ## Tunnels config file -## Default: ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf -# tunconf = /var/lib/i2pd/tunnels.conf +## Default: ~/.i2pd/tunnels.conf or @TERMUX_PREFIX@/var/lib/i2pd/tunnels.conf -+tunconf = @TERMUX_PREFIX@/var/lib/i2pd/tunnels.conf ++# tunconf = @TERMUX_PREFIX@/var/lib/i2pd/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.d -+## Default: ~/.i2pd/tunnels.d or @TERMUX_PREFIX@/etc/i2pd/tunnels.d -+# tunnelsdir = @TERMUX_PREFIX@/etc/i2pd/tunnels.d ++## Default: ~/.i2pd/tunnels.d or @TERMUX_PREFIX@/var/lib/i2pd/tunnels.d ++# tunnelsdir = @TERMUX_PREFIX@/var/lib/i2pd/tunnels.d + + ## Path to certificates used for verifying .su3, families +-## Default: ~/.i2pd/certificates or /var/lib/i2pd/certificates +-# certsdir = /var/lib/i2pd/certificates ++## Default: ~/.i2pd/certificates or @TERMUX_PREFIX@/var/lib/i2pd/certificates ++# certsdir = @TERMUX_PREFIX@/var/lib/i2pd/certificates ## Where to write pidfile (default: i2pd.pid, not used in Windows) -# pidfile = /run/i2pd.pid @@ -23,12 +29,12 @@ diff -uNr i2pd-2.32.0.orig/contrib/i2pd.conf i2pd-2.32.0/contrib/i2pd.conf ## Logging configuration section ## By default logs go to stdout with level 'info' and higher -@@ -27,7 +27,7 @@ +@@ -32,7 +32,7 @@ ## * syslog - use syslog, see man 3 syslog # log = file ## Path to logfile (default - autodetect) -# logfile = /var/log/i2pd/i2pd.log -+# logfile = @TERMUX_PREFIX@/var/log/i2pd.log ++# logfile = @TERMUX_PREFIX@/var/log/i2pd/i2pd.log ## Log messages above this level (debug, info, *warn, error, none) ## If you set it to none, logging will be disabled # loglevel = warn diff --git a/packages/i2pd/fix-paths.patch b/packages/i2pd/fix-paths.patch index 5e71428ef..d16ce0cf1 100644 --- a/packages/i2pd/fix-paths.patch +++ b/packages/i2pd/fix-paths.patch @@ -1,23 +1,25 @@ -diff -uNr i2pd-2.32.0/libi2pd/Config.cpp i2pd-2.32.0.mod/libi2pd/Config.cpp ---- i2pd-2.32.0/libi2pd/Config.cpp 2020-05-25 16:45:46.000000000 +0300 -+++ i2pd-2.32.0.mod/libi2pd/Config.cpp 2020-05-26 16:53:28.658827605 +0300 -@@ -33,10 +33,10 @@ +diff -uNr i2pd-2.39.0/libi2pd/Config.cpp i2pd-2.39.0.mod/libi2pd/Config.cpp +--- i2pd-2.39.0/libi2pd/Config.cpp 2021-08-23 17:03:26.000000000 +0300 ++++ i2pd-2.39.0.mod/libi2pd/Config.cpp 2021-11-06 21:44:21.097504481 +0200 +@@ -34,11 +34,11 @@ general.add_options() ("help", "Show this message") ("version", "Show i2pd version") - ("conf", value()->default_value(""), "Path to main i2pd config file (default: try ~/.i2pd/i2pd.conf or /var/lib/i2pd/i2pd.conf)") - ("tunconf", value()->default_value(""), "Path to config with tunnels list and options (default: try ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf)") - ("tunnelsdir", value()->default_value(""), "Path to extra tunnels' configs folder (default: ~/.i2pd/tunnels.d or /var/lib/i2pd/tunnels.d") +- ("certsdir", value()->default_value(""), "Path to certificates used for verifying .su3, families (default: ~/.i2pd/certificates or /var/lib/i2pd/certificates") - ("pidfile", value()->default_value(""), "Path to pidfile (default: ~/i2pd/i2pd.pid or /var/lib/i2pd/i2pd.pid)") -+ ("conf", value()->default_value(""), "Path to main i2pd config file (default: try ~/.i2pd/i2pd.conf or @TERMUX_PREFIX@/etc/i2pd/i2pd.conf)") -+ ("tunconf", value()->default_value(""), "Path to config with tunnels list and options (default: try ~/.i2pd/tunnels.conf or @TERMUX_PREFIX@/etc/i2pd/tunnels.conf)") -+ ("tunnelsdir", value()->default_value(""), "Path to extra tunnels' configs folder (default: ~/.i2pd/tunnels.d or @TERMUX_PREFIX@/etc/i2pd/tunnels.d") -+ ("pidfile", value()->default_value(""), "Path to pidfile (default: ~/i2pd/i2pd.pid or @TERMUX_PREFIX@/var/run/i2pd.pid)") ++ ("conf", value()->default_value(""), "Path to main i2pd config file (default: try ~/.i2pd/i2pd.conf or @TERMUX_PREFIX@/var/lib/i2pd/i2pd.conf)") ++ ("tunconf", value()->default_value(""), "Path to config with tunnels list and options (default: try ~/.i2pd/tunnels.conf or @TERMUX_PREFIX@/var/lib/i2pd/tunnels.conf)") ++ ("tunnelsdir", value()->default_value(""), "Path to extra tunnels' configs folder (default: ~/.i2pd/tunnels.d or @TERMUX_PREFIX@/var/lib/i2pd/tunnels.d") ++ ("certsdir", value()->default_value(""), "Path to certificates used for verifying .su3, families (default: ~/.i2pd/certificates or @TERMUX_PREFIX@/var/lib/i2pd/certificates") ++ ("pidfile", value()->default_value(""), "Path to pidfile (default: ~/i2pd/i2pd.pid or @TERMUX_PREFIX@/var/lib/i2pd/i2pd.pid)") ("log", value()->default_value(""), "Logs destination: stdout, file, syslog (stdout if not set)") ("logfile", value()->default_value(""), "Path to logfile (stdout if not set, autodetect if daemon)") ("loglevel", value()->default_value("warn"), "Set the minimal level of log messages (debug, info, warn, error, none)") -@@ -53,7 +53,7 @@ - ("ipv6", bool_switch()->default_value(false), "Enable communication through ipv6 (default: disabled)") +@@ -58,7 +58,7 @@ + ("reservedrange", bool_switch()->default_value(true), "Check remote RI for being in blacklist of reserved IP ranges (default: enabled)") ("netid", value()->default_value(I2PD_NET_ID), "Specify NetID. Main I2P is 2") ("daemon", bool_switch()->default_value(false), "Router will go to background after start (default: disabled)") - ("service", bool_switch()->default_value(false), "Router will use system folders like '/var/lib/i2pd' (default: disabled)") @@ -25,10 +27,10 @@ diff -uNr i2pd-2.32.0/libi2pd/Config.cpp i2pd-2.32.0.mod/libi2pd/Config.cpp ("notransit", bool_switch()->default_value(false), "Router will not accept transit tunnels at startup (default: disabled)") ("floodfill", bool_switch()->default_value(false), "Router will be floodfill (default: disabled)") ("bandwidth", value()->default_value(""), "Bandwidth limit: integer in KBps or letters: L (32), O (256), P (2048), X (>9000)") -diff -uNr i2pd-2.32.0/libi2pd/FS.cpp i2pd-2.32.0.mod/libi2pd/FS.cpp ---- i2pd-2.32.0/libi2pd/FS.cpp 2020-05-25 16:45:46.000000000 +0300 -+++ i2pd-2.32.0.mod/libi2pd/FS.cpp 2020-05-26 16:50:48.905596024 +0300 -@@ -100,11 +100,11 @@ +diff -uNr i2pd-2.39.0/libi2pd/FS.cpp i2pd-2.39.0.mod/libi2pd/FS.cpp +--- i2pd-2.39.0/libi2pd/FS.cpp 2021-08-23 17:03:26.000000000 +0300 ++++ i2pd-2.39.0.mod/libi2pd/FS.cpp 2021-11-06 21:41:30.409511991 +0200 +@@ -121,11 +121,11 @@ // otherwise use /data/files char *home = getenv("HOME"); if (isService) {