update to i2pd-2.36.0 and remove old zero-byte patches, from maintainer

This commit is contained in:
sthen 2021-02-18 17:32:42 +00:00
parent 8608a22cc9
commit 80ea3d15d5
5 changed files with 12 additions and 29 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.3 2021/01/27 18:38:29 solene Exp $
# $OpenBSD: Makefile,v 1.4 2021/02/18 17:32:42 sthen Exp $
COMMENT = client for the I2P anonymous network
GH_ACCOUNT = PurpleI2P
GH_PROJECT = i2pd
GH_TAGNAME = 2.35.0
GH_TAGNAME = 2.36.0
CATEGORIES = net
HOMEPAGE = https://i2pd.website
@ -43,6 +43,6 @@ post-install:
do-test:
cd ${WRKDIST}/tests && ${MAKE_PROGRAM} CXX="${CXX}" \
INCFLAGS="-L${LOCALBASE}/lib -I${LOCALBASE}/include ${CFLAGS}"
INCFLAGS="-L${LOCALBASE}/lib -I${LOCALBASE}/include ${CFLAGS}"
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (i2pd-2.35.0.tar.gz) = 0EH9TnqIrBaOdvZv2rQBdK0JPNwTRRzb0N0SFuVYH4o=
SIZE (i2pd-2.35.0.tar.gz) = 1105837
SHA256 (i2pd-2.36.0.tar.gz) = F7cwnL7kG5kc+UgDNElcWgSfcJvrGzH7/LR94ZyEYqM=
SIZE (i2pd-2.36.0.tar.gz) = 550451

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-libi2pd_Crypto_cpp,v 1.1 2021/01/27 18:38:29 solene Exp $
--- libi2pd/Crypto.cpp
+++ 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__
--- libi2pd/Identity.cpp
+++ 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__

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2021/01/27 18:38:29 solene Exp $
@comment $OpenBSD: PLIST,v 1.4 2021/02/18 17:32:42 sthen Exp $
@newgroup _i2pd:838
@newuser _i2pd:838:838:daemon:i2pd account:${LOCALSTATEDIR}/lib/i2pd:/sbin/nologin
@rcscript ${RCDIR}/i2pd
@ -119,6 +119,12 @@ share/examples/i2pd/certificates/reseed/
@sample ${LOCALSTATEDIR}/lib/
@owner
@group
share/examples/i2pd/certificates/reseed/acetone_at_mail.i2p.crt
@owner _i2pd
@group _i2pd
@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/acetone_at_mail.i2p.crt
@owner
@group
share/examples/i2pd/certificates/reseed/creativecowpat_at_mail.i2p.crt
@owner _i2pd
@group _i2pd