pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

bitcoin: Use debian example config file



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%ir.bbn.com@localhost>
Pushed By:	gdt
Date:		Tue Nov 29 12:30:19 2016 -0500
Changeset:	05d473b7e8ee51cc39b588c69d31b2e958802210

Modified Files:
	bitcoin/Makefile
Removed Files:
	bitcoin/files/bitcoin.conf

Log Message:
bitcoin: Use debian example config file

The config file has no non-comment non-blank lines anyway, so it's
just documentation, and arguably should be empty.  But, the included
one seems newer, and reduces diffs from upstream.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=05d473b7e8ee51cc39b588c69d31b2e958802210

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 bitcoin/Makefile           |   7 ++-
 bitcoin/files/bitcoin.conf | 111 ---------------------------------------------
 2 files changed, 5 insertions(+), 113 deletions(-)

diffs:
diff --git a/bitcoin/Makefile b/bitcoin/Makefile
index 93a68bf..752fe0b 100644
--- a/bitcoin/Makefile
+++ b/bitcoin/Makefile
@@ -2,7 +2,7 @@
 
 # TODO: update to latest release
 DISTNAME=       bitcoin-0.11.2
-PKGREVISION=    4
+PKGREVISION=    5
 CATEGORIES=	finance
 MASTER_SITES=   ${MASTER_SITE_GITHUB:=bitcoin/}
 GITHUB_TAG=     v${PKGVERSION_NOREV}
@@ -71,7 +71,10 @@ do-install:
 	${INSTALL_LIB} -m 644 ${WRKSRC}/src/secp256k1/libsecp256k1.la ${DESTDIR}${PREFIX}/lib/bitcoin
 	${INSTALL_LIB} ${WRKSRC}/src/secp256k1/.libs/libsecp256k1.so.0 ${DESTDIR}${PREFIX}/lib/bitcoin
 	${LN} -fs ${DESTDIR}${PREFIX}/lib/bitcoin/libsecp256k1.so.0 ${DESTDIR}${PREFIX}/lib/bitcoin/libsecp256k1.so
-	${INSTALL_DATA} -m 600 ${FILESDIR}/bitcoin.conf ${DESTDIR}${EGDIR}
+
+# Use the Debian example config file.
+post-install:
+	${INSTALL_DATA} -m 600 ${WRKSRC}/contrib/debian/examples/bitcoin.conf ${DESTDIR}${EGDIR}
 
 .include "options.mk"
 
diff --git a/bitcoin/files/bitcoin.conf b/bitcoin/files/bitcoin.conf
deleted file mode 100644
index b175a06..0000000
--- a/bitcoin/files/bitcoin.conf
+++ /dev/null
@@ -1,111 +0,0 @@
-# bitcoin.conf configuration file. Lines beginning with # are comments.
-
-
-# Network-related settings:
-
-# Run on the test network instead of the real bitcoin network.
-#testnet=0
-
-# Connect via a socks4 proxy
-#proxy=127.0.0.1:9050
-
-##############################################################
-##            Quick Primer on addnode vs connect            ##
-##  Let's say for instance you use addnode=4.2.2.4          ##
-##  addnode will connect you to and tell you about the      ##
-##    nodes connected to 4.2.2.4.  In addition it will tell ##
-##    the other nodes connected to it that you exist so     ##
-##    they can connect to you.                              ##
-##  connect will not do the above when you 'connect' to it. ##
-##    It will *only* connect you to 4.2.2.4 and no one else.##
-##                                                          ##
-##  So if you're behind a firewall, or have other problems  ##
-##  finding nodes, add some using 'addnode'.                ##
-##                                                          ##
-##  If you want to stay private, use 'connect' to only      ##
-##  connect to "trusted" nodes.                             ##
-##                                                          ##
-##  If you run multiple nodes on a LAN, there's no need for ##
-##  all of them to open lots of connections.  Instead       ##
-##  'connect' them all to one node that is port forwarded   ##
-##  and has lots of connections.                            ##
-##       Thanks goes to [Noodle] on Freenode.               ##
-##############################################################
-
-# Use as many addnode= settings as you like to connect to specific peers
-#addnode=69.164.218.197
-#addnode=10.0.0.2:8333
-
-# ... or use as many connect= settings as you like to connect ONLY
-# to specific peers:
-#connect=69.164.218.197
-#connect=10.0.0.1:8333
-
-
-# Maximum number of inbound+outbound connections.
-#maxconnections=
-
-
-# JSON-RPC options (for controlling a running Bitcoin/bitcoind process)
-
-# server=1 tells Bitcoin-QT to accept JSON-RPC commands.
-#server=0
-
-# You must set rpcuser and rpcpassword to secure the JSON-RPC api
-#rpcuser=Ulysseys
-#rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
-
-# How many seconds bitcoin will wait for a complete RPC HTTP request.
-# after the HTTP connection is established. 
-#rpctimeout=30
-
-# By default, only RPC connections from localhost are allowed.  Specify
-# as many rpcallowip= settings as you like to allow connections from
-# other hosts (and you may use * as a wildcard character).
-# NOTE: opening up the RPC port to hosts outside your local
-# trusted network is NOT RECOMMENDED, because the rpcpassword
-# is transmitted over the network unencrypted.
-#rpcallowip=10.1.1.34
-#rpcallowip=192.168.1.*
-
-# Listen for RPC connections on this TCP port:
-#rpcport=8332
-
-# You can use Bitcoin or bitcoind to send commands to Bitcoin/bitcoind
-# running on another host using this option:
-#rpcconnect=127.0.0.1
-
-# Use Secure Sockets Layer (also known as TLS or HTTPS) to communicate
-# with Bitcoin -server or bitcoind
-#rpcssl=1
-
-# OpenSSL settings used when rpcssl=1
-#rpcsslciphers=TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH
-#rpcsslcertificatechainfile=server.cert
-#rpcsslprivatekeyfile=server.pem
-
-
-# Miscellaneous options
-
-# Set gen=1 to attempt to generate bitcoins
-#gen=0
- 
-# Pre-generate this many public/private key pairs, so wallet backups will be valid for
-# both prior transactions and several dozen future transactions.
-#keypool=100
-
-# Pay an optional transaction fee every time you send bitcoins.  Transactions with fees
-# are more likely than free transactions to be included in generated blocks, so may
-# be validated sooner.
-#paytxfee=0.00
-
-# Allow direct connections for the 'pay via IP address' feature.
-#allowreceivebyip=1
-  
-# User interface options
-
-# Start Bitcoin minimized
-#min=1
-
-# Minimize to the system tray
-#minimizetotray=1


Home | Main Index | Thread Index | Old Index