Re: UPDATE: i2pd 2.26.0 -> 2.30.0
On Wed, May 27, 2020 at 03:10:39PM +0200, Solene Rapenne wrote: > Le Wed, 27 May 2020 13:19:47 +0100, > Stuart Henderson a écrit : > > > On 2020/05/27 13:58, Solene Rapenne wrote: > > > Le Wed, 27 May 2020 12:33:27 +0100, > > > Stuart Henderson a écrit : > > > > > > > On 2020/05/27 13:21, Solene Rapenne wrote: > > > > > Le Wed, 27 May 2020 11:55:20 +0100, > > > > > Stuart Henderson a écrit : > > > > > > > > > > it only need to read config in /etc/i2pd/ and read/write in > > > > > /var/lib/i2pd/ > > > > > > > > Does it need to rewrite existing files in /var/lib/i2pd/? > > > > > > > > > > I'm not sure to understand what you mean. /var/lib/i2pd/ is where > > > i2pd create files, store cache etc.. so i2pd daemon is pretty > > > active there, but that folder is only created by i2pd package and > > > populated at installation, then i2pd will create more files in it. > > > > The version currently in ports has some files created in there by > > @sample which are owned by _i2pd - the updated plist in the diff > > changes those to being owned by root. > > > > should be fine now, thank you very much for your help Hi, Just some quick feedback to confirm this build/install/run OK on amd64. Done basic testing, tunneling, httproxy and it is working. Thanks, -- clematis (0xA2C87EDB507B4C53)
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
Le Wed, 27 May 2020 13:19:47 +0100,
Stuart Henderson a écrit :
> On 2020/05/27 13:58, Solene Rapenne wrote:
> > Le Wed, 27 May 2020 12:33:27 +0100,
> > Stuart Henderson a écrit :
> >
> > > On 2020/05/27 13:21, Solene Rapenne wrote:
> > > > Le Wed, 27 May 2020 11:55:20 +0100,
> > > > Stuart Henderson a écrit :
> > > >
> > > > it only need to read config in /etc/i2pd/ and read/write in
> > > > /var/lib/i2pd/
> > >
> > > Does it need to rewrite existing files in /var/lib/i2pd/?
> > >
> >
> > I'm not sure to understand what you mean. /var/lib/i2pd/ is where
> > i2pd create files, store cache etc.. so i2pd daemon is pretty
> > active there, but that folder is only created by i2pd package and
> > populated at installation, then i2pd will create more files in it.
>
> The version currently in ports has some files created in there by
> @sample which are owned by _i2pd - the updated plist in the diff
> changes those to being owned by root.
>
should be fine now, thank you very much for your help
files under /var/lib/i2pd and /etc/i2pd are owned by _i2pd:_i2pd and
files under /usr/local/ are all owned by root.
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
+++ Makefile27 May 2020 13:06:42 -
@@ -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
+++ distinfo27 May 2020 13:06:42 -
@@ -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 27 May 2020 13:06:42 -
@@ -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_Makefile16 Jun 2019 22:13:55 - 1.1.1.1
+++ patches/patch-tests_Makefile27 May 2020 13:06:42 -
@@ -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:
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
On 2020/05/27 13:58, Solene Rapenne wrote: > Le Wed, 27 May 2020 12:33:27 +0100, > Stuart Henderson a écrit : > > > On 2020/05/27 13:21, Solene Rapenne wrote: > > > Le Wed, 27 May 2020 11:55:20 +0100, > > > Stuart Henderson a écrit : > > > > > > it only need to read config in /etc/i2pd/ and read/write in > > > /var/lib/i2pd/ > > > > Does it need to rewrite existing files in /var/lib/i2pd/? > > > > I'm not sure to understand what you mean. /var/lib/i2pd/ is where i2pd > create files, store cache etc.. so i2pd daemon is pretty active there, > but that folder is only created by i2pd package and populated at > installation, then i2pd will create more files in it. The version currently in ports has some files created in there by @sample which are owned by _i2pd - the updated plist in the diff changes those to being owned by root.
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
Le Wed, 27 May 2020 12:33:27 +0100, Stuart Henderson a écrit : > On 2020/05/27 13:21, Solene Rapenne wrote: > > Le Wed, 27 May 2020 11:55:20 +0100, > > Stuart Henderson a écrit : > > > > it only need to read config in /etc/i2pd/ and read/write in > > /var/lib/i2pd/ > > Does it need to rewrite existing files in /var/lib/i2pd/? > I'm not sure to understand what you mean. /var/lib/i2pd/ is where i2pd create files, store cache etc.. so i2pd daemon is pretty active there, but that folder is only created by i2pd package and populated at installation, then i2pd will create more files in it.
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
On 2020/05/27 13:21, Solene Rapenne wrote:
> Le Wed, 27 May 2020 11:55:20 +0100,
> Stuart Henderson a écrit :
>
> > On 2020/05/27 12:47, Solene Rapenne wrote:
> > > share/examples/i2pd/
> > > share/examples/i2pd/certificates/
> > > share/examples/i2pd/certificates/family/
> > > -@sample ${LOCALSTATEDIR}/lib/
> >
> > That @sample should remain where it is (it was moved down in the file,
> > _after_ the subdirectories are created), and there should be
> > additional @sample for
> >
> > @sample ${LOCALSTATEDIR}/lib/i2pd/
> > @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/
> > @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/family/
> > @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/
> > @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/router/
>
> those are already in my previous mail
>
> @owner _i2pd
> @group _i2pd
> @sample ${SYSCONFDIR}/i2pd/
> @sample ${LOCALSTATEDIR}/lib/i2pd/
> @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/
> @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/family/
> @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/
> @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/router/
Oh, I see. So "@sample ${LOCALSTATEDIR}/lib/" needs to be listed before
"@sample ${LOCALSTATEDIR}/lib/i2pd/".
> I'll add this after previous lines
> @sample ${LOCALSTATEDIR}/lib/i2pd/
>
> > > share/examples/i2pd/certificates/family/gostcoin.crt
> > > -@owner _i2pd
> > > -@group _i2pd
> > > @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/family/gostcoin.crt
> > > -@owner
> > > -@group
>
> > I have no idea (or interest) in i2pd, does it need to write to those
> > files/directories at runtime? If so then at least the directories,
> > maybe also the files, need to keep @owner/group set.
> >
>
> it only need to read config in /etc/i2pd/ and read/write in
> /var/lib/i2pd/
Does it need to rewrite existing files in /var/lib/i2pd/?
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
Le Wed, 27 May 2020 11:55:20 +0100,
Stuart Henderson a écrit :
> On 2020/05/27 12:47, Solene Rapenne wrote:
> > share/examples/i2pd/
> > share/examples/i2pd/certificates/
> > share/examples/i2pd/certificates/family/
> > -@sample ${LOCALSTATEDIR}/lib/
>
> That @sample should remain where it is (it was moved down in the file,
> _after_ the subdirectories are created), and there should be
> additional @sample for
>
> @sample ${LOCALSTATEDIR}/lib/i2pd/
> @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/
> @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/family/
> @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/
> @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/router/
those are already in my previous mail
@owner _i2pd
@group _i2pd
@sample ${SYSCONFDIR}/i2pd/
@sample ${LOCALSTATEDIR}/lib/i2pd/
@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/
@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/family/
@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/
@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/router/
I'll add this after previous lines
@sample ${LOCALSTATEDIR}/lib/i2pd/
> > share/examples/i2pd/certificates/family/gostcoin.crt
> > -@owner _i2pd
> > -@group _i2pd
> > @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/family/gostcoin.crt
> > -@owner
> > -@group
> I have no idea (or interest) in i2pd, does it need to write to those
> files/directories at runtime? If so then at least the directories,
> maybe also the files, need to keep @owner/group set.
>
it only need to read config in /etc/i2pd/ and read/write in
/var/lib/i2pd/
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
On 2020/05/27 12:47, Solene Rapenne wrote:
> share/examples/i2pd/
> share/examples/i2pd/certificates/
> share/examples/i2pd/certificates/family/
> -@sample ${LOCALSTATEDIR}/lib/
That @sample should remain where it is (it was moved down in the file,
_after_ the subdirectories are created), and there should be additional
@sample for
@sample ${LOCALSTATEDIR}/lib/i2pd/
@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/
@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/family/
@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/
@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/router/
> share/examples/i2pd/certificates/family/gostcoin.crt
> -@owner _i2pd
> -@group _i2pd
> @sample ${LOCALSTATEDIR}/lib/i2pd/certificates/family/gostcoin.crt
> -@owner
> -@group
I have no idea (or interest) in i2pd, does it need to write to those
files/directories at runtime? If so then at least the directories, maybe
also the files, need to keep @owner/group set.
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
Le Thu, 30 Apr 2020 19:23:31 +0200,
Solene Rapenne a écrit :
> Le Thu, 23 Apr 2020 12:22:54 +0200,
> satmeir a écrit :
> >
> > Thank you for bearing with me
> >
>
> package built fine and starts, in floodfill mode it works as expected.
>
> Tunnels with matchtunnels = true stopped working though, maybe because
> the other end is running 2.26?
>
I reworked a bit the diff. I deleted pkg/MESSAGE because there is
already pkg/README. I cleaned README which had extra whitespaces at end
of lines and was missing the first line header.
I used update-plist after manual changes in the pkg/PLIST file, some
examples files are currently installed and owned by _i2pd for some
reasons...
2.32.0 was released 2 days ago but I would prefer to have 2.31.0 in
ports now and then update to 2.32.0, I tried quickly the latest and at
least one patch doesn't apply out of the box.
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
+++ Makefile27 May 2020 10:32:24 -
@@ -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
+++ distinfo27 May 2020 10:32:24 -
@@ -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 27 May 2020 10:32:24 -
@@ -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_Makefile16 Jun 2019 22:13:55 - 1.1.1.1
+++ patches/patch-tests_Makefile27 May 2020 10:32:24 -
@@ -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)
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
Le Thu, 23 Apr 2020 12:22:54 +0200, satmeir a écrit : > > Thank you for bearing with me > package built fine and starts, in floodfill mode it works as expected. Tunnels with matchtunnels = true stopped working though, maybe because the other end is running 2.26?
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
>> -@@ -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:
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
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_txt16 Jun 2019 22:13:55 -
> 1.1.1.1
> +++ patches/patch-build_CMakeLists_txt22 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
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: ../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
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
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, -- clematis (0x7e96fd2400fe7b59)
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
On Thu, Apr 16, 2020 at 03:09:09PM +0200, satmeir wrote: > 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. > >>> Hello, Just some quick feedback on amd64 for this v2.31.0 - It does patch, configure, build OK. - tests results looks similar to 2.26.0 with this test-gost-sig.cpp core. - It's good to have added a pkg/MESSAGE. Without being picky I would suggest to maybe add a little "if needed" to the recommendation to touch kern.maxfiles. - package, install - appears pretty much OK - *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) Hope this help. Cheers, -- clematis (0x7e96fd2400fe7b59)
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: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.
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-aeadchacha20poly1305.cpp
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
@@ -22,6 +22,9 @@ Index: tests/Makefile
- $(CXX)
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
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
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
===
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_Makefile16 Jun 2019 22:13:55 - 1.1.1.1
+++ patches/patch-tests_Makefile16 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
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
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
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?
> >>
patch doesn't apply
|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 - 1.1.1.1
|+++ patches/patch-build_CMakeLists_txt 6 Apr 2020 17:13:28 -
--
Patching file patches/patch-build_CMakeLists_txt using Plan A...
patch: malformed patch at line 555: ${DL_LIB} ${Boost_LIBRARIES}
${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY}
Re: UPDATE: i2pd 2.26.0 -> 2.30.0
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, -- clematis (0x7e96fd2400fe7b59)
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
>> $(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)
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: ../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
>
UPDATE: i2pd 2.26.0 -> 2.30.0
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
--- Makefile16 Jun 2019 22:13:55 - 1.1.1.1
+++ Makefile3 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
--- distinfo16 Jun 2019 22:13:55 - 1.1.1.1
+++ distinfo3 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_Makefile16 Jun 2019 22:13:55 - 1.1.1.1
+++ patches/patch-tests_Makefile3 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: ../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 $@ $^
