summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPavel Vinogradov2022-05-29 01:58:24 -0400
committerPavel Vinogradov2022-05-29 01:59:50 -0400
commit3ae8f0bc7fc9279413360a03634ec14ce8018f10 (patch)
tree28f524ac2e88d594a8fc74979d7139875f343134 /net
parent8c8c3ac9b5be778fdfa51ea8ff18a8e791092d77 (diff)
net/i2pd: version 2.42.0
Diffstat (limited to 'net')
-rwxr-xr-xnet/i2pd/DETAILS4
-rw-r--r--net/i2pd/HISTORY4
-rwxr-xr-xnet/i2pd/PRE_BUILD4
-rw-r--r--net/i2pd/patches/libressl-3.5.patch26
4 files changed, 6 insertions, 32 deletions
diff --git a/net/i2pd/DETAILS b/net/i2pd/DETAILS
index 567e511ab1..93b885a8c3 100755
--- a/net/i2pd/DETAILS
+++ b/net/i2pd/DETAILS
@@ -1,7 +1,7 @@
source "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=i2pd
- VERSION=2.41.0
- SOURCE_HASH=sha512:10ba77d714e4b02f9640c64b16b597550f71bfacf02242bd17cfdc7fc416e0e9bc62a2f1da486161baea397dae3d260fa88359325062b1c587f509058d418d85
+ VERSION=2.42.0
+ SOURCE_HASH=sha512:b50d3ac18f2a9b671b59b8b0dd0fb4de2b116ba9a4bf2caf9ea7abf43be616ca99446d19b6cda83a94188062956d5dbc36f3acb4d2d773921234ef753205af8b
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=https://github.com/PurpleI2P/${SPELL}/archive/${VERSION}.tar.gz
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/net/i2pd/HISTORY b/net/i2pd/HISTORY
index 6ae85cc0fd..e3c544b0ff 100644
--- a/net/i2pd/HISTORY
+++ b/net/i2pd/HISTORY
@@ -1,3 +1,7 @@
+2022-05-29 Pavel Vinogradov <public@sourcemage.org>
+ * DETAILS: version 2.42.0
+ * PRE_BUILD, patches/libressl-3.5.patch: dropped, fixed by upstream
+
2022-03-14 Pavel Vinogradov <public@sourcemage.org>
* PRE_BUILD, patches/libressl-3.5.patch: added patch to build with LibreSSL 3.5.x
diff --git a/net/i2pd/PRE_BUILD b/net/i2pd/PRE_BUILD
deleted file mode 100755
index f80ee7decc..0000000000
--- a/net/i2pd/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-apply_patch_dir patches
diff --git a/net/i2pd/patches/libressl-3.5.patch b/net/i2pd/patches/libressl-3.5.patch
deleted file mode 100644
index fb8c6b1816..0000000000
--- a/net/i2pd/patches/libressl-3.5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/libi2pd/Crypto.h b/libi2pd/Crypto.h
---- a/libi2pd/Crypto.h
-+++ b/libi2pd/Crypto.h
-@@ -29,12 +29,13 @@
- #include "CPU.h"
-
- // recognize openssl version and features
--#if ((OPENSSL_VERSION_NUMBER < 0x010100000) || defined(LIBRESSL_VERSION_NUMBER)) // 1.0.2 and below or LibreSSL
-+#if ((OPENSSL_VERSION_NUMBER < 0x010100000) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)) // 1.0.2 and below or LibreSSL < 3.5.0
- # define LEGACY_OPENSSL 1
- # define X509_getm_notBefore X509_get_notBefore
- # define X509_getm_notAfter X509_get_notAfter
- #else
- # define LEGACY_OPENSSL 0
-+# if !defined LIBRESSL_VERSION_NUMBER
- # if (OPENSSL_VERSION_NUMBER >= 0x010101000) // 1.1.1
- # define OPENSSL_HKDF 1
- # define OPENSSL_EDDSA 1
-@@ -46,6 +47,7 @@
- # if !defined OPENSSL_NO_CHACHA && !defined OPENSSL_NO_POLY1305 // some builds might not include them
- # define OPENSSL_AEAD_CHACHA20_POLY1305 1
- # endif
-+# endif
- #endif
-
- namespace i2p