From: Rosen Penev Date: Mon, 14 Sep 2020 03:20:41 +0000 (-0700) Subject: i2pd: refresh patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a8e1eed8a246492f6903397efe908710f45830db;p=feed%2Fpackages.git i2pd: refresh patch This version bump was not tested properly. Not even compile. Signed-off-by: Rosen Penev --- diff --git a/net/i2pd/Makefile b/net/i2pd/Makefile index 1080999115..6d8c5addf2 100644 --- a/net/i2pd/Makefile +++ b/net/i2pd/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=i2pd PKG_VERSION:=2.32.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_PARALLEL:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/net/i2pd/patches/010-config.patch b/net/i2pd/patches/010-config.patch new file mode 100644 index 0000000000..c3bfbcb28f --- /dev/null +++ b/net/i2pd/patches/010-config.patch @@ -0,0 +1,87 @@ +--- a/contrib/i2pd.conf ++++ b/contrib/i2pd.conf +@@ -8,12 +8,12 @@ + + ## Tunnels config file + ## Default: ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf +-# tunconf = /var/lib/i2pd/tunnels.conf ++tunconf = /etc/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 ++tunnelsdir = /etc/i2pd/tunnels.conf + + ## Where to write pidfile (default: i2pd.pid, not used in Windows) + # pidfile = /run/i2pd.pid +@@ -25,12 +25,12 @@ + ## * stdout - print log entries to stdout + ## * file - log entries to a file + ## * syslog - use syslog, see man 3 syslog +-# log = file ++log = syslog + ## Path to logfile (default - autodetect) + # logfile = /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 ++loglevel = error + ## Write full CLF-formatted date and time to log (default: write only time) + # logclftime = true + +@@ -61,7 +61,7 @@ ipv6 = false + # ifname6 = + + ## Enable NTCP transport (default = true) +-# ntcp = true ++ntcp = false + ## If you run i2pd behind a proxy server, you can only use NTCP transport with ntcpproxy option + ## Should be http://address:port or socks://address:port + # ntcpproxy = http://127.0.0.1:8118 +@@ -81,7 +81,7 @@ ipv6 = false + + ## Router will not accept transit tunnels, disabling transit traffic completely + ## (default = false) +-# notransit = true ++notransit = true + + ## Router will be floodfill + # floodfill = true +@@ -91,8 +91,10 @@ ipv6 = false + ## Uncomment and set to 'false' to disable Web Console + # enabled = true + ## Address and port service will listen on +-address = 127.0.0.1 ++address = 192.168.1.1 ++# address = :: + port = 7070 ++# strictheaders = false + ## Path to web console, default "/" + # webroot = / + ## Uncomment following lines to enable Web Console authentication +@@ -104,7 +106,7 @@ port = 7070 + ## Uncomment and set to 'false' to disable HTTP Proxy + # enabled = true + ## Address and port service will listen on +-address = 127.0.0.1 ++address = 192.168.1.1 + port = 4444 + ## Optional keys file for proxy local destination + # keys = http-proxy-keys.dat +@@ -118,7 +120,7 @@ port = 4444 + ## Uncomment and set to 'false' to disable SOCKS Proxy + # enabled = true + ## Address and port service will listen on +-address = 127.0.0.1 ++address = 192.168.1.1 + port = 4447 + ## Optional keys file for proxy local destination + # keys = socks-proxy-keys.dat +@@ -228,4 +230,5 @@ verify = true + + [persist] + ## Save peer profiles on disk (default: true) +-# profiles = true ++profiles = false ++addressbook = false diff --git a/net/i2pd/patches/config.patch b/net/i2pd/patches/config.patch deleted file mode 100644 index 5dae88a64e..0000000000 --- a/net/i2pd/patches/config.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -u -r a/contrib/i2pd.conf b/contrib/i2pd.conf ---- a/contrib/i2pd.conf 2019-09-04 11:00:27.660713504 +0800 -+++ b/contrib/i2pd.conf 2019-09-04 11:07:53.669745273 +0800 -@@ -8,12 +8,12 @@ - - ## Tunnels config file - ## Default: ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf --# tunconf = /var/lib/i2pd/tunnels.conf -+tunconf = /etc/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 = /etc/i2pd/tunnels.conf.d - - ## Where to write pidfile (don't write by default) - # pidfile = /var/run/i2pd.pid -@@ -25,12 +25,12 @@ - ## * stdout - print log entries to stdout - ## * file - log entries to a file - ## * syslog - use syslog, see man 3 syslog --# log = file -+log = syslog - ## Path to logfile (default - autodetect) - # logfile = /var/log/i2pd.log - ## Log messages above this level (debug, *info, warn, error, none) - ## If you set it to none, logging will be disabled --# loglevel = info -+loglevel = error - ## Write full CLF-formatted date and time to log (default: write only time) - # logclftime = true - -@@ -61,7 +61,7 @@ - # ifname6 = - - ## Enable NTCP transport (default = true) --# ntcp = true -+ntcp = false - ## If you run i2pd behind a proxy server, you can only use NTCP transport with ntcpproxy option - ## Should be http://address:port or socks://address:port - # ntcpproxy = http://127.0.0.1:8118 -@@ -81,7 +81,7 @@ - - ## Router will not accept transit tunnels, disabling transit traffic completely - ## (default = false) --# notransit = true -+notransit = true - - ## Router will be floodfill - # floodfill = true -@@ -91,8 +91,10 @@ - ## Uncomment and set to 'false' to disable Web Console - # enabled = true - ## Address and port service will listen on --address = 127.0.0.1 -+address = 192.168.1.1 -+# address = :: - port = 7070 -+# strictheaders = false - ## Path to web console, default "/" - # webroot = / - ## Uncomment following lines to enable Web Console authentication -@@ -104,7 +106,7 @@ - ## Uncomment and set to 'false' to disable HTTP Proxy - # enabled = true - ## Address and port service will listen on --address = 127.0.0.1 -+address = 192.168.1.1 - port = 4444 - ## Optional keys file for proxy local destination - # keys = http-proxy-keys.dat -@@ -118,7 +120,7 @@ - ## Uncomment and set to 'false' to disable SOCKS Proxy - # enabled = true - ## Address and port service will listen on --address = 127.0.0.1 -+address = 192.168.1.1 - port = 4447 - ## Optional keys file for proxy local destination - # keys = socks-proxy-keys.dat -@@ -228,4 +230,5 @@ - - [persist] - ## Save peer profiles on disk (default: true) --# profiles = true -+profiles = false -+addressbook = false