Index: head/net-p2p/litecoin/Makefile =================================================================== --- head/net-p2p/litecoin/Makefile (revision 470709) +++ head/net-p2p/litecoin/Makefile (revision 470710) @@ -1,126 +1,126 @@ # Created by: Steve Wills # $FreeBSD$ PORTNAME= litecoin -PORTVERSION= 0.14.2 +PORTVERSION= 0.15.1 DISTVERSIONPREFIX= v -PORTREVISION= 6 CATEGORIES= net-p2p finance -PATCH_SITES= https://github.com/bitcoin/bitcoin/commit/ -PATCHFILES= 1ec0c0a01c31.patch:-p1 - MAINTAINER= swills@FreeBSD.org COMMENT?= Virtual Peer-to-Peer Currency Client (QT) LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING NOT_FOR_ARCHS= powerpc powerpc64 sparc64 NOT_FOR_ARCHS_REASON= fails to configure: "Big Endian not supported" LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ libevent.so:devel/libevent -USES+= autoreconf compiler:c++11-lib gmake libtool pkgconfig shebangfix ssl -SHEBANG_FILES= src/test/*.py +USES+= autoreconf compiler:c++11-lib gmake libtool pkgconfig ssl USE_GITHUB= yes GNU_CONFIGURE= yes SLAVE_PORT?= no .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no" USES+= desktop-file-utils USE_QT5= core gui network widgets \ buildtools_build linguisttools_build qmake_build BUILD_DEPENDS+= protoc:devel/protobuf LIB_DEPENDS+= libprotobuf.so:devel/protobuf TESTS_USE= QT5=testlib TESTS_PLIST_FILES= bin/test_litecoin-qt \ bin/test_litecoin .endif OPTIONS_DEFINE?= DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET ZMQ OPTIONS_DEFAULT?= DBUS HARDENING QRCODES UPNP WALLET OPTIONS_SUB= yes HARDENING_DESC= Attempt to harden binaries (PIE for ASLR, NX Stack) QRCODES_DESC= Display QR Codes TESTS_DESC= Build test binary and unit tests WALLET_DESC= Wallet Management Support ZMQ_DESC= Block and transaction broadcasting with ZeroMQ DBUS_CONFIGURE_WITH= dbus DBUS_USE= QT5=dbus DEBUG_CONFIGURE_ENABLE= debug DEBUG_INSTALL_TARGET_OFF= install-strip HARDENING_CONFIGURE_ENABLE= hardening TESTS_CONFIGURE_ENABLE= tests bench .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "yes" TESTS_PLIST_FILES= bin/test_litecoin .endif TESTS_PLIST_FILES+= bin/bench_litecoin UPNP_CONFIGURE_WITH= miniupnpc UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc UPNP_CPPFLAGS= -I${LOCALBASE}/include UPNP_LIBS= -L${LOCALBASE}/lib QRCODES_CONFIGURE_WITH= qrencode QRCODES_LIB_DEPENDS= libqrencode.so:graphics/libqrencode WALLET_CONFIGURE_ENABLE= wallet WALLET_CXXFLAGS= -I${BDB_INCLUDE_DIR} WALLET_LIBS= -L${BDB_LIB_DIR} WALLET_USES= bdb:48 ZMQ_CONFIGURE_ENABLE= zmq ZMQ_BUILD_DEPENDS= libzmq4>0:net/libzmq4 ZMQ_RUN_DEPENDS= libzmq4>0:net/libzmq4 GH_ACCOUNT= litecoin-project CONFIGURE_ARGS?= --without-libs \ --with-gui=qt5 \ --without-daemon \ --without-utils CONFIGURE_ENV= CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \ SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \ OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}" V=1 MAKE_ENV+= V=1 PLIST_FILES?= bin/litecoin-qt man/man1/litecoin-qt.1.gz \ share/applications/litecoin-qt.desktop share/pixmaps/litecoin128.png .include + +.if ${OSVERSION} < 1100000 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_crypto_scrypt.cpp \ + ${FILESDIR}/extra-patch-src_crypto_scrypt.h +.endif .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no" post-patch: @${REINPLACE_CMD} -e 's|bitcoin|litecoin|g' \ -e 's|Bitcoin|Litecoin|g' \ ${WRKSRC}/contrib/debian/bitcoin-qt.desktop post-install: @${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' \ ${WRKSRC}/contrib/debian/bitcoin-qt.desktop ${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop \ ${STAGEDIR}${PREFIX}/share/applications/litecoin-qt.desktop ${INSTALL} ${WRKSRC}/share/pixmaps/bitcoin128.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/litecoin128.png .endif regression-test: build # To use this sucessfully, remove --without-daemon and --without-utils # from CONFIGURE_ARGS above. @cd ${WRKSRC} && ${GMAKE} check .include Index: head/net-p2p/litecoin/distinfo =================================================================== --- head/net-p2p/litecoin/distinfo (revision 470709) +++ head/net-p2p/litecoin/distinfo (revision 470710) @@ -1,5 +1,3 @@ -TIMESTAMP = 1503300985 -SHA256 (litecoin-project-litecoin-v0.14.2_GH0.tar.gz) = 953fd6cee2da3ed63779b2dbce8a775e76d7a926be3de5b906d40f6641a2b4d5 -SIZE (litecoin-project-litecoin-v0.14.2_GH0.tar.gz) = 6205762 -SHA256 (1ec0c0a01c31.patch) = 01a2fe784d7c3d21d2cfd9dc460c059c7ae358e0f5e9e5e7782f10d259db3cd9 -SIZE (1ec0c0a01c31.patch) = 3535 +TIMESTAMP = 1527084876 +SHA256 (litecoin-project-litecoin-v0.15.1_GH0.tar.gz) = 570adae0d4a9567110967aba2ea5d90ce8c421313f453523c4fd23b9339c7d2b +SIZE (litecoin-project-litecoin-v0.15.1_GH0.tar.gz) = 6672694 Index: head/net-p2p/litecoin/files/patch-src_crypto_scrypt.cpp =================================================================== --- head/net-p2p/litecoin/files/patch-src_crypto_scrypt.cpp (revision 470709) +++ head/net-p2p/litecoin/files/patch-src_crypto_scrypt.cpp (nonexistent) @@ -1,33 +0,0 @@ ---- src/crypto/scrypt.cpp.orig 2015-08-04 13:27:49 UTC -+++ src/crypto/scrypt.cpp -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - - #if defined(USE_SSE2) && !defined(USE_SSE2_ALWAYS) -@@ -44,22 +45,6 @@ - #endif - #endif - --static inline uint32_t be32dec(const void *pp) --{ -- const uint8_t *p = (uint8_t const *)pp; -- return ((uint32_t)(p[3]) + ((uint32_t)(p[2]) << 8) + -- ((uint32_t)(p[1]) << 16) + ((uint32_t)(p[0]) << 24)); --} -- --static inline void be32enc(void *pp, uint32_t x) --{ -- uint8_t *p = (uint8_t *)pp; -- p[3] = x & 0xff; -- p[2] = (x >> 8) & 0xff; -- p[1] = (x >> 16) & 0xff; -- p[0] = (x >> 24) & 0xff; --} -- - typedef struct HMAC_SHA256Context { - SHA256_CTX ictx; - SHA256_CTX octx; Property changes on: head/net-p2p/litecoin/files/patch-src_crypto_scrypt.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-p2p/litecoin/files/patch-src_crypto_scrypt.h =================================================================== --- head/net-p2p/litecoin/files/patch-src_crypto_scrypt.h (revision 470709) +++ head/net-p2p/litecoin/files/patch-src_crypto_scrypt.h (nonexistent) @@ -1,22 +0,0 @@ ---- src/crypto/scrypt.h.orig 2015-06-15 08:51:30 UTC -+++ src/crypto/scrypt.h -@@ -27,19 +27,4 @@ void - PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt, - size_t saltlen, uint64_t c, uint8_t *buf, size_t dkLen); - --static inline uint32_t le32dec(const void *pp) --{ -- const uint8_t *p = (uint8_t const *)pp; -- return ((uint32_t)(p[0]) + ((uint32_t)(p[1]) << 8) + -- ((uint32_t)(p[2]) << 16) + ((uint32_t)(p[3]) << 24)); --} -- --static inline void le32enc(void *pp, uint32_t x) --{ -- uint8_t *p = (uint8_t *)pp; -- p[0] = x & 0xff; -- p[1] = (x >> 8) & 0xff; -- p[2] = (x >> 16) & 0xff; -- p[3] = (x >> 24) & 0xff; --} - #endif Property changes on: head/net-p2p/litecoin/files/patch-src_crypto_scrypt.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.cpp =================================================================== --- head/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.cpp (nonexistent) +++ head/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.cpp (revision 470710) @@ -0,0 +1,35 @@ +--- src/crypto/scrypt.cpp.orig 2018-02-26 19:37:55.000000000 -0500 ++++ src/crypto/scrypt.cpp 2018-05-23 11:25:45.718849000 -0400 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + + #if defined(USE_SSE2) && !defined(USE_SSE2_ALWAYS) +@@ -42,24 +43,6 @@ + // GCC Linux or i686-w64-mingw32 + #include + #endif +-#endif +-#ifndef __FreeBSD__ +-static inline uint32_t be32dec(const void *pp) +-{ +- const uint8_t *p = (uint8_t const *)pp; +- return ((uint32_t)(p[3]) + ((uint32_t)(p[2]) << 8) + +- ((uint32_t)(p[1]) << 16) + ((uint32_t)(p[0]) << 24)); +-} +- +-static inline void be32enc(void *pp, uint32_t x) +-{ +- uint8_t *p = (uint8_t *)pp; +- p[3] = x & 0xff; +- p[2] = (x >> 8) & 0xff; +- p[1] = (x >> 16) & 0xff; +- p[0] = (x >> 24) & 0xff; +-} +- + #endif + typedef struct HMAC_SHA256Context { + SHA256_CTX ictx; Property changes on: head/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.h =================================================================== --- head/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.h (nonexistent) +++ head/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.h (revision 470710) @@ -0,0 +1,24 @@ +--- src/crypto/scrypt.h.orig 2018-05-23 11:31:01.662350000 -0400 ++++ src/crypto/scrypt.h 2018-05-23 11:31:25.771775000 -0400 +@@ -28,21 +28,4 @@ void + PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt, + size_t saltlen, uint64_t c, uint8_t *buf, size_t dkLen); + +-#ifndef __FreeBSD__ +-static inline uint32_t le32dec(const void *pp) +-{ +- const uint8_t *p = (uint8_t const *)pp; +- return ((uint32_t)(p[0]) + ((uint32_t)(p[1]) << 8) + +- ((uint32_t)(p[2]) << 16) + ((uint32_t)(p[3]) << 24)); +-} +- +-static inline void le32enc(void *pp, uint32_t x) +-{ +- uint8_t *p = (uint8_t *)pp; +- p[0] = x & 0xff; +- p[1] = (x >> 8) & 0xff; +- p[2] = (x >> 16) & 0xff; +- p[3] = (x >> 24) & 0xff; +-} +-#endif + #endif Property changes on: head/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property