OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13387 from neheb/i2p 

i2pd: refresh patch
This commit is contained in:
Rosen Penev 2020-09-14 13:38:09 -07:00 committed by GitHub
parent 232dd76e9f a8e1eed8a2
commit 7d5f26bebf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/i2pd/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=i2pd PKG_NAME:=i2pd
PKG_VERSION:=2.32.1 PKG_VERSION:=2.32.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

31
net/i2pd/patches/config.patch → net/i2pd/patches/010-config.patch
View File

@ -1,6 +1,5 @@
diff -u -r a/contrib/i2pd.conf b/contrib/i2pd.conf --- a/contrib/i2pd.conf
--- a/contrib/i2pd.conf 2019-09-04 11:00:27.660713504 +0800 +++ b/contrib/i2pd.conf
+++ b/contrib/i2pd.conf 2019-09-04 11:07:53.669745273 +0800
@@ -8,12 +8,12 @@ @@ -8,12 +8,12 @@
## Tunnels config file ## Tunnels config file
@ -11,11 +10,11 @@ diff -u -r a/contrib/i2pd.conf b/contrib/i2pd.conf
## Tunnels config files path ## Tunnels config files path
## Use that path to store separated tunnels in different config files. ## Use that path to store separated tunnels in different config files.
## Default: ~/.i2pd/tunnels.d or /var/lib/i2pd/tunnels.d ## Default: ~/.i2pd/tunnels.d or /var/lib/i2pd/tunnels.d
-# tunnelsdir = /var/lib/i2pd/tunnels.conf.d -# tunnelsdir = /var/lib/i2pd/tunnels.d
+tunnelsdir = /etc/i2pd/tunnels.conf.d +tunnelsdir = /etc/i2pd/tunnels.conf
## Where to write pidfile (don't write by default) ## Where to write pidfile (default: i2pd.pid, not used in Windows)
# pidfile = /var/run/i2pd.pid # pidfile = /run/i2pd.pid
@@ -25,12 +25,12 @@ @@ -25,12 +25,12 @@
## * stdout - print log entries to stdout ## * stdout - print log entries to stdout
## * file - log entries to a file ## * file - log entries to a file
@ -23,15 +22,15 @@ diff -u -r a/contrib/i2pd.conf b/contrib/i2pd.conf
-# log = file -# log = file
+log = syslog +log = syslog
## Path to logfile (default - autodetect) ## Path to logfile (default - autodetect)
# logfile = /var/log/i2pd.log # logfile = /var/log/i2pd/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 ## If you set it to none, logging will be disabled
-# loglevel = info -# loglevel = warn
+loglevel = error +loglevel = error
## Write full CLF-formatted date and time to log (default: write only time) ## Write full CLF-formatted date and time to log (default: write only time)
# logclftime = true # logclftime = true
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@ ipv6 = false
# ifname6 = # ifname6 =
## Enable NTCP transport (default = true) ## Enable NTCP transport (default = true)
@ -40,7 +39,7 @@ diff -u -r a/contrib/i2pd.conf b/contrib/i2pd.conf
## If you run i2pd behind a proxy server, you can only use NTCP transport with ntcpproxy option ## 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 ## Should be http://address:port or socks://address:port
# ntcpproxy = http://127.0.0.1:8118 # ntcpproxy = http://127.0.0.1:8118
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@ ipv6 = false
## Router will not accept transit tunnels, disabling transit traffic completely ## Router will not accept transit tunnels, disabling transit traffic completely
## (default = false) ## (default = false)
@ -49,7 +48,7 @@ diff -u -r a/contrib/i2pd.conf b/contrib/i2pd.conf
## Router will be floodfill ## Router will be floodfill
# floodfill = true # floodfill = true
@@ -91,8 +91,10 @@ @@ -91,8 +91,10 @@ ipv6 = false
## Uncomment and set to 'false' to disable Web Console ## Uncomment and set to 'false' to disable Web Console
# enabled = true # enabled = true
## Address and port service will listen on ## Address and port service will listen on
@ -61,7 +60,7 @@ diff -u -r a/contrib/i2pd.conf b/contrib/i2pd.conf
## Path to web console, default "/" ## Path to web console, default "/"
# webroot = / # webroot = /
## Uncomment following lines to enable Web Console authentication ## Uncomment following lines to enable Web Console authentication
@@ -104,7 +106,7 @@ @@ -104,7 +106,7 @@ port = 7070
## Uncomment and set to 'false' to disable HTTP Proxy ## Uncomment and set to 'false' to disable HTTP Proxy
# enabled = true # enabled = true
## Address and port service will listen on ## Address and port service will listen on
@ -70,7 +69,7 @@ diff -u -r a/contrib/i2pd.conf b/contrib/i2pd.conf
port = 4444 port = 4444
## Optional keys file for proxy local destination ## Optional keys file for proxy local destination
# keys = http-proxy-keys.dat # keys = http-proxy-keys.dat
@@ -118,7 +120,7 @@ @@ -118,7 +120,7 @@ port = 4444
## Uncomment and set to 'false' to disable SOCKS Proxy ## Uncomment and set to 'false' to disable SOCKS Proxy
# enabled = true # enabled = true
## Address and port service will listen on ## Address and port service will listen on
@ -79,7 +78,7 @@ diff -u -r a/contrib/i2pd.conf b/contrib/i2pd.conf
port = 4447 port = 4447
## Optional keys file for proxy local destination ## Optional keys file for proxy local destination
# keys = socks-proxy-keys.dat # keys = socks-proxy-keys.dat
@@ -228,4 +230,5 @@ @@ -228,4 +230,5 @@ verify = true
[persist] [persist]
## Save peer profiles on disk (default: true) ## Save peer profiles on disk (default: true)