Attachment 177675 Details for Bug 215059 – combined bitcoin / bitcoin-daemon patches

[patch] combined bitcoin / bitcoin-daemon patches

bitcoin.patch (text/plain), 2.17 KB, created by Christopher Hall on 2016-12-05 04:04:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christopher Hall

Created: 2016-12-05 04:04:44 UTC

Size: 2.17 KB

patch

obsolete

>diff -urN -r net-p2p/bitcoin.ORIG/files/bitcoind.in net-p2p/bitcoin/files/bitcoind.in
>--- net-p2p/bitcoin.ORIG/files/bitcoind.in	2016-11-25 14:11:01.000000000 +0800
>+++ net-p2p/bitcoin/files/bitcoind.in	2016-12-02 11:03:27.241899076 +0800
>@@ -12,7 +12,7 @@
> # bitcoind_user (str)		Set to "bitcoin" by default.
> # bitcoind_group (str)		Set to "bitcoin" by default.
> # bitcoind_conf (str)		Set to "%%PREFIX%%/etc/bitcoind.conf" by default.
>-# bitcoind_data (str)		Set to "/var/lib/bitcoind" by default.
>+# bitcoind_data (str)		Set to "/var/lib/bitcoin" by default.
> # bitcoindlimits_enable (bool)	Set to "NO" by default.
> #				Set it to "YES" to enable bitcoindlimits
> # bitcoindlimits_args		Set to "-e -U ${bitcoind_user}" by default
>@@ -32,7 +32,6 @@
> stop_cmd="bitcoind_stop"
> stop_postcmd="bitcoind_wait"
> command="%%PREFIX%%/bin/bitcoind"
>-cli_command="%%PREFIX%%/bin/bitcoin-cli"
> daemon_command="/usr/sbin/daemon"
> #pidfile="/var/run/${name}.pid"
> extra_commands="configtest"
>@@ -45,7 +44,7 @@
> 
> : ${bitcoind_user:="bitcoin"}
> : ${bitcoind_group:="bitcoin"}
>-: ${bitcoind_data_dir:="/var/db/bitcoind"}
>+: ${bitcoind_data_dir:="/var/db/bitcoin"}
> : ${bitcoind_config_file:="%%PREFIX%%/etc/bitcoin.conf"}
> : ${bitcoindlimits_args:="-e -U ${bitcoind_user}"}
> 
>@@ -134,7 +133,7 @@
>     echo "Bitcoind is not running"
>     return 1
>   else
>-    ${cli_command} -conf="${bitcoind_config_file}" -datadir="${bitcoind_data_dir}" stop
>+    kill ${pid}
>   fi
> }
> 
>diff -urN -r net-p2p/bitcoin-daemon.ORIG/Makefile net-p2p/bitcoin-daemon/Makefile
>--- net-p2p/bitcoin-daemon.ORIG/Makefile	2016-11-23 20:45:46.000000000 +0800
>+++ net-p2p/bitcoin-daemon/Makefile	2016-12-02 11:43:02.473727353 +0800
>@@ -14,6 +14,9 @@
> OPTIONS_DEFINE=		DEBUG HARDENING TESTS UPNP WALLET ZMQ
> OPTIONS_DEFAULT=	HARDENING UPNP WALLET
> 
>+USERS=		bitcoin
>+GROUPS=		bitcoin
>+
> CONFIGURE_ARGS=	--with-daemon \
> 		--without-gui \
> 		--without-libs \
>@@ -21,7 +24,11 @@
> 		--without-utils
> 
> PLIST_FILES=	bin/bitcoind
>+PLIST_FILES+=	"@sample etc/bitcoin.conf.sample"
> 
> USE_RC_SUBR=	bitcoind
> 
>+post-install:
>+	${INSTALL_DATA} ${WRKSRC}/contrib/debian/examples/bitcoin.conf ${STAGEDIR}${PREFIX}/etc/bitcoin.conf.sample
>+
> .include "${MASTERDIR}/Makefile"

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 215059: 177675