View | Details | Raw Unified | Return to bug 237017
Collapse All | Expand All

(-)MOVED (-1 / +1 lines)
Lines 12808-12814 Link Here
12808
devel/rubygem-batch-loader12|devel/rubygem-batch-loader|2019-06-21|Obsolete by gitlab-ce upgrade, use devel/rubygem-batch-loader instead
12808
devel/rubygem-batch-loader12|devel/rubygem-batch-loader|2019-06-21|Obsolete by gitlab-ce upgrade, use devel/rubygem-batch-loader instead
12809
security/easy-rsa2|security/easy-rsa|2019-06-23|Has expired: Use easy-rsa 3 instead
12809
security/easy-rsa2|security/easy-rsa|2019-06-23|Has expired: Use easy-rsa 3 instead
12810
devel/py-robotframework-selenium2library|devel/py-robotframework-seleniumlibrary|2019-06-25|Renamed to match upstream
12810
devel/py-robotframework-selenium2library|devel/py-robotframework-seleniumlibrary|2019-06-25|Renamed to match upstream
12811
net-p2p/zetacoin-nox11|net-p2p/zetacoin|2019-06-26|Slave port folded back into now text-only master port
12812
net/tigervnc||2019-06-29|Removed: Non-essential meta port
12811
net/tigervnc||2019-06-29|Removed: Non-essential meta port
12813
sysutils/cfengine33|sysutils/cfengine313|2019-06-30|Has expired: No longer supported upstream
12812
sysutils/cfengine33|sysutils/cfengine313|2019-06-30|Has expired: No longer supported upstream
12814
sysutils/cfengine-masterfiles38|sysutils/cfengine-masterfiles313|2019-06-30|Has expired: No longer supported upstream
12813
sysutils/cfengine-masterfiles38|sysutils/cfengine-masterfiles313|2019-06-30|Has expired: No longer supported upstream
Lines 12849-12851 Link Here
12849
editors/xed||2019-07-13|Has expired: Abandonware using sys/dir.h
12848
editors/xed||2019-07-13|Has expired: Abandonware using sys/dir.h
12850
databases/gtksql||2019-07-13|Has expired: Abandonware using sys/dir.h
12849
databases/gtksql||2019-07-13|Has expired: Abandonware using sys/dir.h
12851
security/snortreport||2019-07-16|Has expired: Abandonware
12850
security/snortreport||2019-07-16|Has expired: Abandonware
12851
net-p2p/zetacoin-nox11|net-p2p/zetacoin-daemon|2019-07-17|Renamed to better align with net-p2p/bitcoin port
(-)UPDATING (+15 lines)
Lines 7-12 Link Here
7
7
8
8
9
20190717:
9
20190717:
10
  AFFECTS: users of net-p2p/zetacoin and net-p2p/zetacoin-nox11
11
  AUTHOR: daniel@morante.net
12
13
  Zetacoin will default to using modern versions of BDB (5.x or 6.x) when
14
  the WALLET option is selected.   See pkg-help for explanation.
15
16
  The zetacoin-nox11 slave port was renamed to zetacoin-daemon to align
17
  with the net-p2p/bitcoin format.
18
  
19
  The zetacoin-cli and zetacoin-tx utilities have been re-packaged into
20
  a separate port. If you require these programs, or use the zetacoin-cli
21
  program to access the daemon or the GUI, install net-p2p/zetacoin-utils
22
  to reinstall them.
23
24
20190717:
10
  AFFECTS: users of sysutils/py-borgmatic
25
  AFFECTS: users of sysutils/py-borgmatic
11
  AUTHOR: egypcio@FreeBSD.org
26
  AUTHOR: egypcio@FreeBSD.org
12
27
(-)net-p2p/zetacoin/Makefile (-57 / +86 lines)
Lines 2-10 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	zetacoin
4
PORTNAME=	zetacoin
5
PORTVERSION=	0.11.2.3
5
PORTVERSION=	0.13.2.1
6
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
7
PORTREVISION=	27
8
CATEGORIES=	net-p2p finance
7
CATEGORIES=	net-p2p finance
9
8
10
MAINTAINER=	daniel@morante.net
9
MAINTAINER=	daniel@morante.net
Lines 12-102 Link Here
12
11
13
LICENSE=	MIT
12
LICENSE=	MIT
14
13
15
BROKEN=		fails to build with boost 1.70, see bug 237017
14
NOT_FOR_ARCHS=		powerpc powerpc64 sparc64
15
NOT_FOR_ARCHS_REASON=	does not support big-endian architectures
16
16
17
LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
17
LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
18
		libevent.so:devel/libevent
18
19
19
USES+=		autoreconf compiler:c++11-lang gmake libtool pkgconfig:build ssl
20
USES=		autoreconf compiler:c++11-lib gmake libtool pkgconfig qt:5 shebangfix ssl
20
USE_CXXSTD=	c++11
21
CFLAGS+=	-I${OPENSSLINC}
22
LDFLAGS+=	-L${OPENSSLLIB}
23
21
24
BROKEN_armv6=		AtomicPointer not implemented
25
BROKEN_powerpc64=	fails to configure: No working boost sleep implementation found
26
27
USE_GITHUB=	yes
22
USE_GITHUB=	yes
28
23
29
OPTIONS_DEFINE=	UPNP WALLET CLI TEST
24
GNU_CONFIGURE=	yes
30
OPTIONS_SUB=	yes
31
25
32
WALLET_DESC=	Build wallet or P2P server node only
26
SLAVE_PORT?=	no
33
CLI_DESC=		Build command line RPC client
34
27
35
OPTIONS_DEFAULT=	WALLET
28
.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
29
USES+=		desktop-file-utils
30
USE_QT=		core gui network widgets \
31
		buildtools_build linguisttools_build qmake_build
36
32
33
BUILD_DEPENDS+=	protoc:devel/protobuf
34
LIB_DEPENDS+=	libprotobuf.so:devel/protobuf
35
36
TESTS_USES=	qt:5
37
TESTS_USE=		QT=testlib
38
TESTS_PLIST_FILES=	bin/test_${PORTNAME}-qt \
39
			bin/test_${PORTNAME}
40
.endif
41
42
OPTIONS_DEFINE?=	DBUS DEBUG HARDENING QRCODES TESTS UPNP ZMQ
43
OPTIONS_RADIO?=		WALLET
44
OPTIONS_RADIO_WALLET?=	WALLET_BDB48 WALLET_BDBMODERN
45
OPTIONS_DEFAULT?=	DBUS HARDENING QRCODES UPNP WALLET_BDBMODERN ZMQ
46
OPTIONS_SUB=		yes
47
48
HARDENING_DESC=	Attempt to harden binaries (PIE for ASLR, NX Stack)
49
QRCODES_DESC=	Display QR Codes
50
TESTS_DESC=	Build test binary and unit tests
51
WALLET_DESC=	Wallet Management Support
52
WALLET_BDB48_DESC=	Wallet using BDB 4.8
53
WALLET_BDBMODERN_DESC=	Wallet using modern BDB 5.x or 6.x
54
ZMQ_DESC=	Block and transaction broadcasting with ZeroMQ
55
56
DBUS_CONFIGURE_WITH=	dbus
57
DBUS_USES=	qt:5
58
DBUS_USE=		QT=dbus
59
60
DEBUG_CONFIGURE_ENABLE=		debug
61
DEBUG_INSTALL_TARGET_OFF=	install-strip
62
63
HARDENING_CONFIGURE_ENABLE=	hardening
64
65
TESTS_CONFIGURE_ENABLE=	tests bench
66
.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "yes"
67
TESTS_PLIST_FILES=	bin/test_${PORTNAME}
68
.endif
69
TESTS_PLIST_FILES+=	bin/bench_${PORTNAME}
70
37
UPNP_CONFIGURE_WITH=	miniupnpc
71
UPNP_CONFIGURE_WITH=	miniupnpc
38
UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
72
UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
39
UPNP_CPPFLAGS=		-I${LOCALBASE}/include
73
UPNP_CPPFLAGS=		-I${LOCALBASE}/include
40
UPNP_LIBS=		-L${LOCALBASE}/lib
74
UPNP_LIBS=		-L${LOCALBASE}/lib
41
75
42
WALLET_CONFIGURE_ENABLE=wallet
76
QRCODES_CONFIGURE_WITH=	qrencode
43
WALLET_CXXFLAGS=	-I${BDB_INCLUDE_DIR}
77
QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
44
WALLET_LIBS=		-L${BDB_LIB_DIR}
45
WALLET_USES=		bdb:48
46
78
47
CLI_CONFIGURE_WITH=	cli
79
ZMQ_CONFIGURE_ENABLE=	zmq
80
ZMQ_BUILD_DEPENDS=	libzmq4>0:net/libzmq4
81
ZMQ_RUN_DEPENDS=	libzmq4>0:net/libzmq4
48
82
49
TEST_CONFIGURE_ENABLE=	tests
83
CONFIGURE_ARGS?=	--without-libs \
50
TEST_ALL_TARGET=	check
84
			--with-gui=qt5 \
85
			--without-daemon \
86
			--without-utils
51
87
52
GNU_CONFIGURE=	yes
53
CONFIGURE_ARGS=	--with-daemon
54
CONFIGURE_ENV=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
88
CONFIGURE_ENV=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
55
		SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \
89
		SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \
56
		OBJC="${CC}" OBJCFLAGS="${CFLAGS}" OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"
90
		OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"
91
MAKE_ENV+=	V=1
57
92
58
QT_BINARY=	${PORTNAME}-qt
93
PLIST_FILES?=	bin/${PORTNAME}-qt share/applications/${PORTNAME}-qt.desktop \
59
CLI_BINARY=	${PORTNAME}-cli
94
		share/pixmaps/${PORTNAME}256.png
60
DAEMON=		${PORTNAME}d
61
95
62
PLIST_SUB+=	EXECUTABLE_QT=bin/${QT_BINARY} \
63
		EXECUTABLE_CLI=bin/${CLI_BINARY} \
64
		EXECUTABLE_DAEMON=bin/${DAEMON} \
65
		PORTNAME=${PORTNAME}
66
67
.include <bsd.port.options.mk>
96
.include <bsd.port.options.mk>
68
97
69
# tests will currently fail
98
.if ${PORT_OPTIONS:MWALLET_BDB48}
70
.if ${PORT_OPTIONS:MTEST}
99
CONFIGURE_ARGS+=	--enable-wallet
71
BROKEN=	automated testing fails
100
USES+=			bdb:48
101
.elif ${PORT_OPTIONS:MWALLET_BDBMODERN}
102
CONFIGURE_ARGS+=	--enable-wallet --with-incompatible-bdb
103
USES+=			bdb:5+
104
.else
105
CONFIGURE_ARGS+=	--disable-wallet
72
.endif
106
.endif
73
107
74
USE_RC_SUBR=	${PORTNAME}
75
SUB_LIST+=	PORTNAME=${PORTNAME}
76
SUB_FILES=	pkg-message
77
USERS=		${PORTNAME}
78
GROUPS=		${PORTNAME}
79
80
.include <bsd.port.pre.mk>
108
.include <bsd.port.pre.mk>
81
109
82
.if ${SSL_DEFAULT} == base
110
.if ${PORT_OPTIONS:MWALLET_BDB48} || ${PORT_OPTIONS:MWALLET_BDBMODERN}
83
BROKEN_FreeBSD_12=	checking for RAND_egd in -lcrypto... no
111
CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
84
BROKEN_FreeBSD_13=	checking for RAND_egd in -lcrypto... no
112
LIBS+=		-L${BDB_LIB_DIR}
85
.endif
113
.endif
86
114
87
.if ${SSL_DEFAULT:Mlibressl*}
115
.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
88
# The configure script will output this message, so save the user the trouble
116
89
IGNORE=	detected LibreSSL: This is NOT supported, and may break consensus compatibility!
117
post-install:
118
	${INSTALL} ${FILESDIR}/${PORTNAME}-qt.desktop \
119
		${STAGEDIR}${PREFIX}/share/applications
120
	${INSTALL} ${WRKSRC}/src/qt/res/icons/bitcoin.png \
121
		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}256.png
122
90
.endif
123
.endif
91
124
92
post-patch:
125
regression-test: build
93
	${MKDIR} ${WRKSRC}/src/build-aux
126
	# To use this sucessfully, remove --without-daemon and --without-utils
127
	# from CONFIGURE_ARGS above.
94
128
95
do-install:
129
	@cd ${WRKSRC} && ${GMAKE} check
96
	${INSTALL_PROGRAM} -s ${WRKSRC}/src/${DAEMON} ${STAGEDIR}${PREFIX}/bin/${DAEMON}
97
	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
98
130
99
do-install-CLI-on:
100
	${INSTALL_PROGRAM} -s ${WRKSRC}/src/${CLI_BINARY} ${STAGEDIR}${PREFIX}/bin/${CLI_BINARY}
101
102
.include <bsd.port.post.mk>
131
.include <bsd.port.post.mk>
(-)net-p2p/zetacoin/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1466446290
1
TIMESTAMP = 1563356382
2
SHA256 (zetacoin-zetacoin-v0.11.2.3_GH0.tar.gz) = 581195ee6616f47c12cbd2b76cf0d61e152bbe659a349b5010d6ad3a51da80f9
2
SHA256 (zetacoin-zetacoin-v0.13.2.1_GH0.tar.gz) = 4169a81abb3ded551bf8f8d10e2a7d51ee2b5b2b87e7b4005cce19d584e6378d
3
SIZE (zetacoin-zetacoin-v0.11.2.3_GH0.tar.gz) = 5735186
3
SIZE (zetacoin-zetacoin-v0.13.2.1_GH0.tar.gz) = 5156393
(-)net-p2p/zetacoin/files/patch-src_Makefile.bench.include (+57 lines)
Line 0 Link Here
1
--- src/Makefile.bench.include.orig	2018-07-31 20:08:28 UTC
2
+++ src/Makefile.bench.include
3
@@ -2,12 +2,12 @@
4
 # Distributed under the MIT software license, see the accompanying
5
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
6
 
7
-bin_PROGRAMS += bench/bench_bitcoin
8
+bin_PROGRAMS += bench/bench_zetacoin
9
 BENCH_SRCDIR = bench
10
-BENCH_BINARY = bench/bench_bitcoin$(EXEEXT)
11
+BENCH_BINARY = bench/bench_zetacoin$(EXEEXT)
12
 
13
 
14
-bench_bench_bitcoin_SOURCES = \
15
+bench_bench_zetacoin_SOURCES = \
16
   bench/bench_bitcoin.cpp \
17
   bench/bench.cpp \
18
   bench/bench.h \
19
@@ -16,9 +16,9 @@ bench_bench_bitcoin_SOURCES = \
20
   bench/crypto_hash.cpp \
21
   bench/base58.cpp
22
 
23
-bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
24
-bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
25
-bench_bench_bitcoin_LDADD = \
26
+bench_bench_zetacoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
27
+bench_bench_zetacoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
28
+bench_bench_zetacoin_LDADD = \
29
   $(LIBBITCOIN_SERVER) \
30
   $(LIBBITCOIN_COMMON) \
31
   $(LIBBITCOIN_UTIL) \
32
@@ -30,15 +30,15 @@ bench_bench_bitcoin_LDADD = \
33
   $(LIBUNIVALUE)
34
 
35
 if ENABLE_ZMQ
36
-bench_bench_bitcoin_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
37
+bench_bench_zetacoin_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
38
 endif
39
 
40
 if ENABLE_WALLET
41
-bench_bench_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
42
+bench_bench_zetacoin_LDADD += $(LIBBITCOIN_WALLET)
43
 endif
44
 
45
-bench_bench_bitcoin_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
46
-bench_bench_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
47
+bench_bench_zetacoin_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
48
+bench_bench_zetacoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
49
 
50
 CLEAN_BITCOIN_BENCH = bench/*.gcda bench/*.gcno
51
 
52
@@ -50,4 +50,4 @@ bench: $(BENCH_BINARY) FORCE
53
 	$(BENCH_BINARY)
54
 
55
 bitcoin_bench_clean : FORCE
56
-	rm -f $(CLEAN_BITCOIN_BENCH) $(bench_bench_bitcoin_OBJECTS) $(BENCH_BINARY)
57
+	rm -f $(CLEAN_BITCOIN_BENCH) $(bench_bench_zetacoin_OBJECTS) $(BENCH_BINARY)
(-)net-p2p/zetacoin/files/patch-src_bitcoin-cli.cpp (-11 lines)
Lines 1-11 Link Here
1
--- src/bitcoin-cli.cpp.orig	2018-01-13 04:55:52 UTC
2
+++ src/bitcoin-cli.cpp
3
@@ -105,7 +105,7 @@ Object CallRPC(const string& strMethod, 
4
     // Connect to localhost
5
     bool fUseSSL = GetBoolArg("-rpcssl", false);
6
     boost::asio::io_service io_service;
7
-    boost::asio::ssl::context context(io_service, boost::asio::ssl::context::sslv23);
8
+    boost::asio::ssl::context context(boost::asio::ssl::context::sslv23);
9
     context.set_options(boost::asio::ssl::context::no_sslv2 | boost::asio::ssl::context::no_sslv3);
10
     boost::asio::ssl::stream<boost::asio::ip::tcp::socket> sslStream(io_service, context);
11
     SSLIOStreamDevice<boost::asio::ip::tcp> d(sslStream, fUseSSL);
(-)net-p2p/zetacoin/files/patch-src_miner.h (+20 lines)
Line 0 Link Here
1
--- src/miner.h.orig	2018-07-31 20:08:28 UTC
2
+++ src/miner.h
3
@@ -73,7 +73,7 @@ struct modifiedentry_iter {
4
 // except operating on CTxMemPoolModifiedEntry.
5
 // TODO: refactor to avoid duplication of this logic.
6
 struct CompareModifiedEntry {
7
-    bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b)
8
+    bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b) const
9
     {
10
         double f1 = (double)a.nModFeesWithAncestors * b.nSizeWithAncestors;
11
         double f2 = (double)b.nModFeesWithAncestors * a.nSizeWithAncestors;
12
@@ -88,7 +88,7 @@ struct CompareModifiedEntry {
13
 // This is sufficient to sort an ancestor package in an order that is valid
14
 // to appear in a block.
15
 struct CompareTxIterByAncestorCount {
16
-    bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b)
17
+    bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) const
18
     {
19
         if (a->GetCountWithAncestors() != b->GetCountWithAncestors())
20
             return a->GetCountWithAncestors() < b->GetCountWithAncestors();
(-)net-p2p/zetacoin/files/patch-src_rpcserver.cpp (-62 lines)
Lines 1-62 Link Here
1
--- src/rpcserver.cpp.orig	2018-01-10 23:24:05 UTC
2
+++ src/rpcserver.cpp
3
@@ -492,8 +492,8 @@ private:
4
 void ServiceConnection(AcceptedConnection *conn);
5
 
6
 //! Forward declaration required for RPCListen
7
-template <typename Protocol, typename SocketAcceptorService>
8
-static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
9
+template <typename Protocol>
10
+static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor,
11
                              ssl::context& context,
12
                              bool fUseSSL,
13
                              boost::shared_ptr< AcceptedConnection > conn,
14
@@ -502,8 +502,8 @@ static void RPCAcceptHandler(boost::shar
15
 /**
16
  * Sets up I/O resources to accept and handle a new connection.
17
  */
18
-template <typename Protocol, typename SocketAcceptorService>
19
-static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
20
+template <typename Protocol>
21
+static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor,
22
                    ssl::context& context,
23
                    const bool fUseSSL)
24
 {
25
@@ -513,7 +513,7 @@ static void RPCListen(boost::shared_ptr<
26
     acceptor->async_accept(
27
             conn->sslStream.lowest_layer(),
28
             conn->peer,
29
-            boost::bind(&RPCAcceptHandler<Protocol, SocketAcceptorService>,
30
+            boost::bind(&RPCAcceptHandler<Protocol>,
31
                 acceptor,
32
                 boost::ref(context),
33
                 fUseSSL,
34
@@ -525,8 +525,8 @@ static void RPCListen(boost::shared_ptr<
35
 /**
36
  * Accept and handle incoming connection.
37
  */
38
-template <typename Protocol, typename SocketAcceptorService>
39
-static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
40
+template <typename Protocol>
41
+static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor,
42
                              ssl::context& context,
43
                              const bool fUseSSL,
44
                              boost::shared_ptr< AcceptedConnection > conn,
45
@@ -620,7 +620,7 @@ void StartRPCThreads()
46
 
47
     assert(rpc_io_service == NULL);
48
     rpc_io_service = new boost::asio::io_service();
49
-    rpc_ssl_context = new ssl::context(*rpc_io_service, ssl::context::sslv23);
50
+    rpc_ssl_context = new ssl::context(ssl::context::sslv23);
51
 
52
     const bool fUseSSL = GetBoolArg("-rpcssl", false);
53
 
54
@@ -639,7 +639,7 @@ void StartRPCThreads()
55
         else LogPrintf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string());
56
 
57
         string strCiphers = GetArg("-rpcsslciphers", "TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH");
58
-        SSL_CTX_set_cipher_list(rpc_ssl_context->impl(), strCiphers.c_str());
59
+        SSL_CTX_set_cipher_list(rpc_ssl_context->native_handle(), strCiphers.c_str());
60
     }
61
 
62
     std::vector<ip::tcp::endpoint> vEndpoints;
(-)net-p2p/zetacoin/files/patch-src_txmempool.h (+47 lines)
Line 0 Link Here
1
--- src/txmempool.h.orig	2018-07-31 20:08:28 UTC
2
+++ src/txmempool.h
3
@@ -224,7 +224,7 @@ struct mempoolentry_txid
4
 class CompareTxMemPoolEntryByDescendantScore
5
 {
6
 public:
7
-    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
8
+    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
9
     {
10
         bool fUseADescendants = UseDescendantScore(a);
11
         bool fUseBDescendants = UseDescendantScore(b);
12
@@ -246,7 +246,7 @@ class CompareTxMemPoolEntryByDescendantScore (public)
13
     }
14
 
15
     // Calculate which score to use for an entry (avoiding division).
16
-    bool UseDescendantScore(const CTxMemPoolEntry &a)
17
+    bool UseDescendantScore(const CTxMemPoolEntry &a) const
18
     {
19
         double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants();
20
         double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize();
21
@@ -261,7 +261,7 @@ class CompareTxMemPoolEntryByDescendantScore (public)
22
 class CompareTxMemPoolEntryByScore
23
 {
24
 public:
25
-    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
26
+    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
27
     {
28
         double f1 = (double)a.GetModifiedFee() * b.GetTxSize();
29
         double f2 = (double)b.GetModifiedFee() * a.GetTxSize();
30
@@ -275,7 +275,7 @@ class CompareTxMemPoolEntryByScore (public)
31
 class CompareTxMemPoolEntryByEntryTime
32
 {
33
 public:
34
-    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
35
+    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
36
     {
37
         return a.GetTime() < b.GetTime();
38
     }
39
@@ -284,7 +284,7 @@ class CompareTxMemPoolEntryByEntryTime (public)
40
 class CompareTxMemPoolEntryByAncestorFee
41
 {
42
 public:
43
-    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
44
+    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
45
     {
46
         double aFees = a.GetModFeesWithAncestors();
47
         double aSize = a.GetSizeWithAncestors();
(-)net-p2p/zetacoin/files/zetacoin-qt.desktop (+14 lines)
Line 0 Link Here
1
[Desktop Entry]
2
Version=1.0
3
Name=Zetacoin Core
4
Comment=Connect to the Zetacoin P2P Network
5
Comment[de]=Verbinde mit dem Zetacoin peer-to-peer Netzwerk
6
Comment[fr]=Zetacoin, monnaie virtuelle cryptographique pair à pair
7
Comment[tr]=Zetacoin, eşten eşe kriptografik sanal para birimi
8
Exec=zetacoin-qt %u
9
Terminal=false
10
Type=Application
11
Icon=zetacoin256
12
MimeType=x-scheme-handler/zetacoin;
13
Categories=Office;Finance;
14
StartupWMClass=Zetacoin-qt
(-)net-p2p/zetacoin/files/zetacoin.conf.sample (-10 lines)
Lines 1-10 Link Here
1
rpcuser=myname
2
#rpcpassword=YOU MUST SET A PASSWORD
3
maxconnections=80
4
rpcallowip=127.0.0.1
5
rpcport=17335
6
port=17333
7
server=1
8
daemon=1
9
listen=1
10
logtimestamps=1
(-)net-p2p/zetacoin/files/zetacoin.in (-3 / +16 lines)
Lines 37-49 Link Here
37
37
38
required_files=${%%PORTNAME%%_config}
38
required_files=${%%PORTNAME%%_config}
39
command=%%PREFIX%%/bin/%%PORTNAME%%d
39
command=%%PREFIX%%/bin/%%PORTNAME%%d
40
cli_command=%%PREFIX%%/bin/%%PORTNAME%%-cli
40
%%PORTNAME%%_chdir=${%%PORTNAME%%_datadir}
41
%%PORTNAME%%_chdir=${%%PORTNAME%%_datadir}
41
pidfile="${%%PORTNAME%%_datadir}/%%PORTNAME%%d.pid"
42
pidfile="${%%PORTNAME%%_datadir}/%%PORTNAME%%d.pid"
42
stop_cmd=%%PORTNAME%%_stop
43
stop_cmd=%%PORTNAME%%_stop
43
command_args="-conf=${%%PORTNAME%%_config} -datadir=${%%PORTNAME%%_datadir} -noupnp -daemon -pid=${pidfile}"
44
command_args="-conf=${%%PORTNAME%%_config} -datadir=${%%PORTNAME%%_datadir} -noupnp -daemon -pid=${pidfile}"
44
start_precmd="${name}_prestart"
45
start_precmd="${name}_prestart"
45
reindex_cmd=%%PORTNAME%%_reindex
46
reindex_cmd="${name}_reindex"
46
extra_commands="reindex"
47
salvage_cmd="${name}_salvage"
48
extra_commands="reindex salvage"
47
49
48
%%PORTNAME%%_create_datadir()
50
%%PORTNAME%%_create_datadir()
49
{
51
{
Lines 72-78 Link Here
72
    %%PORTNAME%%_requirepidfile
74
    %%PORTNAME%%_requirepidfile
73
75
74
	echo "Stopping ${name}."
76
	echo "Stopping ${name}."
75
	eval ${command} -conf=${%%PORTNAME%%_config} -datadir=${%%PORTNAME%%_datadir} stop
77
	eval ${cli_command} -conf=${%%PORTNAME%%_config} -datadir=${%%PORTNAME%%_datadir} stop
76
	wait_for_pids ${rc_pid}
78
	wait_for_pids ${rc_pid}
77
}
79
}
78
80
Lines 87-90 Link Here
87
	eval ${command} ${command_args}
89
	eval ${command} ${command_args}
88
}
90
}
89
91
92
%%PORTNAME%%_salvage()
93
{
94
	if [ -z "$rc_fast" -a -n "$rc_pid" ]; then
95
	    %%PORTNAME%%_stop
96
	fi
97
98
	echo "Attempting to salvage ${name} walllet."
99
	command_args="${command_args} -salvagewallet"
100
	eval ${command} ${command_args}
101
}
102
90
run_rc_command "$1"
103
run_rc_command "$1"
(-)net-p2p/zetacoin/pkg-help (+18 lines)
Line 0 Link Here
1
The wallet is stored in a Berkeley database file (BDB) (usually
2
~/.zetacoin/wallets/wallet.dat).
3
4
Zetacoin Core can use either BDB 4.8, 5.x or 6.x to create and access the
5
wallet file.
6
7
Wallets created using BDB 4.8 are also accessible by BDB 5.x and 6.x.
8
9
Wallets created using BDB 5.x or 6.x are not accessible by BDB 4.8.
10
11
Opening and using a wallet created by 4.8 with a higher major version (5.x
12
or 6.x) does not change its format, so it will still be accessible to 4.8
13
afterwards. But encrypting an unencrypted wallet recreates it, so encrypting
14
a 4.8 wallet with Zetacoin Core linked against BDB 5.x or 6.x will render it
15
unreadable for Zetacoin Core linked against BDB 4.8.
16
17
If you do not plan on copying the wallet file to another machine that uses
18
BDB 4.8 then it is recommended to use the modern versions of BDB 5.x or 6.x.
(-)net-p2p/zetacoin/pkg-plist (-3 lines)
Lines 1-3 Link Here
1
%%EXECUTABLE_DAEMON%%
2
@sample etc/%%PORTNAME%%.conf.sample
3
%%CLI%%%%EXECUTABLE_CLI%%
(-)net-p2p/zetacoin-daemon/Makefile (+37 lines)
Line 0 Link Here
1
# Created by: Daniel Morante <daniel@morante.net>
2
# $FreeBSD$
3
4
MASTERDIR=	${.CURDIR}/../zetacoin
5
PKGNAMESUFFIX=	-daemon
6
7
COMMENT=	Peer-to-Peer crypto currency with quick transactions (Daemon)
8
9
SLAVE_PORT=	yes
10
11
RUN_DEPENDS+=	zetacoin-cli:net-p2p/zetacoin-utils
12
13
OPTIONS_DEFINE=		DEBUG HARDENING TESTS UPNP ZMQ
14
# WALLET_BDBMODERN is a choice for WALLET, introduced via OPTIONS_RADIO=WALLET
15
# from ${MASTERDIR}/Makefile
16
OPTIONS_DEFAULT=	HARDENING UPNP WALLET_BDBMODERN ZMQ
17
18
USERS=		${PORTNAME}
19
GROUPS=		${PORTNAME}
20
21
CONFIGURE_ARGS=	--with-daemon \
22
		--without-gui \
23
		--without-libs \
24
		--without-qrencode \
25
		--without-utils
26
27
PLIST_FILES=	bin/${PORTNAME}d \
28
		"@sample %%ETCDIR%%.conf.sample"
29
30
USE_RC_SUBR=	${PORTNAME}
31
SUB_LIST+=	PORTNAME=${PORTNAME}
32
SUB_FILES=	pkg-message
33
34
post-install:
35
	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
36
37
.include "${MASTERDIR}/Makefile"
(-)net-p2p/zetacoin-utils/Makefile (+25 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
MASTERDIR=	${.CURDIR}/../zetacoin
4
PKGNAMESUFFIX=	-utils
5
6
COMMENT=	Peer-to-Peer crypto currency with quick transactions (CLI and Utilities)
7
SLAVE_PORT=	yes
8
9
OPTIONS_DEFINE=		DEBUG HARDENING TESTS
10
OPTIONS_RADIO=
11
OPTIONS_DEFAULT=	HARDENING
12
13
PKGHELP=	${NONEXISTENT}
14
15
CONFIGURE_ARGS=	--without-daemon \
16
		--without-gui \
17
		--without-libs \
18
		--without-qrencode \
19
		--without-miniupnpc \
20
		--with-utils \
21
		--disable-wallet
22
23
PLIST_FILES=	bin/${PORTNAME}-cli bin/${PORTNAME}-tx
24
25
.include "${MASTERDIR}/Makefile"

Return to bug 237017