From 266deb586686bfdd5e95c451284541a06c3d5d25 Mon Sep 17 00:00:00 2001
From: Dirk Neukirchen <plntyk.lede@plntyk.name>
Date: Tue, 2 Mar 2021 20:10:03 +0100
Subject: [PATCH 1/3] i2pd: remove unneeded functions.sh

its included via rc.common, see
https://openwrt.org/docs/guide-developer/config-scripting

Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
---
 net/i2pd/files/i2pd.init | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/i2pd/files/i2pd.init b/net/i2pd/files/i2pd.init
index 30dddae10..4f8c75c58 100755
--- a/net/i2pd/files/i2pd.init
+++ b/net/i2pd/files/i2pd.init
@@ -14,7 +14,6 @@ PIDFILE=/var/run/i2pd.pid
 DATADIR=/var/lib/i2pd
 CONFFILE=/etc/i2pd/i2pd.conf
 
-. /lib/functions.sh
 
 
 i2pd_start() {

From 4f42a7a95ada0a3b4f82ad238759fd77e64e4227 Mon Sep 17 00:00:00 2001
From: Dirk Neukirchen <plntyk.lede@plntyk.name>
Date: Wed, 3 Mar 2021 13:46:42 +0100
Subject: [PATCH 2/3] i2pd: fix startup

i2pd reports:
missing/unreadable config file: /etc/i2pd/i2pd.conf

Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
---
 net/i2pd/Makefile        | 2 +-
 net/i2pd/files/i2pd.init | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/i2pd/Makefile b/net/i2pd/Makefile
index a16ba9150..745fcbe9c 100644
--- a/net/i2pd/Makefile
+++ b/net/i2pd/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=i2pd
 PKG_VERSION:=2.35.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/PurpleI2P/i2pd/tar.gz/$(PKG_VERSION)?
diff --git a/net/i2pd/files/i2pd.init b/net/i2pd/files/i2pd.init
index 4f8c75c58..bfea047e7 100755
--- a/net/i2pd/files/i2pd.init
+++ b/net/i2pd/files/i2pd.init
@@ -42,6 +42,7 @@ i2pd_start() {
 	## We need permissions
 	touch "$PIDFILE"
 	chown "$USER:adm" "$PIDFILE"
+	chown "$USER:adm" "$CONFFILE"
 
 	procd_open_instance
 	procd_set_param command "$PROG" --service --conf="$CONFFILE" --pidfile "$PIDFILE"

From fc7d710e626f73029597d1f6811d0bd26d587c4d Mon Sep 17 00:00:00 2001
From: Dirk Neukirchen <plntyk.lede@plntyk.name>
Date: Thu, 4 Mar 2021 12:51:24 +0100
Subject: [PATCH 3/3] i2pd: update to 2.36

remove AVX patches as upstream has integrated and closed
all AVX issues

compiled on :  x86-64, i386 generic
tested on : x86-64 VM, i386 VM

Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
---
 net/i2pd/Makefile              |  6 +++---
 net/i2pd/patches/020-x86.patch | 32 --------------------------------
 2 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 net/i2pd/patches/020-x86.patch

diff --git a/net/i2pd/Makefile b/net/i2pd/Makefile
index 745fcbe9c..fd45d7fbb 100644
--- a/net/i2pd/Makefile
+++ b/net/i2pd/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=i2pd
-PKG_VERSION:=2.35.0
-PKG_RELEASE:=3
+PKG_VERSION:=2.36.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/PurpleI2P/i2pd/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=d041fd4e7a88ac168e76f66fdab40174ad093cdc13451cdbd0dd1216e5581f8a
+PKG_HASH:=17b7309cbee41b991cf9480334495c5a049f709beb1b31fbfcb47de19c8462a3
 
 PKG_MAINTAINER:=David Yang <mmyangfl@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/net/i2pd/patches/020-x86.patch b/net/i2pd/patches/020-x86.patch
deleted file mode 100644
index 6e407f197..000000000
--- a/net/i2pd/patches/020-x86.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ca3b8191510c1006d031d02c50edcf6b4f6a6e8f Mon Sep 17 00:00:00 2001
-From: R4SAS <r4sas@i2pmail.org>
-Date: Thu, 10 Dec 2020 18:32:41 +0300
-Subject: [PATCH] [avx] check ig c++ target supports AVX
-
-Signed-off-by: R4SAS <r4sas@i2pmail.org>
----
- libi2pd/Crypto.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/libi2pd/Crypto.cpp
-+++ b/libi2pd/Crypto.cpp
-@@ -638,7 +638,7 @@ namespace crypto
- 	{
- 		uint64_t buf[256];
- 		uint64_t hash[12]; // 96 bytes
--#if defined(__x86_64__) || defined(__i386__)
-+#if (defined(__x86_64__) || defined(__i386__)) && defined(__AVX__) // not all X86 targets supports AVX (like old Pentium, see #1600)
- 		if(i2p::cpu::avx)
- 		{
- 			__asm__
---- a/libi2pd/Identity.cpp
-+++ b/libi2pd/Identity.cpp
-@@ -828,7 +828,7 @@ namespace data
- 	XORMetric operator^(const IdentHash& key1, const IdentHash& key2)
- 	{
- 		XORMetric m;
--#if defined(__x86_64__) || defined(__i386__)
-+#if (defined(__x86_64__) || defined(__i386__)) && defined(__AVX__) // not all X86 targets supports AVX (like old Pentium, see #1600)
- 		if(i2p::cpu::avx)
- 		{
- 			__asm__