From 920deb1b0ace2523332d6cd59a35447cddf4119918f4f173ec78d42ab191ea24 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 11 Jul 2019 13:42:03 +0000 Subject: [PATCH] Accepting request 714642 from home:develop7:branches:network:cryptocurrencies Update to version 0.18.0 OBS-URL: https://build.opensuse.org/request/show/714642 OBS-URL: https://build.opensuse.org/package/show/network:cryptocurrencies/bitcoin?expand=0&rev=21 --- bitcoin-0.17.1.tar.gz | 3 - bitcoin-0.18.0.tar.gz | 3 + bitcoin.changes | 6 ++ bitcoin.conf | 144 ++++++++++++++++++++++++++++++++++++++++++ bitcoin.spec | 26 ++++---- 5 files changed, 166 insertions(+), 16 deletions(-) delete mode 100644 bitcoin-0.17.1.tar.gz create mode 100644 bitcoin-0.18.0.tar.gz create mode 100644 bitcoin.conf diff --git a/bitcoin-0.17.1.tar.gz b/bitcoin-0.17.1.tar.gz deleted file mode 100644 index d3cb3c3..0000000 --- a/bitcoin-0.17.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d51bae80fc0a460ce752d04097c4a1271a66b55260d53165d82313488117d290 -size 6219440 diff --git a/bitcoin-0.18.0.tar.gz b/bitcoin-0.18.0.tar.gz new file mode 100644 index 0000000..7898359 --- /dev/null +++ b/bitcoin-0.18.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e4e6890e07b620a93fdb24605dae2bb53e8435b2a93d37558e1db1913df405f +size 7253176 diff --git a/bitcoin.changes b/bitcoin.changes index b998a9e..a540867 100644 --- a/bitcoin.changes +++ b/bitcoin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 11 11:41:01 UTC 2019 - Andrei Dziahel + +- Update to version 0.18.0 + See release-notes.md for complete list of changes + ------------------------------------------------------------------- Wed Jul 10 09:51:31 UTC 2019 - matthias.gerstner@suse.com diff --git a/bitcoin.conf b/bitcoin.conf new file mode 100644 index 0000000..811c43d --- /dev/null +++ b/bitcoin.conf @@ -0,0 +1,144 @@ +## +## 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 + +# Run a regression test network +#regtest=0 + +# Connect via a SOCKS5 proxy +#proxy=127.0.0.1:9050 + +# Bind to given address and always listen on it. Use [host]:port notation for IPv6 +#bind= + +# Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6 +#whitebind= + +############################################################## +## 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 + +# Alternatively 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 + +# Listening mode, enabled by default except when 'connect' is being used +#listen=1 + +# Maximum number of inbound+outbound connections. +#maxconnections= + +# +# JSON-RPC options (for controlling a running Bitcoin/bitcoind process) +# + +# server=1 tells Bitcoin-Qt and bitcoind to accept JSON-RPC commands +#server=0 + +# Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. +# This option can be specified multiple times (default: bind to all interfaces) +#rpcbind= + +# If no rpcpassword is set, rpc cookie auth is sought. The default `-rpccookiefile` name +# is .cookie and found in the `-datadir` being used for bitcoind. This option is typically used +# when the server and client are run as the same user. +# +# If not, you must set rpcuser and rpcpassword to secure the JSON-RPC API. +# +# The config option `rpcauth` can be added to server startup argument. It is set at initialization time +# using the output from the script in share/rpcauth/rpcauth.py after providing a username: +# +# ./share/rpcauth/rpcauth.py alice +# String to be appended to bitcoin.conf: +# rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae +# Your password: +# DONT_USE_THIS_YOU_WILL_GET_ROBBED_8ak1gI25KFTvjovL3gAM967mies3E= +# +# On client-side, you add the normal user/password pair to send commands: +#rpcuser=alice +#rpcpassword=DONT_USE_THIS_YOU_WILL_GET_ROBBED_8ak1gI25KFTvjovL3gAM967mies3E= +# +# You can even add multiple entries of these to the server conf file, and client can use any of them: +# rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99 + +# How many seconds bitcoin will wait for a complete RPC HTTP request. +# after the HTTP connection is established. +#rpcclienttimeout=30 + +# By default, only RPC connections from localhost are allowed. +# Specify as many rpcallowip= settings as you like to allow connections from other hosts, +# either as a single IPv4/IPv6 or with a subnet specification. + +# 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. + +# server=1 tells Bitcoin-Qt to accept JSON-RPC commands. +# it is also read by bitcoind to determine if RPC should be enabled +#rpcallowip=10.1.1.34/255.255.255.0 +#rpcallowip=1.2.3.4/24 +#rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96 + +# 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 + +# Wallet options + +# Create transactions that have enough fees so they are likely to begin confirmation within n blocks (default: 6). +# This setting is over-ridden by the -paytxfee option. +#txconfirmtarget=n + +# Pay a transaction fee every time you send bitcoins. +#paytxfee=0.000x + +# Miscellaneous options + +# 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 + +# Enable pruning to reduce storage requirements by deleting old blocks. +# This mode is incompatible with -txindex and -rescan. +# 0 = default (no pruning). +# 1 = allows manual pruning via RPC. +# >=550 = target to stay under in MiB. +#prune=550 + +# User interface options + +# Start Bitcoin minimized +#min=1 + +# Minimize to the system tray +#minimizetotray=1 diff --git a/bitcoin.spec b/bitcoin.spec index d89eacb..003f94a 100644 --- a/bitcoin.spec +++ b/bitcoin.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,7 +24,7 @@ %define consensus 1 %define is_base 1 Name: bitcoin -Version: 0.17.1 +Version: 0.18.0 Release: 0 Summary: P2P Digital Currency License: MIT @@ -33,6 +33,7 @@ URL: https://%{name}.org Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{base}d.service Source3: %{base}d.conf +Source4: %{base}.conf BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -58,6 +59,7 @@ BuildRequires: pkgconfig(python3) %if 0%{?suse_version} > 1315 BuildRequires: libboost_filesystem-devel BuildRequires: libboost_program_options-devel +BuildRequires: libboost_system-devel BuildRequires: libboost_test-devel BuildRequires: libboost_thread-devel %else @@ -187,17 +189,15 @@ export LDFLAGS="-pie" make %{?_smp_mflags} V=1 %check -make %{?_smp_mflags} check +make %{?_smp_mflags} LC_ALL=C.UTF-8 check %install %make_install -install -Dpm 0644 share/pixmaps/%{base}256.png %{buildroot}%{_datadir}/pixmaps/%{name}.png - install -Dpm 0644 doc/man/%{name}d.1 %{buildroot}%{_mandir}/man1/%{name}d.1 install -Dpm 0644 doc/man/%{name}-qt.1 %{buildroot}%{_mandir}/man1/%{name}-qt.1 -install -Dpm 0644 share/examples/bitcoin.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf +install -Dpm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf %if !%{is_base} sed -i "s/%{base}/%{name}/g" %{SOURCE1} @@ -254,28 +254,28 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{name}d.conf >/dev/null 2>&1 || : %files qt5 %license COPYING -%doc README.md doc/release-notes.md +%doc doc/README.md doc/release-notes.md %{_bindir}/%{name}-qt %{_mandir}/man1/%{name}-qt.1%{?ext_man} -%{_datadir}/pixmaps/%{name}.png %files utils %license COPYING -%doc README.md doc/release-notes.md +%doc doc/README.md doc/release-notes.md %{_bindir}/%{name}-cli %{_bindir}/%{name}-tx +%{_bindir}/%{name}-wallet %{_mandir}/man1/bitcoin-cli.1%{?ext_man} %{_mandir}/man1/bitcoin-tx.1%{?ext_man} %if %{consensus} == 1 %files -n lib%{name}consensus0 %license COPYING -%doc README.md doc/release-notes.md +%doc doc/README.md doc/release-notes.md %{_libdir}/lib%{name}consensus.so.* %files -n lib%{name}consensus-devel %license COPYING -%doc README.md +%doc doc/README.md %{_libdir}/lib%{name}consensus.so %{_includedir}/%{name}consensus.h %{_libdir}/pkgconfig/lib%{name}consensus.pc @@ -283,7 +283,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{name}d.conf >/dev/null 2>&1 || : %files -n %{name}d %license COPYING -%doc README.md doc/release-notes.md +%doc doc/README.md doc/release-notes.md %{_mandir}/man1/%{name}d.1%{?ext_man} %{_bindir}/%{name}d %dir %attr(700,%{name},%{name}) %{_var}/lib/%{name} @@ -295,7 +295,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{name}d.conf >/dev/null 2>&1 || : %files test %license COPYING -%doc README.md doc/release-notes.md +%doc doc/README.md doc/release-notes.md %{_bindir}/test_%{name} %{_bindir}/test_%{name}-qt %{_bindir}/bench_%{name}