Re: UPDATE: i2pd 2.26.0 -> 2.30.0
On 2020-04-22 21:23, Stuart Henderson wrote:
> On 2020/04/22 20:52, satmeir wrote:
>> On 2020-04-21 16:08, clematis wrote:
>>> On Thu, Apr 16, 2020 at 06:57:52PM +0200, clematis wrote:
>>>> - *but* it won't run out of the box. (2.26.0 was good to go). Got
>>>> straight a /var/lib/i2pd/i2pd.core which I haven't looked at yet. I
>>>> might be able to have another look at this and re-do the process
>>>> tomorrow.
>>>>
>>>> But you might want to double check this in the meantime. (removing user,
>>>> group and /var/lib/i2pd each time and clean all)
>>>
>>> Hi Satmeir,
>>> Sorry I didn't have time to look at this sooner. Is that working on
>>> your machine? Still crash on mine as soon as I try to start it (rcctl
>>> start i2pd)
>>>
>>> Loaded symbols for /usr/lib/libc.so.96.0
>>> Reading symbols from /usr/libexec/ld.so...Error while reading shared
>>> library symbols:
>>> Dwarf Error: wrong version in compilation unit header (is 4, should be
>>> 2) [in module /usr/libexec/ld.so]
>>> #0 BN_num_bits (a=0x696e97f6f80) at
>>> /usr/src/lib/libcrypto/bn/bn_lib.c:182
>>> 182 return ((i * BN_BITS2) + BN_num_bits_word(a->d[i]));
>>>
>>>
>>> For the record: -- Found OpenSSL: /usr/lib/libcrypto.so.46.1 (found version
>>> "2.0.0")
>>>
>>> Cheers,
>>>
>> I think I fixed the issues by recreating and manually editing the
>> pkg/PLIST. I've also added the "if needed", good point. I've attached
>> the latest diff.
>>
>> Please check that the pkg/PLIST is in the right format.
>>
>> --
>> satmeir
>> use pgp
>> 92E1 AF2A D62E 7B46 00EE DE82 C3C3 BBA2 91DD DB9F
>
>> 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 - 1.1.1.1
>> +++ Makefile 22 Apr 2020 18:48:18 -
>> @@ -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.31.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 - 1.1.1.1
>> +++ distinfo 22 Apr 2020 18:48:18 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (i2pd-2.26.0.tar.gz) = KuGJeMh5a7a0W8jP5OHyU3fgz8n8+fRgVLCdwzhO72M=
>> -SIZE (i2pd-2.26.0.tar.gz) = 1073024
>> +SHA256 (i2pd-2.31.0.tar.gz) = fjerz0np9Z72k5Bp9NdPxr8psJ3uwRG9NWECH8E0lSg=
>> +SIZE (i2pd-2.31.0.tar.gz) = 1092238
>> 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 -
>> 1.1.1.1
>> +++ patches/patch-build_CMakeLists_txt 22 Apr 2020 18:48:18 -
>> @@ -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)
>> +@@ -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})
>>
>> @@ -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)
>> +@@ -470,7 +470,7 @@ if (WITH_BINARY)
>> endif ()
>>
>> install(FILES ../LICENSE
>> @@ -21,7 +21,7 @@ Index: build/CMakeLists.txt
>> COMPONENT Runtime
>> )
>> # Take a copy on Appveyor
>>
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
On 2020-04-21 16:08, clematis wrote:
> On Thu, Apr 16, 2020 at 06:57:52PM +0200, clematis wrote:
>> - *but* it won't run out of the box. (2.26.0 was good to go). Got
>> straight a /var/lib/i2pd/i2pd.core which I haven't looked at yet. I
>> might be able to have another look at this and re-do the process tomorrow.
>>
>> But you might want to double check this in the meantime. (removing user,
>> group and /var/lib/i2pd each time and clean all)
>
> Hi Satmeir,
> Sorry I didn't have time to look at this sooner. Is that working on
> your machine? Still crash on mine as soon as I try to start it (rcctl
> start i2pd)
>
> Loaded symbols for /usr/lib/libc.so.96.0
> Reading symbols from /usr/libexec/ld.so...Error while reading shared
> library symbols:
> Dwarf Error: wrong version in compilation unit header (is 4, should be
> 2) [in module /usr/libexec/ld.so]
> #0 BN_num_bits (a=0x696e97f6f80) at
> /usr/src/lib/libcrypto/bn/bn_lib.c:182
> 182 return ((i * BN_BITS2) + BN_num_bits_word(a->d[i]));
>
>
> For the record: -- Found OpenSSL: /usr/lib/libcrypto.so.46.1 (found version
> "2.0.0")
>
> Cheers,
>
I think I fixed the issues by recreating and manually editing the
pkg/PLIST. I've also added the "if needed", good point. I've attached
the latest diff.
Please check that the pkg/PLIST is in the right format.
--
satmeir
use pgp
92E1 AF2A D62E 7B46 00EE DE82 C3C3 BBA2 91DD DB9F
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 - 1.1.1.1
+++ Makefile 22 Apr 2020 18:48:18 -
@@ -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.31.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 - 1.1.1.1
+++ distinfo 22 Apr 2020 18:48:18 -
@@ -1,2 +1,2 @@
-SHA256 (i2pd-2.26.0.tar.gz) = KuGJeMh5a7a0W8jP5OHyU3fgz8n8+fRgVLCdwzhO72M=
-SIZE (i2pd-2.26.0.tar.gz) = 1073024
+SHA256 (i2pd-2.31.0.tar.gz) = fjerz0np9Z72k5Bp9NdPxr8psJ3uwRG9NWECH8E0lSg=
+SIZE (i2pd-2.31.0.tar.gz) = 1092238
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 - 1.1.1.1
+++ patches/patch-build_CMakeLists_txt 22 Apr 2020 18:48:18 -
@@ -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)
+@@ -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})
@@ -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)
+@@ -470,7 +470,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
+@@ -481,8 +481,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
+@@ -491,7 +491,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 - 1.1.1.1
+++ patches/patch-tests_Makefile 22 Apr 2020 18:48:18 -
@@ -14,7 +14,7 @@ Index: tests/Makefile
test-x25519: ..
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
On 2020-04-16 13:02, Stuart Henderson wrote:
> On 2020/04/16 12:38, satmeir wrote:
>> On 2020-04-16 12:20, Stuart Henderson wrote:
>>> On 2020/04/16 11:34, satmeir wrote:
>>>> Updated to 2.31.0
>>>> @solene: Tested patch this time on amd64. Please let me know if it works.
>>>
>>> The emailed patch is line-wrapped and does not apply.
>>>
>>> patch: malformed patch at line 233: ${DL_LIB} ${Boost_LIBRARIES}
>>> ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY}
>>>
>>>> What's the OpenBSD convention about including AESNI Support for machines
>>>> that support it?
>>>
>>> That can be enabled as long as
>>>
>>> 1) detection of cpu features is at runtime not build time (so it doesn't
>>> break when running on x86 machines that do not have AESNI even if built on a
>>> machine with AESNI)
>>>
>>> and
>>>
>>> 2) it does not break non-x86 architectures
>>>
>>>
>>
>> Ah, now I get why the patch isn't applying.
>>
>> I've attached it as a file.
>
> Thanks, that applies now.
>
>> AESNI: Do any examples from the ports tree come to mind that I could
>> check out?
>
> The only one I can think of right now is net/strongswan which builds
> AESNI as a separate plugin on x86. All you'll see from the port
> is how to cope with software that creates additional files on certain
> archs (which won't be necessary unless it's creating additional files
> to be installed). Basically just check that it's doing detection via\
> cpuid at runtime rather than making decisions based on the build cpu
> environment.
>
I think I'll hold off on implementing AESNI for now, as I don't have the
skills or time currently to do it securely. Maybe I'll get it in in the
future, but I think we should proceed with the latest patch.
--
satmeir
use pgp
92E1 AF2A D62E 7B46 00EE DE82 C3C3 BBA2 91DD DB9F
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
On 2020-04-16 12:20, Stuart Henderson wrote:
> On 2020/04/16 11:34, satmeir wrote:
>> Updated to 2.31.0
>> @solene: Tested patch this time on amd64. Please let me know if it works.
>
> The emailed patch is line-wrapped and does not apply.
>
> patch: malformed patch at line 233: ${DL_LIB} ${Boost_LIBRARIES}
> ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY}
>
>> What's the OpenBSD convention about including AESNI Support for machines
>> that support it?
>
> That can be enabled as long as
>
> 1) detection of cpu features is at runtime not build time (so it doesn't
> break when running on x86 machines that do not have AESNI even if built on a
> machine with AESNI)
>
> and
>
> 2) it does not break non-x86 architectures
>
>
Ah, now I get why the patch isn't applying.
I've attached it as a file.
AESNI: Do any examples from the ports tree come to mind that I could
check out?
--
satmeir
use pgp
92E1 AF2A D62E 7B46 00EE DE82 C3C3 BBA2 91DD DB9F
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 - 1.1.1.1
+++ Makefile 16 Apr 2020 09:16:40 -
@@ -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.31.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 - 1.1.1.1
+++ distinfo 16 Apr 2020 09:16:40 -
@@ -1,2 +1,2 @@
-SHA256 (i2pd-2.26.0.tar.gz) = KuGJeMh5a7a0W8jP5OHyU3fgz8n8+fRgVLCdwzhO72M=
-SIZE (i2pd-2.26.0.tar.gz) = 1073024
+SHA256 (i2pd-2.31.0.tar.gz) = fjerz0np9Z72k5Bp9NdPxr8psJ3uwRG9NWECH8E0lSg=
+SIZE (i2pd-2.31.0.tar.gz) = 1092238
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 - 1.1.1.1
+++ patches/patch-build_CMakeLists_txt 16 Apr 2020 09:16:40 -
@@ -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)
+@@ -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})
@@ -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)
+@@ -470,7 +470,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
+@@ -481,8 +481,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
+@@ -491,7 +491,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 - 1.1.1.1
+++ patches/patch-tests_Makefile 16 Apr 2020 09:16:40 -
@@ -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-aeadchacha20poly130
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
On 2020-04-14 23:12, satmeir wrote:
> On 2020-04-14 10:27, clematis wrote:
>> On Sun, Apr 12, 2020 at 10:24:14AM +0200, satmeir wrote:
>>> On 2020-04-06 19:17, satmeir wrote:
>>>> 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?
>>>>>
>>>>
>>>> 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?
>>>>
>>>>
>>> Hi, just bumping this update. I'd love to get into the ports tree before
>>> release 6.7
>>
>> Hello,
>>
>> I was gonna start looking at this but realized 2.31.0 is out with
>> judging by the release note quite some noticeable changes.
>> Are you going to have a look at it and push a new diff?
>>
>> Also adding Mikal to the thread as current MAINTAINER.
>>
>> Thanks,
>>
> Yes, will do
>
Index: Makefile
===
RCS file: /cvs/ports/net/i2pd/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile16 Jun 2019 22:13:55 - 1.1.1.1
+++ Makefile16 Apr 2020 09:16:40 -
@@ -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.31.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
--- distinfo16 Jun 2019 22:13:55 - 1.1.1.1
+++ distinfo16 Apr 2020 09:16:40 -
@@ -1,2 +1,2 @@
-SHA256 (i2pd-2.26.0.tar.gz) = KuGJeMh5a7a0W8jP5OHyU3fgz8n8+fRgVLCdwzhO72M=
-SIZE (i2pd-2.26.0.tar.gz) = 1073024
+SHA256 (i2pd-2.31.0.tar.gz) = fjerz0np9Z72k5Bp9NdPxr8psJ3uwRG9NWECH8E0lSg=
+SIZE (i2pd-2.31.0.tar.gz) = 1092238
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 - 1.1.1.1
+++ patches/patch-build_CMakeLists_txt 16 Apr 2020 09:16:40 -
@@ -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)
+@@ -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})
@@ -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)
+@@ -470,7 +470,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
+@@ -481,8 +481,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
+@@ -491,7 +491,7 @@ install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONE
# )
file(GLOB I2PD_HEADERS "../libi2pd/*.h" "../libi2pd_client/*.h"
"../daemon/*.h")
Index: patches/patch-tests_Makefile
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
On 2020-04-14 10:27, clematis wrote: > On Sun, Apr 12, 2020 at 10:24:14AM +0200, satmeir wrote: >> On 2020-04-06 19:17, satmeir wrote: >>> 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? >>>> >>> >>> 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? >>> >>> >> Hi, just bumping this update. I'd love to get into the ports tree before >> release 6.7 > > Hello, > > I was gonna start looking at this but realized 2.31.0 is out with > judging by the release note quite some noticeable changes. > Are you going to have a look at it and push a new diff? > > Also adding Mikal to the thread as current MAINTAINER. > > Thanks, > Yes, will do -- satmeir use pgp 92E1 AF2A D62E 7B46 00EE DE82 C3C3 BBA2 91DD DB9F
UPDATE: i2pd 2.26.0 -> 2.30.0
On 2020-04-06 19:17, satmeir wrote:
> 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 - 1.1.1.1
>> +++ Makefile 3 Apr 2020 10:34:17 -
>> @@ -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 - 1.1.1.1
>> +++ distinfo 3 Apr 2020 10:34:17 -
>> @@ -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 -
>> 1.1.1.1
>> +++ patches/patch-build_CMakeLists_txt 3 Apr 2020 10:34:17 -
>> @@ -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 - 1.1.1.1
>> +++ patches/patch-tests_Makefile 3 Apr 2020 10:34:17 -
>> @@ -14,18 +14,3 @@ Index: tests/Makefile
>>
>> test-x25519: ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndian.cpp
>> ../libi2pd/Log.cpp ../libi2pd/Crypto.cpp test-x25519.cpp
>&g
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
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 - 1.1.1.1
> +++ Makefile 3 Apr 2020 10:34:17 -
> @@ -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 - 1.1.1.1
> +++ distinfo 3 Apr 2020 10:34:17 -
> @@ -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_txt16 Jun 2019 22:13:55 -
> 1.1.1.1
> +++ patches/patch-build_CMakeLists_txt3 Apr 2020 10:34:17 -
> @@ -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 - 1.1.1.1
> +++ patches/patch-tests_Makefile 3 Apr 2020 10:34:17 -
> @@ -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:
UPDATE: i2pd 2.26.0 -> 2.30.0
l.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
--
satmeir
use pgp
92E1 AF2A D62E 7B46 00EE DE82 C3C3 BBA2 91DD DB9F
