On Mon, Jan 18, 2021 at 07:55:23PM +0100, Mikal Villa wrote: > Hi, > > Yea sure do that :) > > /Mikal > > > On 18 Jan 2021, at 18:25, Dimitri Karamazov <deserter...@danwin1210.me> > > wrote: > > > > Hey, > > I intend to use i2pd and keep it updated. I already > > maintain the i2p java port. > > https://openports.se/net/i2p > > > > Since I'll be actually using it on an openbsd machine is > > it okay with you if I take MAINTAINER for i2pd? > > > > regards, > > Dimitri >
Update i2pd to 2.35.0. Also taking MAINTAINER after an off the list discussion with Mikal Villa. Build & Run tested on amd64. 2 out of the 7 tests need some more work. Index: Makefile =================================================================== RCS file: /cvs/ports/net/i2pd/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 28 May 2020 20:57:30 -0000 1.2 +++ Makefile 25 Jan 2021 07:24:09 -0000 @@ -4,12 +4,12 @@ COMMENT = client for the I2P anonymous n GH_ACCOUNT = PurpleI2P GH_PROJECT = i2pd -GH_TAGNAME = 2.31.0 +GH_TAGNAME = 2.35.0 CATEGORIES = net HOMEPAGE = https://i2pd.website -MAINTAINER = Mikal Villa <mik...@mikalv.net> +MAINTAINER = Dimitri Karamazov <deserter...@danwin1210.me> # BSD PERMIT_PACKAGE = Yes @@ -28,15 +28,14 @@ USE_GMAKE = Yes WRKSRC = ${WRKDIST}/build post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/i2pd/certificates/family - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/i2pd/certificates/reseed - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/i2pd/certificates/router - ${INSTALL_DATA} ${WRKDIST}/contrib/certificates/family/* \ - ${PREFIX}/share/examples/i2pd/certificates/family - ${INSTALL_DATA} ${WRKDIST}/contrib/certificates/reseed/* \ - ${PREFIX}/share/examples/i2pd/certificates/reseed - ${INSTALL_DATA} ${WRKDIST}/contrib/certificates/router/* \ - ${PREFIX}/share/examples/i2pd/certificates/router + ${INSTALL_DATA_DIR} ${PREFIX}/include/i2pd + ${INSTALL_DATA} ${WRKDIST}/libi2pd{,_client}/*.h \ + ${PREFIX}/include/i2pd +.for dir in family reseed router + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/i2pd/certificates/${dir} + ${INSTALL_DATA} ${WRKDIST}/contrib/certificates/${dir}/* \ + ${PREFIX}/share/examples/i2pd/certificates/${dir} +.endfor ${INSTALL_DATA} ${WRKDIST}/contrib/i2pd.conf \ ${PREFIX}/share/examples/i2pd/i2pd.conf ${INSTALL_DATA} ${WRKDIST}/contrib/tunnels.conf \ @@ -44,6 +43,6 @@ post-install: do-test: cd ${WRKDIST}/tests && ${MAKE_PROGRAM} CXX="${CXX}" \ - INCFLAGS="-L${LOCALBASE}/lib -I${LOCALBASE}/include" + INCFLAGS="-L${LOCALBASE}/lib -I${LOCALBASE}/include ${CFLAGS}" .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/i2pd/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 28 May 2020 20:57:30 -0000 1.2 +++ distinfo 25 Jan 2021 07:24:09 -0000 @@ -1,2 +1,2 @@ -SHA256 (i2pd-2.31.0.tar.gz) = fjerz0np9Z72k5Bp9NdPxr8psJ3uwRG9NWECH8E0lSg= -SIZE (i2pd-2.31.0.tar.gz) = 1092238 +SHA256 (i2pd-2.35.0.tar.gz) = 0EH9TnqIrBaOdvZv2rQBdK0JPNwTRRzb0N0SFuVYH4o= +SIZE (i2pd-2.35.0.tar.gz) = 1105837 Index: patches/patch-build_CMakeLists_txt =================================================================== RCS file: patches/patch-build_CMakeLists_txt diff -N patches/patch-build_CMakeLists_txt --- patches/patch-build_CMakeLists_txt 28 May 2020 20:57:30 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,43 +0,0 @@ -$OpenBSD: patch-build_CMakeLists_txt,v 1.2 2020/05/28 20:57:30 solene Exp $ - -Index: build/CMakeLists.txt ---- build/CMakeLists.txt.orig -+++ build/CMakeLists.txt -@@ -456,7 +456,7 @@ if (WITH_BINARY) - target_link_libraries(libi2pd ${Boost_LIBRARIES} ${ZLIB_LIBRARY}) - target_link_libraries( "${PROJECT_NAME}" libi2pd libi2pdclient ${DL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_EXTRA} ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES}) - -- install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime) -+ install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} COMPONENT Runtime) - set (APPS "\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}") - set (DIRS "${Boost_LIBRARY_DIR};${OPENSSL_INCLUDE_DIR}/../bin;${ZLIB_INCLUDE_DIR}/../bin;/mingw32/bin") - if (MSVC) -@@ -470,7 +470,7 @@ if (WITH_BINARY) - endif () - - install(FILES ../LICENSE -- DESTINATION . -+ DESTINATION share/doc/i2pd - COMPONENT Runtime - ) - # Take a copy on Appveyor -@@ -481,8 +481,8 @@ install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICEN - OPTIONAL # for local builds only! - ) - --file(GLOB_RECURSE I2PD_SOURCES "../libi2pd/*.cpp" "../libi2pd_client/*.cpp" "../daemon/*.cpp" "../build" "../Win32" "../Makefile*") --install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source) -+file(GLOB_RECURSE I2PD_SOURCES "../*.cpp" "../build") -+install(FILES ${I2PD_SOURCES} DESTINATION include/i2pd/ COMPONENT Source) - # install(DIRECTORY ../ DESTINATION src/ - # # OPTIONAL - # COMPONENT Source FILES_MATCHING -@@ -491,7 +491,7 @@ install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONE - # ) - - file(GLOB I2PD_HEADERS "../libi2pd/*.h" "../libi2pd_client/*.h" "../daemon/*.h") --install(FILES ${I2PD_HEADERS} DESTINATION src/ COMPONENT Headers) -+install(FILES ${I2PD_HEADERS} DESTINATION include/i2pd/ COMPONENT Headers) - # install(DIRECTORY ../ DESTINATION src/ - # # OPTIONAL - # COMPONENT Headers FILES_MATCHING Index: patches/patch-libi2pd_Crypto_cpp =================================================================== RCS file: patches/patch-libi2pd_Crypto_cpp diff -N patches/patch-libi2pd_Crypto_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libi2pd_Crypto_cpp 25 Jan 2021 07:24:09 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ +--- 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__ Index: patches/patch-tests_Makefile =================================================================== RCS file: /cvs/ports/net/i2pd/patches/patch-tests_Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-tests_Makefile --- patches/patch-tests_Makefile 28 May 2020 20:57:30 -0000 1.2 +++ patches/patch-tests_Makefile 25 Jan 2021 07:24:09 -0000 @@ -1,8 +1,11 @@ -$OpenBSD: patch-tests_Makefile,v 1.2 2020/05/28 20:57:30 solene Exp $ - -Index: tests/Makefile ---- tests/Makefile.orig -+++ tests/Makefile +--- tests/Makefile.orig Mon Nov 30 23:20:15 2020 ++++ tests/Makefile Sun Jan 24 22:43:16 2021 +@@ -1,4 +1,4 @@ +-CXXFLAGS += -Wall -Wextra -pedantic -O0 -g -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1 -I../libi2pd/ -pthread -Wl,--unresolved-symbols=ignore-in-object-files ++CXXFLAGS += -Wall -Wextra -pedantic -g -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1 -I../libi2pd/ -pthread -Wl,--unresolved-symbols=ignore-in-object-files + + TESTS = test-gost test-gost-sig test-base-64 test-x25519 test-aeadchacha20poly1305 test-blinding test-elligator + @@ -13,8 +13,8 @@ test-base-%: ../libi2pd/Base.cpp test-base-%.cpp test-gost: ../libi2pd/Gost.cpp ../libi2pd/I2PEndian.cpp test-gost.cpp $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/i2pd/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 28 May 2020 20:57:30 -0000 1.2 +++ pkg/PLIST 25 Jan 2021 07:24:09 -0000 @@ -2,176 +2,73 @@ @newgroup _i2pd:838 @newuser _i2pd:838:838:daemon:i2pd account:${LOCALSTATEDIR}/lib/i2pd:/sbin/nologin @rcscript ${RCDIR}/i2pd +@bin bin/i2pd include/i2pd/ -include/i2pd/AddressBook.cpp include/i2pd/AddressBook.h -include/i2pd/BOB.cpp include/i2pd/BOB.h -include/i2pd/Base.cpp include/i2pd/Base.h -include/i2pd/Blinding.cpp include/i2pd/Blinding.h -include/i2pd/BloomFilter.cpp include/i2pd/BloomFilter.h -include/i2pd/CPU.cpp include/i2pd/CPU.h -include/i2pd/ChaCha20.cpp include/i2pd/ChaCha20.h -include/i2pd/ClientContext.cpp include/i2pd/ClientContext.h -include/i2pd/ClientTunnelPane.cpp -include/i2pd/Config.cpp include/i2pd/Config.h -include/i2pd/Crypto.cpp include/i2pd/Crypto.h -include/i2pd/CryptoKey.cpp include/i2pd/CryptoKey.h -include/i2pd/CryptoWorker.h -include/i2pd/Daemon.cpp -include/i2pd/Daemon.h -include/i2pd/DaemonAndroid.cpp -include/i2pd/DaemonQT.cpp -include/i2pd/DaemonWin32.cpp -include/i2pd/Datagram.cpp include/i2pd/Datagram.h -include/i2pd/DelayedSaveManager.cpp -include/i2pd/DelayedSaveManagerImpl.cpp -include/i2pd/Destination.cpp include/i2pd/Destination.h -include/i2pd/ECIESX25519AEADRatchetSession.cpp include/i2pd/ECIESX25519AEADRatchetSession.h -include/i2pd/Ed25519.cpp include/i2pd/Ed25519.h -include/i2pd/Elligator.cpp include/i2pd/Elligator.h -include/i2pd/FS.cpp include/i2pd/FS.h -include/i2pd/Family.cpp include/i2pd/Family.h -include/i2pd/Garlic.cpp include/i2pd/Garlic.h -include/i2pd/Gost.cpp include/i2pd/Gost.h -include/i2pd/Gzip.cpp include/i2pd/Gzip.h -include/i2pd/HTTP.cpp include/i2pd/HTTP.h -include/i2pd/HTTPProxy.cpp include/i2pd/HTTPProxy.h -include/i2pd/HTTPServer.cpp -include/i2pd/HTTPServer.h -include/i2pd/I2CP.cpp include/i2pd/I2CP.h -include/i2pd/I2NPProtocol.cpp include/i2pd/I2NPProtocol.h -include/i2pd/I2PControl.cpp -include/i2pd/I2PControl.h -include/i2pd/I2PEndian.cpp include/i2pd/I2PEndian.h -include/i2pd/I2PService.cpp include/i2pd/I2PService.h -include/i2pd/I2PTunnel.cpp include/i2pd/I2PTunnel.h -include/i2pd/Identity.cpp include/i2pd/Identity.h -include/i2pd/LeaseSet.cpp include/i2pd/LeaseSet.h include/i2pd/LittleBigEndian.h -include/i2pd/Log.cpp include/i2pd/Log.h -include/i2pd/MainWindowItems.cpp -include/i2pd/MatchedDestination.cpp include/i2pd/MatchedDestination.h -include/i2pd/NTCP2.cpp include/i2pd/NTCP2.h -include/i2pd/NTCPSession.cpp -include/i2pd/NTCPSession.h -include/i2pd/NetDb.cpp -include/i2pd/NetDbRequests.cpp include/i2pd/NetDbRequests.h -include/i2pd/Poly1305.cpp include/i2pd/Poly1305.h -include/i2pd/Profiling.cpp include/i2pd/Profiling.h include/i2pd/Queue.h -include/i2pd/Reseed.cpp include/i2pd/Reseed.h -include/i2pd/RouterContext.cpp include/i2pd/RouterContext.h -include/i2pd/RouterInfo.cpp include/i2pd/RouterInfo.h -include/i2pd/SAM.cpp include/i2pd/SAM.h -include/i2pd/SOCKS.cpp include/i2pd/SOCKS.h -include/i2pd/SSU.cpp include/i2pd/SSU.h -include/i2pd/SSUData.cpp include/i2pd/SSUData.h -include/i2pd/SSUSession.cpp include/i2pd/SSUSession.h -include/i2pd/Saver.cpp -include/i2pd/SaverImpl.cpp -include/i2pd/ServerTunnelPane.cpp -include/i2pd/Signature.cpp include/i2pd/Signature.h -include/i2pd/SignatureTypeComboboxFactory.cpp include/i2pd/Siphash.h -include/i2pd/Streaming.cpp include/i2pd/Streaming.h include/i2pd/Tag.h -include/i2pd/Timestamp.cpp include/i2pd/Timestamp.h -include/i2pd/TransitTunnel.cpp include/i2pd/TransitTunnel.h include/i2pd/TransportSession.h -include/i2pd/Transports.cpp include/i2pd/Transports.h -include/i2pd/Tunnel.cpp include/i2pd/Tunnel.h include/i2pd/TunnelBase.h -include/i2pd/TunnelConfig.cpp include/i2pd/TunnelConfig.h -include/i2pd/TunnelEndpoint.cpp include/i2pd/TunnelEndpoint.h -include/i2pd/TunnelGateway.cpp include/i2pd/TunnelGateway.h -include/i2pd/TunnelPane.cpp -include/i2pd/TunnelPool.cpp include/i2pd/TunnelPool.h -include/i2pd/UPnP.cpp -include/i2pd/UPnP.h -include/i2pd/UnixDaemon.cpp -include/i2pd/Win32App.cpp -include/i2pd/Win32Service.cpp -include/i2pd/api.cpp include/i2pd/api.h -include/i2pd/i2pd.cpp -include/i2pd/i2pd_android.cpp -include/i2pd/logviewermanager.cpp -include/i2pd/mainwindow.cpp -include/i2pd/pagewithbackbutton.cpp -include/i2pd/test-aeadchacha20poly1305.cpp -include/i2pd/test-base-64.cpp -include/i2pd/test-blinding.cpp -include/i2pd/test-elligator.cpp -include/i2pd/test-gost-sig.cpp -include/i2pd/test-gost.cpp -include/i2pd/test-http-merge_chunked.cpp -include/i2pd/test-http-req.cpp -include/i2pd/test-http-res.cpp -include/i2pd/test-http-url.cpp -include/i2pd/test-http-url_decode.cpp -include/i2pd/test-x25519.cpp -include/i2pd/textbrowsertweaked1.cpp -include/i2pd/util.cpp include/i2pd/util.h include/i2pd/version.h -include/i2pd/widgetlock.cpp -include/i2pd/widgetlockregistry.cpp @static-lib lib/libi2pd.a @static-lib lib/libi2pdclient.a -@bin sbin/i2pd @owner _i2pd @group _i2pd @sample ${SYSCONFDIR}/i2pd/ @@ -182,8 +79,6 @@ include/i2pd/widgetlockregistry.cpp @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/router/ @owner @group -share/doc/i2pd/ -share/doc/i2pd/LICENSE share/doc/pkg-readmes/${PKGSTEM} share/examples/i2pd/ share/examples/i2pd/certificates/ @@ -224,12 +119,6 @@ share/examples/i2pd/certificates/reseed/ @sample ${LOCALSTATEDIR}/lib/ @owner @group -share/examples/i2pd/certificates/reseed/bugme_at_mail.i2p.crt -@owner _i2pd -@group _i2pd -@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/bugme_at_mail.i2p.crt -@owner -@group share/examples/i2pd/certificates/reseed/creativecowpat_at_mail.i2p.crt @owner _i2pd @group _i2pd @@ -242,6 +131,12 @@ share/examples/i2pd/certificates/reseed/ @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/echelon_at_mail.i2p.crt @owner @group +share/examples/i2pd/certificates/reseed/hankhill19580_at_gmail.com.crt +@owner _i2pd +@group _i2pd +@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/hankhill19580_at_gmail.com.crt +@owner +@group share/examples/i2pd/certificates/reseed/hottuna_at_mail.i2p.crt @owner _i2pd @group _i2pd @@ -260,16 +155,16 @@ share/examples/i2pd/certificates/reseed/ @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/lazygravy_at_mail.i2p.crt @owner @group -share/examples/i2pd/certificates/reseed/meeh_at_mail.i2p.crt +share/examples/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt @owner _i2pd @group _i2pd -@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/meeh_at_mail.i2p.crt +@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt @owner @group -share/examples/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt +share/examples/i2pd/certificates/reseed/reseed_at_diva.exchange.crt @owner _i2pd @group _i2pd -@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt +@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/reseed_at_diva.exchange.crt @owner @group share/examples/i2pd/certificates/router/ Index: pkg/i2pd.rc =================================================================== RCS file: /cvs/ports/net/i2pd/pkg/i2pd.rc,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 i2pd.rc --- pkg/i2pd.rc 16 Jun 2019 22:13:55 -0000 1.1.1.1 +++ pkg/i2pd.rc 25 Jan 2021 07:24:09 -0000 @@ -2,7 +2,7 @@ # # $OpenBSD: i2pd.rc,v 1.1.1.1 2019/06/16 22:13:55 sthen Exp $ -daemon="${TRUEPREFIX}/sbin/i2pd --daemon" +daemon="${TRUEPREFIX}/bin/i2pd --daemon" daemon_user="_i2pd" daemon_flags="--service --datadir=${LOCALSTATEDIR}/lib/i2pd --conf=${SYSCONFDIR}/i2pd/i2pd.conf --tunconf=${SYSCONFDIR}/i2pd/tunnels.conf --tunnelsdir=${SYSCONFDIR}/i2pd/tunnels.d"
