From 07a55ff91aa5da608b3dc51ec0c9d605889ce353 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Tue, 26 May 2020 16:54:10 +0300 Subject: [PATCH] i2pd: update patches --- packages/i2pd/contrib-i2pd.conf.patch | 24 ++++++++++++------------ packages/i2pd/fix-paths.patch | 27 ++++++++++++++++++--------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/packages/i2pd/contrib-i2pd.conf.patch b/packages/i2pd/contrib-i2pd.conf.patch index b22decd85..2967115da 100644 --- a/packages/i2pd/contrib-i2pd.conf.patch +++ b/packages/i2pd/contrib-i2pd.conf.patch @@ -1,24 +1,24 @@ -diff -uNr i2pd-2.31.0/contrib/i2pd.conf i2pd-2.31.0.mod/contrib/i2pd.conf ---- i2pd-2.31.0/contrib/i2pd.conf 2020-04-10 20:33:54.000000000 +0300 -+++ i2pd-2.31.0.mod/contrib/i2pd.conf 2020-05-08 01:04:37.465748132 +0300 +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 @@ ## 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@/etc/i2pd/tunnels.conf -+tunconf = @TERMUX_PREFIX@/etc/i2pd/tunnels.conf ++## Default: ~/.i2pd/tunnels.conf or @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.conf.d +-# tunnelsdir = /var/lib/i2pd/tunnels.d +## Default: ~/.i2pd/tunnels.d or @TERMUX_PREFIX@/etc/i2pd/tunnels.d -+# tunnelsdir = @TERMUX_PREFIX@/etc/i2pd/tunnels.conf.d ++# tunnelsdir = @TERMUX_PREFIX@/etc/i2pd/tunnels.d - ## Where to write pidfile (don't write by default) --# pidfile = /var/run/i2pd.pid + ## Where to write pidfile (default: i2pd.pid, not used in Windows) +-# pidfile = /run/i2pd.pid +# pidfile = @TERMUX_PREFIX@/var/run/i2pd.pid ## Logging configuration section @@ -27,11 +27,11 @@ diff -uNr i2pd-2.31.0/contrib/i2pd.conf i2pd-2.31.0.mod/contrib/i2pd.conf ## * syslog - use syslog, see man 3 syslog # log = file ## Path to logfile (default - autodetect) --# logfile = /var/log/i2pd.log +-# logfile = /var/log/i2pd/i2pd.log +# logfile = @TERMUX_PREFIX@/var/log/i2pd.log - ## Log messages above this level (debug, *info, warn, error, none) + ## Log messages above this level (debug, info, *warn, error, none) ## If you set it to none, logging will be disabled - # loglevel = info + # loglevel = warn @@ -69,7 +69,7 @@ # ssu = true diff --git a/packages/i2pd/fix-paths.patch b/packages/i2pd/fix-paths.patch index cf3504456..5e71428ef 100644 --- a/packages/i2pd/fix-paths.patch +++ b/packages/i2pd/fix-paths.patch @@ -1,24 +1,33 @@ -diff -uNr i2pd-2.31.0/libi2pd/Config.cpp i2pd-2.31.0.mod/libi2pd/Config.cpp ---- i2pd-2.31.0/libi2pd/Config.cpp 2020-04-10 20:33:54.000000000 +0300 -+++ i2pd-2.31.0.mod/libi2pd/Config.cpp 2020-05-08 01:08:43.276186146 +0300 +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 @@ 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") +- ("tunnelsdir", value()->default_value(""), "Path to extra tunnels' configs folder (default: ~/.i2pd/tunnels.d or /var/lib/i2pd/tunnels.d") - ("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") ++ ("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)") ("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("info"), "Set the minimal level of log messages (debug, info, warn, error, none)") -diff -uNr i2pd-2.31.0/libi2pd/FS.cpp i2pd-2.31.0.mod/libi2pd/FS.cpp ---- i2pd-2.31.0/libi2pd/FS.cpp 2020-04-10 20:33:54.000000000 +0300 -+++ i2pd-2.31.0.mod/libi2pd/FS.cpp 2020-05-08 01:07:13.007295667 +0300 + ("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)") + ("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)") ++ ("service", bool_switch()->default_value(false), "Router will use system folders like '@TERMUX_PREFIX@/var/lib/i2pd' (default: disabled)") + ("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 @@ // otherwise use /data/files char *home = getenv("HOME");