From owner-svn-ports-all@freebsd.org  Tue Nov 17 02:36:55 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 91B8647C682;
 Tue, 17 Nov 2020 02:36:55 +0000 (UTC)
 (envelope-from kbowling@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CZqpH3lqNz3G9F;
 Tue, 17 Nov 2020 02:36:55 +0000 (UTC)
 (envelope-from kbowling@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7376818A2B;
 Tue, 17 Nov 2020 02:36:55 +0000 (UTC)
 (envelope-from kbowling@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AH2atDP068061;
 Tue, 17 Nov 2020 02:36:55 GMT (envelope-from kbowling@FreeBSD.org)
Received: (from kbowling@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AH2athm068059;
 Tue, 17 Nov 2020 02:36:55 GMT (envelope-from kbowling@FreeBSD.org)
Message-Id: <202011170236.0AH2athm068059@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kbowling set sender to
 kbowling@FreeBSD.org using -f
From: Kevin Bowling <kbowling@FreeBSD.org>
Date: Tue, 17 Nov 2020 02:36:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r555537 - in head/net-p2p: bitcoin-daemon bitcoin/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: kbowling
X-SVN-Commit-Paths: in head/net-p2p: bitcoin-daemon bitcoin/files
X-SVN-Commit-Revision: 555537
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Nov 2020 02:36:55 -0000

Author: kbowling
Date: Tue Nov 17 02:36:54 2020
New Revision: 555537
URL: https://svnweb.freebsd.org/changeset/ports/555537

Log:
  net-p2p/bitcoin-daemon: Move PID to /var/run
  
  This deconflicts the GUI client, and fixes a permission error for the daemon
  even when running stand alone.
  
  PR:		246792
  Reported by:	Seth586 at protonmail.com, oobaz at frammish.org
  Sponsored by:	BBOX.io

Modified:
  head/net-p2p/bitcoin-daemon/Makefile
  head/net-p2p/bitcoin/files/bitcoind.in

Modified: head/net-p2p/bitcoin-daemon/Makefile
==============================================================================
--- head/net-p2p/bitcoin-daemon/Makefile	Tue Nov 17 02:31:57 2020	(r555536)
+++ head/net-p2p/bitcoin-daemon/Makefile	Tue Nov 17 02:36:54 2020	(r555537)
@@ -25,7 +25,7 @@ PLIST_FILES=	bin/bitcoind \
 
 USE_RC_SUBR=	bitcoind
 
-PORTREVISION=	2
+PORTREVISION=	3
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/bitcoin.conf ${STAGEDIR}${PREFIX}/etc/bitcoin.conf.sample

Modified: head/net-p2p/bitcoin/files/bitcoind.in
==============================================================================
--- head/net-p2p/bitcoin/files/bitcoind.in	Tue Nov 17 02:31:57 2020	(r555536)
+++ head/net-p2p/bitcoin/files/bitcoind.in	Tue Nov 17 02:36:54 2020	(r555537)
@@ -33,7 +33,7 @@ stop_cmd="bitcoind_stop"
 stop_postcmd="bitcoind_wait"
 command="%%PREFIX%%/bin/bitcoind"
 daemon_command="/usr/sbin/daemon"
-#pidfile="/var/run/${name}.pid"
+pidfile="/var/run/${name}.pid"
 extra_commands="configtest"
 
 
@@ -50,7 +50,6 @@ load_rc_config ${name}
 
 # set up dependant variables
 procname="${command}"
-pidfile="${bitcoind_data_dir}/bitcoind.pid"
 required_files="${bitcoind_config_file}"