Attachment 194233 Details for Bug 226501 – diff_v2

[patch] diff_v2

blackcoind.diff (text/plain), 17.10 KB, created by Krzysztof Jurewicz on 2018-06-13 18:38:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Jurewicz

Created: 2018-06-13 18:38:36 UTC

Size: 17.10 KB

patch

obsolete

>Index: GIDs
>===================================================================
>--- GIDs	(revision 472306)
>+++ GIDs	(working copy)
>@@ -722,7 +722,7 @@
> bitcoin:*:779:
> zetacoin:*:780:
> monero:*:781:
>-# free: 782
>+blackcoin:*:782:
> # free: 783
> # free: 784
> # free: 785
>Index: UIDs
>===================================================================
>--- UIDs	(revision 472306)
>+++ UIDs	(working copy)
>@@ -728,7 +728,7 @@
> bitcoin:*:779:779::0:0:bitcoin Daemon:/var/db/bitcoin:/usr/sbin/nologin
> zetacoin:*:780:780::0:0:ZetaCoin Daemon:/nonexistent:/usr/sbin/nologin
> monero:*:781:781::0:0:Monero Daemon:/var/db/monero:/usr/sbin/nologin
>-# free: 782
>+blackcoin:*:782:782::0:0:BlackCoin Daemon:/var/db/blackcoin:/usr/sbin/nologin
> # free: 783
> # free: 784
> # free: 785
>Index: net-p2p/blackcoind/Makefile
>===================================================================
>--- net-p2p/blackcoind/Makefile	(nonexistent)
>+++ net-p2p/blackcoind/Makefile	(working copy)
>@@ -0,0 +1,44 @@
>+# $FreeBSD$
>+
>+PORTNAME=	blackcoind
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	1.2.5
>+CATEGORIES=	net-p2p finance
>+
>+MAINTAINER=	krzysztof.jurewicz@gmail.com
>+COMMENT=	First 100% PoS cryptocurrency with fair distribution (no GUI)
>+
>+LICENSE=	MIT
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+LIB_DEPENDS=	libboost_system.so:devel/boost-libs\
>+		libdb_cxx-4.8.so:databases/db48\
>+		libminiupnpc.so:net/miniupnpc
>+
>+USES=		bdb:48 gmake ssl
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	CoinBlack
>+GH_PROJECT=	blackcoin
>+
>+MAKEFILE=	makefile.bsd
>+BUILD_WRKSRC=	${WRKSRC}/src
>+INSTALL_WRKSRC=	${WRKSRC}/src
>+INSTALL_TARGET=	install-strip
>+USE_RC_SUBR=	blackcoind
>+SUB_FILES=	pkg-message
>+PLIST_FILES=	bin/blackcoind\
>+		etc/blackcoin.conf.sample
>+
>+USERS=		blackcoin
>+GROUPS=		blackcoin
>+MAKE_ENV=	BDB_INCLUDE_PATH=${BDB_INCLUDE_DIR}\
>+		BDB_LIB_PATH=${BDB_LIB_DIR}\
>+		BOOST_INCLUDE_PATH=${LOCALBASE}/include\
>+		BOOST_LIB_PATH=${LOCALBASE}/lib
>+NO_INSTALL=	yes
>+
>+do-install:
>+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/blackcoind ${STAGEDIR}${PREFIX}/bin/blackcoind
>+	${INSTALL_DATA} ${FILESDIR}/blackcoin.conf.sample ${STAGEDIR}${PREFIX}/etc/blackcoin.conf.sample
>+
>+.include <bsd.port.mk>
>
>Property changes on: net-p2p/blackcoind/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-p2p/blackcoind/distinfo
>===================================================================
>--- net-p2p/blackcoind/distinfo	(nonexistent)
>+++ net-p2p/blackcoind/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1520637414
>+SHA256 (CoinBlack-blackcoin-v1.2.5_GH0.tar.gz) = a3421d2760efcdd488be26a08c11713ff499ef94aba012bb6ceee402b311030e
>+SIZE (CoinBlack-blackcoin-v1.2.5_GH0.tar.gz) = 2499468
>
>Property changes on: net-p2p/blackcoind/distinfo
>___________________________________________________________________
>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: net-p2p/blackcoind/files/blackcoin.conf.sample
>===================================================================
>--- net-p2p/blackcoind/files/blackcoin.conf.sample	(nonexistent)
>+++ net-p2p/blackcoind/files/blackcoin.conf.sample	(working copy)
>@@ -0,0 +1,4 @@
>+rpcuser = user
>+# Put a strong password below.
>+# rpcpassword = not-a-secret
>+rpcallowip = 127.0.0.1
>
>Property changes on: net-p2p/blackcoind/files/blackcoin.conf.sample
>___________________________________________________________________
>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: net-p2p/blackcoind/files/blackcoind.in
>===================================================================
>--- net-p2p/blackcoind/files/blackcoind.in	(nonexistent)
>+++ net-p2p/blackcoind/files/blackcoind.in	(working copy)
>@@ -0,0 +1,171 @@
>+#!/bin/sh
>+# $FreeBSD$
>+
>+# PROVIDE: blackcoind
>+# REQUIRE: LOGIN cleanvar
>+# KEYWORD: shutdown
>+
>+#
>+# Add the following lines to /etc/rc.conf to enable :
>+# blackcoind_enable (bool):	Set to "NO" by default.
>+#				Set it to "YES" to enable blackcoind
>+# blackcoind_user (str)		Set to "blackcoin" by default.
>+# blackcoind_group (str)	Set to "blackcoin" by default.
>+# blackcoind_conf (str)		Set to "%%PREFIX%%/etc/blackcoind.conf" by default.
>+# blackcoind_data_dir (str)	Set to "/var/db/blackcoin" by default.
>+# blackcoindlimits_enable (bool)	Set to "NO" by default.
>+#				Set it to "YES" to enable blackcoindlimits
>+# blackcoindlimits_args		Set to "-e -U ${blackcoind_user}" by default
>+
>+
>+. /etc/rc.subr
>+
>+name="blackcoind"
>+rcvar=blackcoind_enable
>+
>+start_precmd="blackcoind_precmd"
>+start_cmd="blackcoind_start"
>+restart_precmd="blackcoind_checkconfig"
>+reload_precmd="blackcoind_checkconfig"
>+configtest_cmd="blackcoind_checkconfig"
>+status_cmd="blackcoind_status"
>+stop_cmd="blackcoind_stop"
>+stop_postcmd="blackcoind_wait"
>+command="%%PREFIX%%/bin/blackcoind"
>+daemon_command="/usr/sbin/daemon"
>+extra_commands="configtest"
>+
>+
>+: ${blackcoind_enable:="NO"}
>+: ${blackcoindlimits_enable:="NO"}
>+
>+load_rc_config ${name}
>+
>+: ${blackcoind_user:="blackcoin"}
>+: ${blackcoind_group:="blackcoin"}
>+: ${blackcoind_data_dir:="/var/db/blackcoin"}
>+: ${blackcoind_config_file:="%%PREFIX%%/etc/blackcoin.conf"}
>+: ${blackcoindlimits_args:="-e -U ${blackcoind_user}"}
>+
>+# set up dependant variables
>+procname="${command}"
>+pidfile="${blackcoind_data_dir}/blackcoind.pid"
>+required_files="${blackcoind_config_file}"
>+
>+blackcoind_checkconfig()
>+{
>+    echo "Performing sanity check on blackcoind configuration:"
>+    if [ ! -d "${blackcoind_data_dir}" ]
>+    then
>+	echo "Missing data directory: ${blackcoind_data_dir}"
>+	exit 1
>+    fi
>+
>+    if [ ! -f "${blackcoind_config_file}" ]
>+    then
>+	echo "Missing configuration file: ${blackcoind_config_file}"
>+	exit 1
>+    fi
>+    if [ ! -x "${command}" ]
>+    then
>+	echo "Missing executable: ${command}"
>+	exit 1
>+    fi
>+    return 0
>+}
>+
>+blackcoind_cleanup()
>+{
>+    rm -f "${pidfile}"
>+}
>+
>+blackcoind_precmd()
>+{
>+    blackcoind_checkconfig
>+
>+    pid=$(check_pidfile "${pidfile}" "${procname}")
>+    if [ -z "${pid}" ]
>+    then
>+	echo "blackcoind is not running"
>+	rm -f "${pidfile}"
>+    fi
>+
>+    if checkyesno blackcoindlimits_enable
>+    then
>+	eval $(/usr/bin/limits ${blackcoindlimits_args}) 2>/dev/null
>+    else
>+	return 0
>+    fi
>+}
>+
>+blackcoind_status()
>+{
>+    local pid
>+    pid=$(check_pidfile "${pidfile}" "${procname}")
>+    if [ -z "${pid}" ]
>+    then
>+	echo "blackcoind is not running"
>+	return 1
>+    else
>+	echo "blackcoind running, pid: ${pid}"
>+    fi
>+}
>+
>+blackcoind_start()
>+{
>+    echo "Starting blackcoind:"
>+    cd "${blackcoind_data_dir}" || return 1
>+    ${daemon_command} -u "${blackcoind_user}" -p "${pidfile}" \
>+		      ${command} \
>+		      -conf="${blackcoind_config_file}" \
>+		      -datadir="${blackcoind_data_dir}" \
>+		      2> "${blackcoind_data_dir}/blackcoind.stderr" \
>+		      > "${blackcoind_data_dir}/blackcoind.stdout"
>+}
>+
>+blackcoind_stop()
>+{
>+    echo "Stopping blackcoind:"
>+    pid=$(check_pidfile "${pidfile}" "${procname}")
>+    if [ -z "${pid}" ]
>+    then
>+	echo "blackcoind is not running"
>+	return 1
>+    else
>+	kill ${pid}
>+    fi
>+}
>+
>+blackcoind_wait()
>+{
>+    local n=60
>+    echo "Waiting for blackcoind shutdown:"
>+    while :
>+    do
>+	printf '.'
>+	pid=$(check_pidfile "${pidfile}" "${procname}")
>+	if [ -z "${pid}" ]
>+	then
>+	    printf '\n'
>+	    break
>+	fi
>+	sleep 1
>+	n=$((${n} - 1))
>+	if [ ${n} -eq 0 -a -f "${pidfile}" ]
>+	then
>+	    printf "\nForce shutdown"
>+	    kill -9 $(cat "${pidfile}")
>+	    for n in 1 2 3
>+	    do
>+		printf '.'
>+		sleep 1
>+	    done
>+	    printf '\n'
>+	    break
>+	fi
>+    done
>+    rm -f "${pidfile}"
>+    echo "Shutdown complete"
>+}
>+
>+run_rc_command "$1"
>
>Property changes on: net-p2p/blackcoind/files/blackcoind.in
>___________________________________________________________________
>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: net-p2p/blackcoind/files/patch-src_makefile.bsd
>===================================================================
>--- net-p2p/blackcoind/files/patch-src_makefile.bsd	(nonexistent)
>+++ net-p2p/blackcoind/files/patch-src_makefile.bsd	(working copy)
>@@ -0,0 +1,27 @@
>+--- src/makefile.bsd.orig	2018-01-21 08:35:38 UTC
>++++ src/makefile.bsd
>+@@ -24,6 +24,7 @@ endif
>+ # for boost 1.37, add -mt to the boost libraries
>+ LIBS += \
>+  -Wl,-B$(LMODE) \
>++   -l boost_chrono$(BOOST_LIB_SUFFIX) \
>+    -l boost_system$(BOOST_LIB_SUFFIX) \
>+    -l boost_filesystem$(BOOST_LIB_SUFFIX) \
>+    -l boost_program_options$(BOOST_LIB_SUFFIX) \
>+@@ -44,7 +45,6 @@ endif
>+ LIBS+= \
>+  -Wl,-B$(LMODE2) \
>+    -l z \
>+-   -l dl \
>+    -l pthread
>+ 
>+ 
>+@@ -149,7 +149,7 @@ DEFS += $(addprefix -I,$(CURDIR)/leveldb
>+ DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
>+ OBJS += obj/txdb-leveldb.o
>+ leveldb/libleveldb.a:
>+-	@echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..;
>++	@echo "Building LevelDB ..."; cd leveldb && gmake libleveldb.a libmemenv.a && cd ..;
>+ obj/txdb-leveldb.o: leveldb/libleveldb.a
>+ 
>+ # auto-generated dependencies:
>
>Property changes on: net-p2p/blackcoind/files/patch-src_makefile.bsd
>___________________________________________________________________
>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: net-p2p/blackcoind/files/patch-src_pbkdf2.cpp
>===================================================================
>--- net-p2p/blackcoind/files/patch-src_pbkdf2.cpp	(nonexistent)
>+++ net-p2p/blackcoind/files/patch-src_pbkdf2.cpp	(working copy)
>@@ -0,0 +1,19 @@
>+--- src/pbkdf2.cpp.orig	2018-01-21 08:35:38 UTC
>++++ src/pbkdf2.cpp
>+@@ -3,6 +3,7 @@
>+ #include <string.h>
>+ #include "pbkdf2.h"
>+ 
>++#ifndef __FreeBSD__
>+ static inline uint32_t
>+ be32dec(const void *pp)
>+ {
>+@@ -22,7 +23,7 @@ be32enc(void *pp, uint32_t x)
>+     p[1] = (x >> 16) & 0xff;
>+     p[0] = (x >> 24) & 0xff;
>+ }
>+-
>++#endif
>+ 
>+ 
>+ /* Initialize an HMAC-SHA256 operation with the given key. */
>
>Property changes on: net-p2p/blackcoind/files/patch-src_pbkdf2.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: net-p2p/blackcoind/files/patch-src_rpcclient.cpp
>===================================================================
>--- net-p2p/blackcoind/files/patch-src_rpcclient.cpp	(nonexistent)
>+++ net-p2p/blackcoind/files/patch-src_rpcclient.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/rpcclient.cpp.orig	2018-06-13 17:54:06 UTC
>++++ src/rpcclient.cpp
>+@@ -41,7 +41,7 @@ Object CallRPC(const string& strMethod, 
>+     // Connect to localhost
>+     bool fUseSSL = GetBoolArg("-rpcssl", false);
>+     asio::io_service io_service;
>+-    ssl::context context(io_service, ssl::context::sslv23);
>++    ssl::context context(ssl::context::sslv23);
>+     context.set_options(ssl::context::no_sslv2);
>+     asio::ssl::stream<asio::ip::tcp::socket> sslStream(io_service, context);
>+     SSLIOStreamDevice<asio::ip::tcp> d(sslStream, fUseSSL);
>
>Property changes on: net-p2p/blackcoind/files/patch-src_rpcclient.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: net-p2p/blackcoind/files/patch-src_rpcserver.cpp
>===================================================================
>--- net-p2p/blackcoind/files/patch-src_rpcserver.cpp	(nonexistent)
>+++ net-p2p/blackcoind/files/patch-src_rpcserver.cpp	(working copy)
>@@ -0,0 +1,62 @@
>+--- src/rpcserver.cpp.orig	2018-06-13 17:58:14 UTC
>++++ src/rpcserver.cpp
>+@@ -417,8 +417,8 @@ private:
>+ void ServiceConnection(AcceptedConnection *conn);
>+ 
>+ // Forward declaration required for RPCListen
>+-template <typename Protocol, typename SocketAcceptorService>
>+-static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
>++template <typename Protocol>
>++static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor,
>+                              ssl::context& context,
>+                              bool fUseSSL,
>+                              AcceptedConnection* conn,
>+@@ -427,8 +427,8 @@ static void RPCAcceptHandler(boost::shar
>+ /**
>+  * Sets up I/O resources to accept and handle a new connection.
>+  */
>+-template <typename Protocol, typename SocketAcceptorService>
>+-static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
>++template <typename Protocol>
>++static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor,
>+                    ssl::context& context,
>+                    const bool fUseSSL)
>+ {
>+@@ -438,7 +438,7 @@ static void RPCListen(boost::shared_ptr<
>+     acceptor->async_accept(
>+             conn->sslStream.lowest_layer(),
>+             conn->peer,
>+-            boost::bind(&RPCAcceptHandler<Protocol, SocketAcceptorService>,
>++            boost::bind(&RPCAcceptHandler<Protocol>,
>+                 acceptor,
>+                 boost::ref(context),
>+                 fUseSSL,
>+@@ -450,8 +450,8 @@ static void RPCListen(boost::shared_ptr<
>+ /**
>+  * Accept and handle incoming connection.
>+  */
>+-template <typename Protocol, typename SocketAcceptorService>
>+-static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
>++template <typename Protocol>
>++static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor,
>+                              ssl::context& context,
>+                              const bool fUseSSL,
>+                              AcceptedConnection* conn,
>+@@ -520,7 +520,7 @@ void StartRPCThreads()
>+ 
>+     assert(rpc_io_service == NULL);
>+     rpc_io_service = new asio::io_service();
>+-    rpc_ssl_context = new ssl::context(*rpc_io_service, ssl::context::sslv23);
>++    rpc_ssl_context = new ssl::context(ssl::context::sslv23);
>+ 
>+     const bool fUseSSL = GetBoolArg("-rpcssl", false);
>+ 
>+@@ -539,7 +539,7 @@ void StartRPCThreads()
>+         else LogPrintf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string());
>+ 
>+         string strCiphers = GetArg("-rpcsslciphers", "TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH");
>+-        SSL_CTX_set_cipher_list(rpc_ssl_context->impl(), strCiphers.c_str());
>++        SSL_CTX_set_cipher_list(rpc_ssl_context->native_handle(), strCiphers.c_str());
>+     }
>+ 
>+     // Try a dual IPv6/IPv4 socket, falling back to separate IPv4 and IPv6 sockets
>
>Property changes on: net-p2p/blackcoind/files/patch-src_rpcserver.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: net-p2p/blackcoind/files/pkg-message.in
>===================================================================
>--- net-p2p/blackcoind/files/pkg-message.in	(nonexistent)
>+++ net-p2p/blackcoind/files/pkg-message.in	(working copy)
>@@ -0,0 +1,6 @@
>+If you want to run blackcoind as a service, you must create a
>+configuration file at %%PREFIX%%/etc/blackcoin.conf. You may use
>+%%PREFIX%%/etc/blackcoin.conf.sample as a basis. Then add the
>+following line to /etc/rc.conf:
>+
>+blackcoind_enable="YES"
>
>Property changes on: net-p2p/blackcoind/files/pkg-message.in
>___________________________________________________________________
>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: net-p2p/blackcoind/pkg-descr
>===================================================================
>--- net-p2p/blackcoind/pkg-descr	(nonexistent)
>+++ net-p2p/blackcoind/pkg-descr	(working copy)
>@@ -0,0 +1,7 @@
>+BlackCoin is the first cryptocurrency based 100% on the proof of stake
>+security algorithm with fair distribution (no entity privileged).
>+
>+This port includes blackcoind - the daemon and CLI binary (no GUI)
>+compiled from the original codebase (BlackCoin Core).
>+
>+WWW: https://blackcoin.co
>
>Property changes on: net-p2p/blackcoind/pkg-descr
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 226501: 191373 | 194233