On 2020-04-03 12:43, satmeir wrote: > Hello ports@, > > This is an update to net/i2pd which brings it to the newest version 2.30.0. > > This is my first port update, so all feedback is appreciated. > > I couldn't figure out why i2pd kept on installing into /usr/local/bin > instead of /usr/local/sbin, as specified in i2pd.rc. I manually changed > /etc/rc.d/i2pd for testing purposes. > > Comments? OK? > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/i2pd/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- Makefile 16 Jun 2019 22:13:55 -0000 1.1.1.1 > +++ Makefile 3 Apr 2020 10:34:17 -0000 > @@ -4,7 +4,7 @@ COMMENT = client for the I2P anonymous n > > GH_ACCOUNT = PurpleI2P > GH_PROJECT = i2pd > -GH_TAGNAME = 2.26.0 > +GH_TAGNAME = 2.30.0 > > CATEGORIES = net > HOMEPAGE = https://i2pd.website > Index: distinfo > =================================================================== > RCS file: /cvs/ports/net/i2pd/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 distinfo > --- distinfo 16 Jun 2019 22:13:55 -0000 1.1.1.1 > +++ distinfo 3 Apr 2020 10:34:17 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (i2pd-2.26.0.tar.gz) = KuGJeMh5a7a0W8jP5OHyU3fgz8n8+fRgVLCdwzhO72M= > -SIZE (i2pd-2.26.0.tar.gz) = 1073024 > +SHA256 (i2pd-2.30.0.tar.gz) = JZFcvTOp9TyJ3ff71o/Mxf/ImrQNREXMyBPadPrhVPI= > +SIZE (i2pd-2.30.0.tar.gz) = 1087411 > cvs server: Diffing patches > Index: patches/patch-build_CMakeLists_txt > =================================================================== > RCS file: /cvs/ports/net/i2pd/patches/patch-build_CMakeLists_txt,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 patch-build_CMakeLists_txt > --- patches/patch-build_CMakeLists_txt 16 Jun 2019 22:13:55 -0000 > 1.1.1.1 > +++ patches/patch-build_CMakeLists_txt 3 Apr 2020 10:34:17 -0000 > @@ -3,7 +3,7 @@ $OpenBSD: patch-build_CMakeLists_txt,v 1 > Index: build/CMakeLists.txt > --- build/CMakeLists.txt.orig > +++ build/CMakeLists.txt > -@@ -473,7 +473,7 @@ if (WITH_BINARY) > +@@ -475,7 +475,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}) > > @@ -12,7 +12,7 @@ Index: build/CMakeLists.txt > 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) > -@@ -487,7 +487,7 @@ if (WITH_BINARY) > +@@ -489,7 +489,7 @@ if (WITH_BINARY) > endif () > > install(FILES ../LICENSE > @@ -21,7 +21,7 @@ Index: build/CMakeLists.txt > COMPONENT Runtime > ) > # Take a copy on Appveyor > -@@ -498,8 +498,8 @@ install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICEN > +@@ -500,8 +500,8 @@ install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICEN > OPTIONAL # for local builds only! > ) > > @@ -32,7 +32,7 @@ Index: build/CMakeLists.txt > # install(DIRECTORY ../ DESTINATION src/ > # # OPTIONAL > # COMPONENT Source FILES_MATCHING > -@@ -508,7 +508,7 @@ install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONE > +@@ -510,7 +510,7 @@ install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONE > # ) > > file(GLOB I2PD_HEADERS "../libi2pd/*.h" "../libi2pd_client/*.h" > "../daemon/*.h") > Index: patches/patch-tests_Makefile > =================================================================== > RCS file: /cvs/ports/net/i2pd/patches/patch-tests_Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 patch-tests_Makefile > --- patches/patch-tests_Makefile 16 Jun 2019 22:13:55 -0000 1.1.1.1 > +++ patches/patch-tests_Makefile 3 Apr 2020 10:34:17 -0000 > @@ -14,18 +14,3 @@ Index: tests/Makefile > > test-x25519: ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndian.cpp > ../libi2pd/Log.cpp ../libi2pd/Crypto.cpp test-x25519.cpp > $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto > -lssl -lboost_system > -@@ -22,11 +22,11 @@ test-x25519: ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndi > - test-aeadchacha20poly1305: ../libi2pd/Crypto.cpp > ../libi2pd/ChaCha20.cpp ../libi2pd/Poly1305.cpp > test-aeadchacha20poly1305.cpp > - $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto > -lssl -lboost_system > - > --test-blinding: ../libi2pd/Crypto.cpp ../libi2pd/Blinding.cpp > ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndian.cpp ../libi2pd/Log.cpp > ../libi2pd/util.cpp ../libi2pd/Identity.cpp ../libi2pd/Signature.cpp > ../libi2pd/Timestamp.cpp test-blinding.cpp > -- $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto > -lssl -lboost_system > -+test-blinding: ../libi2pd/Crypto.cpp ../libi2pd/Config.cpp > ../libi2pd/Blinding.cpp ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndian.cpp > ../libi2pd/Log.cpp ../libi2pd/util.cpp ../libi2pd/Identity.cpp > ../libi2pd/Signature.cpp ../libi2pd/Timestamp.cpp test-blinding.cpp > -+ $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto > -lssl -lboost_system -lboost_program_options-mt > - > - run: $(TESTS) > -- @for TEST in $(TESTS); do ./$$TEST ; done > -+ @for TEST in $(TESTS); do echo -n "$$TEST: "; ./$$TEST && echo OK; done > - > - clean: > - rm -f $(TESTS) > cvs server: Diffing pkg > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/net/i2pd/pkg/PLIST,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 PLIST > --- pkg/PLIST 16 Jun 2019 22:13:55 -0000 1.1.1.1 > +++ pkg/PLIST 3 Apr 2020 10:34:17 -0000 > @@ -2,173 +2,10 @@ > @newgroup _i2pd:838 > @newuser _i2pd:838:838:daemon:i2pd > account:${LOCALSTATEDIR}/lib/i2pd:/sbin/nologin > @rcscript ${RCDIR}/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/Destination.cpp > -include/i2pd/Destination.h > -include/i2pd/Ed25519.cpp > -include/i2pd/Ed25519.h > -include/i2pd/Event.cpp > -include/i2pd/Event.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/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/WebSocks.cpp > -include/i2pd/WebSocks.h > -include/i2pd/Websocket.cpp > -include/i2pd/Websocket.h > -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-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 > +LICENSE > +@bin sbin/i2pd > lib/libi2pd.a > lib/libi2pdclient.a > -@bin sbin/i2pd > @owner _i2pd > @group _i2pd > @sample ${SYSCONFDIR}/i2pd/ > @@ -179,8 +16,6 @@ lib/libi2pdclient.a > @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/router/ > @owner > @group > -share/doc/i2pd/ > -share/doc/i2pd/LICENSE > share/examples/i2pd/ > share/examples/i2pd/certificates/ > share/examples/i2pd/certificates/family/ > @@ -216,12 +51,6 @@ share/examples/i2pd/certificates/family/ > share/examples/i2pd/certificates/reseed/ > @owner > @group > -share/examples/i2pd/certificates/reseed/backup_at_mail.i2p.crt > -@owner _i2pd > -@group _i2pd > -@sample > ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/backup_at_mail.i2p.crt > -@owner > -@group > share/examples/i2pd/certificates/reseed/bugme_at_mail.i2p.crt > @owner _i2pd > @group _i2pd > @@ -265,7 +94,6 @@ share/examples/i2pd/certificates/reseed/ > @sample > ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt > @owner > @group > -share/examples/i2pd/certificates/reseed/reseedi2pnetin_at_mail.i2p.crt > share/examples/i2pd/certificates/router/ > share/examples/i2pd/certificates/router/orignal_at_mail.i2p.crt > @owner _i2pd > @@ -283,3 +111,151 @@ share/examples/i2pd/tunnels.conf > @owner _i2pd > @group _i2pd > @sample ${SYSCONFDIR}/i2pd/tunnels.conf > +@owner > +@group > +src/ > +src/AddressBook.cpp > +src/AddressBook.h > +src/BOB.cpp > +src/BOB.h > +src/Base.cpp > +src/Base.h > +src/Blinding.cpp > +src/Blinding.h > +src/BloomFilter.cpp > +src/BloomFilter.h > +src/CPU.cpp > +src/CPU.h > +src/ChaCha20.cpp > +src/ChaCha20.h > +src/ClientContext.cpp > +src/ClientContext.h > +src/Config.cpp > +src/Config.h > +src/Crypto.cpp > +src/Crypto.h > +src/CryptoKey.cpp > +src/CryptoKey.h > +src/CryptoWorker.h > +src/Daemon.cpp > +src/Daemon.h > +src/Datagram.cpp > +src/Datagram.h > +src/Destination.cpp > +src/Destination.h > +src/ECIESX25519AEADRatchetSession.cpp > +src/ECIESX25519AEADRatchetSession.h > +src/Ed25519.cpp > +src/Ed25519.h > +src/Elligator.cpp > +src/Elligator.h > +src/Event.cpp > +src/Event.h > +src/FS.cpp > +src/FS.h > +src/Family.cpp > +src/Family.h > +src/Garlic.cpp > +src/Garlic.h > +src/Gost.cpp > +src/Gost.h > +src/Gzip.cpp > +src/Gzip.h > +src/HTTP.cpp > +src/HTTP.h > +src/HTTPProxy.cpp > +src/HTTPProxy.h > +src/HTTPServer.cpp > +src/HTTPServer.h > +src/I2CP.cpp > +src/I2CP.h > +src/I2NPProtocol.cpp > +src/I2NPProtocol.h > +src/I2PControl.cpp > +src/I2PControl.h > +src/I2PEndian.cpp > +src/I2PEndian.h > +src/I2PService.cpp > +src/I2PService.h > +src/I2PTunnel.cpp > +src/I2PTunnel.h > +src/Identity.cpp > +src/Identity.h > +src/LeaseSet.cpp > +src/LeaseSet.h > +src/LittleBigEndian.h > +src/Log.cpp > +src/Log.h > +src/Makefile > +src/Makefile.bsd > +src/Makefile.homebrew > +src/Makefile.linux > +src/Makefile.mingw > +src/Makefile.osx > +src/Makefile.rej > +src/MatchedDestination.cpp > +src/MatchedDestination.h > +src/NTCP2.cpp > +src/NTCP2.h > +src/NTCPSession.cpp > +src/NTCPSession.h > +src/NetDb.cpp > +src/NetDbRequests.cpp > +src/NetDbRequests.h > +src/Poly1305.cpp > +src/Poly1305.h > +src/Profiling.cpp > +src/Profiling.h > +src/Queue.h > +src/Reseed.cpp > +src/Reseed.h > +src/RouterContext.cpp > +src/RouterContext.h > +src/RouterInfo.cpp > +src/RouterInfo.h > +src/SAM.cpp > +src/SAM.h > +src/SOCKS.cpp > +src/SOCKS.h > +src/SSU.cpp > +src/SSU.h > +src/SSUData.cpp > +src/SSUData.h > +src/SSUSession.cpp > +src/SSUSession.h > +src/Signature.cpp > +src/Signature.h > +src/Siphash.h > +src/Streaming.cpp > +src/Streaming.h > +src/Tag.h > +src/Timestamp.cpp > +src/Timestamp.h > +src/TransitTunnel.cpp > +src/TransitTunnel.h > +src/TransportSession.h > +src/Transports.cpp > +src/Transports.h > +src/Tunnel.cpp > +src/Tunnel.h > +src/TunnelBase.h > +src/TunnelConfig.h > +src/TunnelEndpoint.cpp > +src/TunnelEndpoint.h > +src/TunnelGateway.cpp > +src/TunnelGateway.h > +src/TunnelPool.cpp > +src/TunnelPool.h > +src/UPnP.cpp > +src/UPnP.h > +src/UnixDaemon.cpp > +src/WebSocks.cpp > +src/WebSocks.h > +src/Websocket.cpp > +src/Websocket.h > +src/api.cpp > +src/api.h > +src/i2pd.cpp > +src/util.cpp > +src/util.h > +src/version.h >
New diff more closely based on the old version. Also includes a MESSAGE and README explaining the necessary changes to file descriptor resource limits. Is it a problem that OpenBSD uses /var/lib/i2pd instead of the OpenBSD standard /var/i2pd? How can I best submit this patch so it gets merged in the -current branch? Index: Makefile =================================================================== RCS file: /cvs/ports/net/i2pd/Makefile,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 Makefile --- Makefile 16 Jun 2019 22:13:55 -0000 1.1.1.1 +++ Makefile 6 Apr 2020 17:13:28 -0000 @@ -4,7 +4,7 @@ COMMENT = client for the I2P anonymous n GH_ACCOUNT = PurpleI2P GH_PROJECT = i2pd -GH_TAGNAME = 2.26.0 +GH_TAGNAME = 2.30.0 CATEGORIES = net HOMEPAGE = https://i2pd.website Index: distinfo =================================================================== RCS file: /cvs/ports/net/i2pd/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 distinfo --- distinfo 16 Jun 2019 22:13:55 -0000 1.1.1.1 +++ distinfo 6 Apr 2020 17:13:28 -0000 @@ -1,2 +1,2 @@ -SHA256 (i2pd-2.26.0.tar.gz) = KuGJeMh5a7a0W8jP5OHyU3fgz8n8+fRgVLCdwzhO72M= -SIZE (i2pd-2.26.0.tar.gz) = 1073024 +SHA256 (i2pd-2.30.0.tar.gz) = JZFcvTOp9TyJ3ff71o/Mxf/ImrQNREXMyBPadPrhVPI= +SIZE (i2pd-2.30.0.tar.gz) = 1087411 cvs server: Diffing patches Index: patches/patch-build_CMakeLists_txt =================================================================== RCS file: /cvs/ports/net/i2pd/patches/patch-build_CMakeLists_txt,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 patch-build_CMakeLists_txt --- patches/patch-build_CMakeLists_txt 16 Jun 2019 22:13:55 -0000 1.1.1.1 +++ patches/patch-build_CMakeLists_txt 6 Apr 2020 17:13:28 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-build_CMakeLists_txt,v 1 Index: build/CMakeLists.txt --- build/CMakeLists.txt.orig +++ build/CMakeLists.txt -@@ -473,7 +473,7 @@ if (WITH_BINARY) +@@ -475,7 +475,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}) @@ -12,7 +12,7 @@ Index: build/CMakeLists.txt 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) -@@ -487,7 +487,7 @@ if (WITH_BINARY) +@@ -489,7 +489,7 @@ if (WITH_BINARY) endif () install(FILES ../LICENSE @@ -21,7 +21,7 @@ Index: build/CMakeLists.txt COMPONENT Runtime ) # Take a copy on Appveyor -@@ -498,8 +498,8 @@ install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICEN +@@ -500,8 +500,8 @@ install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICEN OPTIONAL # for local builds only! ) @@ -32,7 +32,7 @@ Index: build/CMakeLists.txt # install(DIRECTORY ../ DESTINATION src/ # # OPTIONAL # COMPONENT Source FILES_MATCHING -@@ -508,7 +508,7 @@ install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONE +@@ -510,7 +510,7 @@ install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONE # ) file(GLOB I2PD_HEADERS "../libi2pd/*.h" "../libi2pd_client/*.h" "../daemon/*.h") Index: patches/patch-tests_Makefile =================================================================== RCS file: /cvs/ports/net/i2pd/patches/patch-tests_Makefile,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 patch-tests_Makefile --- patches/patch-tests_Makefile 16 Jun 2019 22:13:55 -0000 1.1.1.1 +++ patches/patch-tests_Makefile 6 Apr 2020 17:13:28 -0000 @@ -14,7 +14,7 @@ Index: tests/Makefile test-x25519: ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndian.cpp ../libi2pd/Log.cpp ../libi2pd/Crypto.cpp test-x25519.cpp $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system -@@ -22,11 +22,11 @@ test-x25519: ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndi +@@ -22,14 +22,14 @@ test-x25519: ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndi test-aeadchacha20poly1305: ../libi2pd/Crypto.cpp ../libi2pd/ChaCha20.cpp ../libi2pd/Poly1305.cpp test-aeadchacha20poly1305.cpp $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system @@ -22,6 +22,9 @@ Index: tests/Makefile - $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system +test-blinding: ../libi2pd/Crypto.cpp ../libi2pd/Config.cpp ../libi2pd/Blinding.cpp ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndian.cpp ../libi2pd/Log.cpp ../libi2pd/util.cpp ../libi2pd/Identity.cpp ../libi2pd/Signature.cpp ../libi2pd/Timestamp.cpp test-blinding.cpp + $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system -lboost_program_options-mt + + test-elligator: ../libi2pd/Elligator.cpp ../libi2pd/Crypto.cpp test-elligator.cpp + $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system run: $(TESTS) - @for TEST in $(TESTS); do ./$$TEST ; done cvs server: Diffing pkg Index: pkg/MESSAGE =================================================================== RCS file: pkg/MESSAGE diff -N pkg/MESSAGE --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/MESSAGE 6 Apr 2020 17:13:28 -0000 @@ -0,0 +1,17 @@ +By default, the _i2pd user, and so the i2pd process runs in the login(1) +class of "daemon". The default limits on file descriptors are +insufficient to run i2pd; instead you should put the _i2pd user and +process in their own login(1) class with tuned resources. You should +also raise the system-wide maxfiles limit. + +1. Configure i2pd login class in the login.conf(5) file: + + i2pd:\ + :openfiles-cur=8192:\ + :openfiles-max=8192:\ + :tc=daemon: + +2. Adjust kern.maxfiles: + + # sysctl kern.maxfiles=16000 + # echo "kern.maxfiles=16000" >> /etc/sysctl.conf Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/i2pd/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 PLIST --- pkg/PLIST 16 Jun 2019 22:13:55 -0000 1.1.1.1 +++ pkg/PLIST 6 Apr 2020 17:13:28 -0000 @@ -36,8 +36,12 @@ include/i2pd/Datagram.cpp include/i2pd/Datagram.h 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/Event.cpp include/i2pd/Event.h include/i2pd/FS.cpp @@ -152,6 +156,7 @@ 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 @@ -213,13 +218,8 @@ share/examples/i2pd/certificates/family/ @owner _i2pd @group _i2pd @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/family/volatile.crt -share/examples/i2pd/certificates/reseed/ -@owner -@group -share/examples/i2pd/certificates/reseed/backup_at_mail.i2p.crt -@owner _i2pd -@group _i2pd @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/backup_at_mail.i2p.crt +share/examples/i2pd/certificates/reseed/ @owner @group share/examples/i2pd/certificates/reseed/bugme_at_mail.i2p.crt @@ -265,7 +265,6 @@ share/examples/i2pd/certificates/reseed/ @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt @owner @group -share/examples/i2pd/certificates/reseed/reseedi2pnetin_at_mail.i2p.crt share/examples/i2pd/certificates/router/ share/examples/i2pd/certificates/router/orignal_at_mail.i2p.crt @owner _i2pd Index: pkg/README =================================================================== RCS file: pkg/README diff -N pkg/README --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/README 6 Apr 2020 17:13:28 -0000 @@ -0,0 +1,24 @@ ++----------------------------------------------------------------------- +| Running ${PKGSTEM} on OpenBSD ++----------------------------------------------------------------------- + +Resource Limits: File Descriptors +================================= + +By default, the _i2pd user, and so the i2pd process runs in the login(1) +class of "daemon". The default limits on file descriptors are +insufficient to run i2pd; instead you should put the _i2pd user and +process in their own login(1) class with tuned resources. You should +also raise the system-wide maxfiles limit. + +1. Configure i2pd login class in the login.conf(5) file: + + i2pd:\ + :openfiles-cur=8192:\ + :openfiles-max=8192:\ + :tc=daemon: + +2. Adjust kern.maxfiles: + + # sysctl kern.maxfiles=16000 + # echo "kern.maxfiles=16000" >> /etc/sysctl.conf -- satmeir use pgp 92E1 AF2A D62E 7B46 00EE DE82 C3C3 BBA2 91DD DB9F
