From d79c22eed1f1a229ae84dcc676d3c66fb5a51858 Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 8 Mar 2022 00:56:24 +0000 Subject: [PATCH] update to i2p-1.7.0, from Dimitri Karamazov (maintainer) plus drop RCS IDs --- net/i2p/Makefile | 4 +--- net/i2p/distinfo | 4 ++-- net/i2p/patches/patch-core_c_build_sh | 2 -- net/i2p/patches/patch-core_c_jbigi_build_sh | 2 -- net/i2p/patches/patch-installer_resources_eepget | 2 -- net/i2p/patches/patch-installer_resources_i2prouter | 2 -- net/i2p/patches/patch-installer_resources_wrapper_config | 2 -- net/i2p/pkg/PFRAG.x86 | 1 - net/i2p/pkg/PLIST | 7 +++---- net/i2p/pkg/i2p.rc | 2 -- 10 files changed, 6 insertions(+), 22 deletions(-) diff --git a/net/i2p/Makefile b/net/i2p/Makefile index 953ece71295..ee2eb08c825 100644 --- a/net/i2p/Makefile +++ b/net/i2p/Makefile @@ -1,10 +1,8 @@ -# $OpenBSD: Makefile,v 1.12 2021/10/16 08:09:23 rsadowski Exp $ - COMMENT= i2p routing protocol GH_ACCOUNT= i2p GH_PROJECT= i2p.i2p -GH_TAGNAME= i2p-1.5.0 +GH_TAGNAME= i2p-1.7.0 DISTNAME= ${GH_TAGNAME} CATEGORIES= net diff --git a/net/i2p/distinfo b/net/i2p/distinfo index 2cc3a4ed796..045db8cc1b2 100644 --- a/net/i2p/distinfo +++ b/net/i2p/distinfo @@ -1,2 +1,2 @@ -SHA256 (i2p-1.5.0.tar.gz) = gzNKUr9DI6qBuHZwhXE9tiirGG3FdLsrtU21LJeqnSM= -SIZE (i2p-1.5.0.tar.gz) = 37147681 +SHA256 (i2p-1.7.0.tar.gz) = KTGe388o9ed/u1yyH7Gij7hG0iQr4sZ5z8WmEyxfYb4= +SIZE (i2p-1.7.0.tar.gz) = 37867228 diff --git a/net/i2p/patches/patch-core_c_build_sh b/net/i2p/patches/patch-core_c_build_sh index f5d966e540a..e650996ec2c 100644 --- a/net/i2p/patches/patch-core_c_build_sh +++ b/net/i2p/patches/patch-core_c_build_sh @@ -1,5 +1,3 @@ -$OpenBSD: patch-core_c_build_sh,v 1.2 2021/05/21 13:19:59 kurt Exp $ - fix jar location and jcpuid is x86 only Index: core/c/build.sh diff --git a/net/i2p/patches/patch-core_c_jbigi_build_sh b/net/i2p/patches/patch-core_c_jbigi_build_sh index 552952576b9..1a7ae5280a7 100644 --- a/net/i2p/patches/patch-core_c_jbigi_build_sh +++ b/net/i2p/patches/patch-core_c_jbigi_build_sh @@ -1,5 +1,3 @@ -$OpenBSD: patch-core_c_jbigi_build_sh,v 1.1.1.1 2020/11/04 19:14:51 solene Exp $ - use only local gmp change default lib to dynamic avoid tests diff --git a/net/i2p/patches/patch-installer_resources_eepget b/net/i2p/patches/patch-installer_resources_eepget index 2d492abfad9..cf7e390e009 100644 --- a/net/i2p/patches/patch-installer_resources_eepget +++ b/net/i2p/patches/patch-installer_resources_eepget @@ -1,5 +1,3 @@ -$OpenBSD: patch-installer_resources_eepget,v 1.1.1.1 2020/11/04 19:14:51 solene Exp $ - set correct path to base --- installer/resources/eepget.orig Thu Jul 30 23:26:56 2020 diff --git a/net/i2p/patches/patch-installer_resources_i2prouter b/net/i2p/patches/patch-installer_resources_i2prouter index 3f55237048e..5943455eb3c 100644 --- a/net/i2p/patches/patch-installer_resources_i2prouter +++ b/net/i2p/patches/patch-installer_resources_i2prouter @@ -1,5 +1,3 @@ -$OpenBSD: patch-installer_resources_i2prouter,v 1.1.1.1 2020/11/04 19:14:51 solene Exp $ - set correct base set proper path for log and temp dirs remove link to internal wrapper - doesn't work diff --git a/net/i2p/patches/patch-installer_resources_wrapper_config b/net/i2p/patches/patch-installer_resources_wrapper_config index b6a6846aac3..bc42823928c 100644 --- a/net/i2p/patches/patch-installer_resources_wrapper_config +++ b/net/i2p/patches/patch-installer_resources_wrapper_config @@ -1,5 +1,3 @@ -$OpenBSD: patch-installer_resources_wrapper_config,v 1.1.1.1 2020/11/04 19:14:51 solene Exp $ - path to java binary add proper classpaths for i2p and wrapper add library path for wrapper diff --git a/net/i2p/pkg/PFRAG.x86 b/net/i2p/pkg/PFRAG.x86 index 3422ff8c3d4..27c3f07e5ea 100644 --- a/net/i2p/pkg/PFRAG.x86 +++ b/net/i2p/pkg/PFRAG.x86 @@ -1,2 +1 @@ -@comment $OpenBSD: PFRAG.x86,v 1.1 2021/05/21 13:19:59 kurt Exp $ @so share/i2p/lib/libjcpuid.so diff --git a/net/i2p/pkg/PLIST b/net/i2p/pkg/PLIST index 206b71e04f3..a5b257f0d51 100644 --- a/net/i2p/pkg/PLIST +++ b/net/i2p/pkg/PLIST @@ -1,4 +1,3 @@ -@comment $OpenBSD: PLIST,v 1.5 2021/05/21 13:19:59 kurt Exp $ @newgroup _i2p:861 @newuser _i2p:861:861:daemon:i2p account:${DB_DIR}:/sbin/nologin @rcscript ${RCDIR}/i2p @@ -31,23 +30,24 @@ share/i2p/certificates/news/zzz_at_mail.i2p.crt share/i2p/certificates/plugin/ share/i2p/certificates/plugin/backup_at_mail.i2p.crt share/i2p/certificates/plugin/cacapo_at_mail.i2p.crt +share/i2p/certificates/plugin/hankhill19580_at_gmail.com.crt share/i2p/certificates/plugin/str4d_at_mail.i2p.crt share/i2p/certificates/plugin/zab_at_mail.i2p.crt share/i2p/certificates/plugin/zzz-plugin_at_mail.i2p.crt share/i2p/certificates/reseed/ share/i2p/certificates/reseed/creativecowpat_at_mail.i2p.crt -share/i2p/certificates/reseed/echelon_at_mail.i2p.crt +share/i2p/certificates/reseed/echelon3_at_mail.i2p.crt share/i2p/certificates/reseed/hankhill19580_at_gmail.com.crt share/i2p/certificates/reseed/hottuna_at_mail.i2p.crt share/i2p/certificates/reseed/igor_at_novg.net.crt share/i2p/certificates/reseed/lazygravy_at_mail.i2p.crt +share/i2p/certificates/reseed/rambler_at_mail.i2p.crt share/i2p/certificates/reseed/reseed_at_diva.exchange.crt share/i2p/certificates/router/ share/i2p/certificates/router/echelon_at_mail.i2p.crt share/i2p/certificates/router/hankhill19580_at_gmail.com.crt share/i2p/certificates/router/zzz_at_mail.i2p.crt share/i2p/certificates/ssl/ -share/i2p/certificates/ssl/echelon.reseed2017.crt share/i2p/certificates/ssl/i2pseed.creativecowpat.net.crt share/i2p/certificates/ssl/isrgrootx1.crt share/i2p/clients.config @@ -388,7 +388,6 @@ share/i2p/hosts.txt share/i2p/i2psnark.config share/i2p/i2ptunnel.config share/i2p/lib/ -share/i2p/lib/BOB.jar share/i2p/lib/addressbook.jar share/i2p/lib/commons-el.jar share/i2p/lib/desktopgui.jar diff --git a/net/i2p/pkg/i2p.rc b/net/i2p/pkg/i2p.rc index 9041840f83c..d1e0e1c6d18 100644 --- a/net/i2p/pkg/i2p.rc +++ b/net/i2p/pkg/i2p.rc @@ -1,6 +1,4 @@ #!/bin/ksh -# -# $OpenBSD: i2p.rc,v 1.2 2020/12/05 17:21:55 solene Exp $ daemon="${TRUEPREFIX}/bin/i2prouter" daemon_flags="start"