rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

i2pd: updated PLIST and distifo. Removed obsolete patches

This commit is contained in:
Jake Slazenger 2019-02-21 02:42:36 +03:00
parent 7f6d8bc40d
commit 6461146d88
5 changed files with 145 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
i2pd/PLIST
View File

@ -1,9 +1,148 @@
@comment $NetBSD$
LICENSE
bin/i2pd
man/man1/i2pd.1
share/examples/i2pd/i2pd.conf
share/examples/i2pd/i2pd.conf.NetBSD
share/examples/i2pd/tunnels.conf
src/AddressBook.cpp
src/AddressBook.h
src/BOB.cpp
src/BOB.h
src/Base.cpp
src/Base.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/Ed25519.cpp
src/Ed25519.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/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
var/i2pd/certificates/family/gostcoin.crt
var/i2pd/certificates/family/i2p-dev.crt
var/i2pd/certificates/family/i2pd-dev.crt
@ -14,10 +153,11 @@ var/i2pd/certificates/reseed/backup_at_mail.i2p.crt
var/i2pd/certificates/reseed/bugme_at_mail.i2p.crt
var/i2pd/certificates/reseed/creativecowpat_at_mail.i2p.crt
var/i2pd/certificates/reseed/echelon_at_mail.i2p.crt
var/i2pd/certificates/reseed/hottuna_at_mail.i2p.crt
var/i2pd/certificates/reseed/igor_at_novg.net.crt
var/i2pd/certificates/reseed/lazygravy_at_mail.i2p.crt
var/i2pd/certificates/reseed/meeh_at_mail.i2p.crt
var/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt
var/i2pd/certificates/reseed/zmx_at_mail.i2p.crt
var/i2pd/certificates/reseed/reseedi2pnetin_at_mail.i2p.crt
var/i2pd/certificates/router/orignal_at_mail.i2p.crt
@pkgdir etc/i2pd

8
i2pd/distinfo
View File

@ -1,9 +1,9 @@
$NetBSD$
SHA1 (i2pd/i2pd-2.18.0.tar.gz) = 2c1e6750d874b3369ae3102ba50dad9292dedad4
RMD160 (i2pd/i2pd-2.18.0.tar.gz) = 94a0edda2fdcd7ee0ae4d1478ba63dd35464d386
SHA512 (i2pd/i2pd-2.18.0.tar.gz) = dc8e0f4df25188e4d72ea6ffa2c36e48a7d2103d025730b40e226ab631724a9a07a4dc03a1a3d08328972c98020c44535661820add80374f1dabdf3fc848ef84
Size (i2pd/i2pd-2.18.0.tar.gz) = 1868440 bytes
SHA1 (i2pd/i2pd-2.23.0.tar.gz) = 62ae337bb5ca84db6223327359c817936f09af6c
RMD160 (i2pd/i2pd-2.23.0.tar.gz) = 284b8804eba2e67e9e396a9b61bef5ef0be5a3f4
SHA512 (i2pd/i2pd-2.23.0.tar.gz) = b547fa5b4ab3fbdf51cded846966b702304cc3dcbafbf3b4fc0e93e1907e45a649dd19eabc851309dfb7d3aa8ef84eefcb2cf1a3cda8549f90200da54df06923
Size (i2pd/i2pd-2.23.0.tar.gz) = 1008677 bytes
SHA1 (patch-CMakeLists.txt) = 1a8eecd49068d3a55351640da96d2d83ef0eeeb7
SHA1 (patch-I2PEndian.h) = c627fe0f6d8bfe10badd2b4cb8e6513c2c31767d
SHA1 (patch-NTCPSession.cpp) = ae87892d65a0e6e088059f14c9a1c62c37feaca3

101
i2pd/patches/patch-CMakeLists.txt
View File

@ -1,101 +0,0 @@
$NetBSD$
Don't allow to install source, header and license files for the i2pd client.
Also fix problem with WITH_LIBRARY option that doesn't work (known problem,
fixed in the upstream: github.com/PurpleI2P/i2pd/issues/1146).
--- build/CMakeLists.txt 2018-01-30 16:14:29.000000000 +0000
+++ build/CMakeLists.txt
@@ -93,13 +93,16 @@ endif()
add_library(libi2pd ${LIBI2PD_SRC})
set_target_properties(libi2pd PROPERTIES PREFIX "")
-install(TARGETS libi2pd
- EXPORT libi2pd
- ARCHIVE DESTINATION lib
- COMPONENT Libraries)
+
+if (WITH_LIBRARY)
+ install(TARGETS libi2pd
+ EXPORT libi2pd
+ ARCHIVE DESTINATION lib
+ COMPONENT Libraries)
# TODO Make libi2pd available to 3rd party projects via CMake as imported target
# FIXME This pulls stdafx
# install(EXPORT libi2pd DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif()
set (CLIENT_SRC
"${LIBI2PD_CLIENT_SRC_DIR}/AddressBook.cpp"
@@ -466,10 +469,10 @@ if (WITH_BINARY)
endif ()
endif ()
-install(FILES ../LICENSE
- DESTINATION .
- COMPONENT Runtime
- )
+#install(FILES ../LICENSE
+# DESTINATION .
+# COMPONENT Runtime
+# )
# Take a copy on Appveyor
install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICENSE"
DESTINATION .
@@ -478,8 +481,8 @@ install(FILES "C:/projects/openssl-$ENV{
OPTIONAL # for local builds only!
)
-file(GLOB_RECURSE I2PD_SOURCES "../libi2pd/*.cpp" "../libi2pd_client/*.cpp" "../daemon/*.cpp" "../build" "../Win32" "../Makefile*")
-install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source)
+#file(GLOB_RECURSE I2PD_SOURCES "../libi2pd/*.cpp" "../libi2pd_client/*.cpp" "../daemon/*.cpp" "../build" "../Win32" "../Makefile*")
+#install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source)
# install(DIRECTORY ../ DESTINATION src/
# # OPTIONAL
# COMPONENT Source FILES_MATCHING
@@ -488,7 +491,7 @@ install(FILES ${I2PD_SOURCES} DESTINATIO
# )
file(GLOB I2PD_HEADERS "../libi2pd/*.h" "../libi2pd_client/*.h" "../daemon/*.h")
-install(FILES ${I2PD_HEADERS} DESTINATION src/ COMPONENT Headers)
+#install(FILES ${I2PD_HEADERS} DESTINATION include/libi2pd COMPONENT Headers)
# install(DIRECTORY ../ DESTINATION src/
# # OPTIONAL
# COMPONENT Headers FILES_MATCHING
@@ -499,7 +502,7 @@ install(FILES ${I2PD_HEADERS} DESTINATIO
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Purple I2P, a C++ I2P daemon")
set(CPACK_PACKAGE_VENDOR "Purple I2P")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../README.md")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE")
+#set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE")
file(READ ../libi2pd/version.h version_h)
string(REGEX REPLACE ".*I2PD_VERSION_MAJOR ([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_MAJOR "${version_h}")
string(REGEX REPLACE ".*I2PD_VERSION_MINOR ([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_MINOR "${version_h}")
@@ -519,16 +522,16 @@ cpack_add_component(Libraries
DESCRIPTION "Binary libraries for development"
INSTALL_TYPES full dev3rd
)
-cpack_add_component(Source
- DISPLAY_NAME "Source code"
- DESCRIPTION "I2pd source code"
- INSTALL_TYPES full
- )
-cpack_add_component(Headers
- DISPLAY_NAME "Header files"
- DESCRIPTION "I2pd header files for development"
- INSTALL_TYPES full dev3rd
- )
+#cpack_add_component(Source
+# DISPLAY_NAME "Source code"
+# DESCRIPTION "I2pd source code"
+# INSTALL_TYPES full
+# )
+#cpack_add_component(Headers
+# DISPLAY_NAME "Header files"
+# DESCRIPTION "I2pd header files for development"
+# INSTALL_TYPES full dev3rd
+# )
install(FILES ${MINIUPNPC_INCLUDE_DIR}/miniupnpc/miniupnpc.dll
DESTINATION bin
COMPONENT MiniUPnPc

17
i2pd/patches/patch-I2PEndian.h
View File

@ -1,17 +0,0 @@
$NetBSD$
Adding NetBSD-specific macro.
Fixed in the upstream:
github.com/PurpleI2P/i2pd/commit/30fb0f5a942cc5195c725feae25ab38f88b08436
--- libi2pd/I2PEndian.h 2018-01-30 16:14:29.000000000 +0000
+++ libi2pd/I2PEndian.h
@@ -3,7 +3,7 @@
#include <inttypes.h>
#include <string.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__)
#include <sys/endian.h>
#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
#include <endian.h>

25
i2pd/patches/patch-NTCPSession.cpp
View File

@ -1,25 +0,0 @@
$NetBSD$
>"due the bug in gcc 4.7. std::shared_future.get() is not const"
github.com/PurpleI2P/i2pd/commit/30fb0f5a942cc5195c725feae25ab38f88b08436
--- libi2pd/NTCPSession.cpp 2018-01-30 16:14:29.000000000 +0000
+++ libi2pd/NTCPSession.cpp
@@ -171,7 +171,7 @@ namespace transport
return;
}
}
-#if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 7)
+#if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 7) || defined(__NetBSD__)
// due the bug in gcc 4.7. std::shared_future.get() is not const
if (!m_DHKeysPair)
m_DHKeysPair = transports.GetNextDHKeysPair ();
@@ -250,7 +250,7 @@ namespace transport
}
else
{
-#if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 7)
+#if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 7) || defined (__NetBSD__)
// due the bug in gcc 4.7. std::shared_future.get() is not const
CreateAESKey (m_Establisher->phase2.pubKey);
HandlePhase2 ();