Update patches

4 files changed, 9 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d7115df29a5..85e3b21bf9b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = i2pd-git
 	pkgdesc = A full-featured C++ implementation of the I2P router (git version)
-	pkgver = 2.36.0.r0.g74aa07eb
+	pkgver = 2.36.0.r58.gf5af059e
 	pkgrel = 1
 	url = https://i2pd.website/
 	arch = x86_64
@@ -28,8 +28,8 @@ pkgbase = i2pd-git
 	sha256sums = SKIP
 	sha256sums = 0064503a9124b764d01db862ba3c2ff97bc5961d41359970df2d6ce9842a5ab5
 	sha256sums = 452550678ea5702a6492eb58e8d0452b91dc5d0aaa112cf04542df74a3dc0dfc
-	sha256sums = 45cfc3035c5b5cfc92cfffec1fe7d7efc4fed3229195cdb640ec4a6c405af149
-	sha256sums = 578ed9767890e970bd93b44e3be85c2595c4149ed65e4cc1c79ea12e2cb6982e
+	sha256sums = e98eaa783fcd8e1ab84980f68158e3bb9eb5ec101f26c748946a313152643f11
+	sha256sums = 1d14bf9d56eac134e750ece336897aa45ce7f039f67f0bbdc89bddc6c777fa7d
 	sha256sums = cfcb6b07b67aff3e3af12767f4649d88b9320dc71907b6c01b465e5c138cdaa3
 	sha256sums = 88b2e709228049ba11f37863f87de75ab6cde295104852871384337cfdc906a3
 	sha256sums = fe8cc2ec83cb5b5c2b2ec8cce9a989e0cb6fd347e00b84e03a17b12efd152fac
diff --git a/030-i2pd-do-not-override-config.patch b/030-i2pd-do-not-override-config.patch
index 8c57581b5a5b..f020dcdb9a39 100644
--- a/030-i2pd-do-not-override-config.patch
+++ b/030-i2pd-do-not-override-config.patch
@@ -1,29 +1,11 @@
 --- a/contrib/i2pd.service
 +++ b/contrib/i2pd.service
-@@ -11,20 +11,24 @@ RuntimeDirectoryMode=0700
+@@ -11,7 +11,7 @@ RuntimeDirectoryMode=0700
  LogsDirectory=i2pd
  LogsDirectoryMode=0700
  Type=forking
 -ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
-+ExecStart=/usr/sbin/i2pd --conf=/var/lib/i2pd/i2pd.conf --pidfile=/run/i2pd/i2pd.pid --daemon --service
++ExecStart=/usr/bin/i2pd --conf=/var/lib/i2pd/i2pd.conf --pidfile=/run/i2pd/i2pd.pid --daemon --service
  ExecReload=/bin/sh -c "kill -HUP $MAINPID"
  PIDFile=/run/i2pd/i2pd.pid
  ### Uncomment, if auto restart needed
- #Restart=on-failure
- 
-+# SIGQUIT is setted by upstream and always generates a core dump.
-+# You can ignore the failed exit (core dump) when stopping the service.
- KillSignal=SIGQUIT
-+
- # If you have the patience waiting 10 min on restarting/stopping it, uncomment this.
- # i2pd stops accepting new tunnels and waits ~10 min while old ones do not die.
- #KillSignal=SIGINT
- #TimeoutStopSec=10m
- 
--# If you have problems with hanging i2pd, you can try increase this
-+# If you have problems with hanging i2pd, you can try to increase this
- LimitNOFILE=4096
-+
- # To enable write of coredump uncomment this
- #LimitCORE=infinity
- 
diff --git a/040-i2pd-systemd-service-hardening.patch b/040-i2pd-systemd-service-hardening.patch
index fda69b58803b..188bf25fc28a 100644
--- a/040-i2pd-systemd-service-hardening.patch
+++ b/040-i2pd-systemd-service-hardening.patch
@@ -1,6 +1,6 @@
 --- a/contrib/i2pd.service
 +++ b/contrib/i2pd.service
-@@ -32,5 +32,31 @@ LimitNOFILE=4096
+@@ -33,5 +33,31 @@ LimitNOFILE=4096
  # To enable write of coredump uncomment this
  #LimitCORE=infinity
  
diff --git a/PKGBUILD b/PKGBUILD
index be7adfaa312a..c7e53b12116c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: DDoSolitary <DDoSolitary@gmail.com>
 
 pkgname=i2pd-git
-pkgver=2.36.0.r0.g74aa07eb
+pkgver=2.36.0.r58.gf5af059e
 pkgrel=1
 pkgdesc='A full-featured C++ implementation of the I2P router (git version)'
 arch=('x86_64')
@@ -28,8 +28,8 @@ source=('git+https://github.com/PurpleI2P/i2pd.git#branch=openssl'
 sha256sums=('SKIP'
             '0064503a9124b764d01db862ba3c2ff97bc5961d41359970df2d6ce9842a5ab5'
             '452550678ea5702a6492eb58e8d0452b91dc5d0aaa112cf04542df74a3dc0dfc'
-            '45cfc3035c5b5cfc92cfffec1fe7d7efc4fed3229195cdb640ec4a6c405af149'
-            '578ed9767890e970bd93b44e3be85c2595c4149ed65e4cc1c79ea12e2cb6982e'
+            'e98eaa783fcd8e1ab84980f68158e3bb9eb5ec101f26c748946a313152643f11'
+            '1d14bf9d56eac134e750ece336897aa45ce7f039f67f0bbdc89bddc6c777fa7d'
             'cfcb6b07b67aff3e3af12767f4649d88b9320dc71907b6c01b465e5c138cdaa3'
             '88b2e709228049ba11f37863f87de75ab6cde295104852871384337cfdc906a3'
             'fe8cc2ec83cb5b5c2b2ec8cce9a989e0cb6fd347e00b84e03a17b12efd152fac')