- Update to version 25.0:

* doc: update release notes for 25.0
  * doc: update manual pages for 25.0
  * build: bump version to v25.0 final
  * doc: update manual pages for v25.0rc2
  * build: bump version to v25.0rc2
  * net_processing: Boost inv trickle rate
  * txmempool: have CompareDepthAndScore sort missing txs first
  * p2p: Avoid prematurely clearing download state for other peers
- Drop 392dc68e.patch

OBS-URL: https://build.opensuse.org/package/show/network:cryptocurrencies/bitcoin?expand=0&rev=53
This commit is contained in:
Martin Pluskal 2023-05-31 09:29:23 +00:00 committed by Git OBS Bridge
parent 286549ff52
commit 8ca6ca19ad
8 changed files with 48 additions and 50 deletions

View File

@ -1,42 +0,0 @@
From fadeb6b103cb441e0e91ef506ef29febabb10715 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Thu, 19 Jan 2023 19:35:43 +0100
Subject: [PATCH] Add missing includes to fix gcc-13 compile error
---
src/support/lockedpool.cpp | 3 +++
src/support/lockedpool.h | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
index fb59324f7a890..8b057433309fe 100644
--- a/src/support/lockedpool.cpp
+++ b/src/support/lockedpool.cpp
@@ -19,6 +19,9 @@
#endif
#include <algorithm>
+#include <limits>
+#include <stdexcept>
+#include <utility>
#ifdef ARENA_DEBUG
#include <iomanip>
#include <iostream>
diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h
index 03e4e371a3a98..66fbc218abfd9 100644
--- a/src/support/lockedpool.h
+++ b/src/support/lockedpool.h
@@ -5,11 +5,11 @@
#ifndef BITCOIN_SUPPORT_LOCKEDPOOL_H
#define BITCOIN_SUPPORT_LOCKEDPOOL_H
-#include <stdint.h>
+#include <cstddef>
#include <list>
#include <map>
-#include <mutex>
#include <memory>
+#include <mutex>
#include <unordered_map>
/**

19
_service Normal file
View File

@ -0,0 +1,19 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="versionformat">@PARENT_TAG@</param>
<param name="url">https://github.com/bitcoin/bitcoin.git</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
<param name="exclude">.*</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="revision">refs/tags/v25.0</param>
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="compression">gz</param>
<param name="file">*.tar</param>
</service>
<service name="set_version" mode="disabled">
<param name="file">bitcoin.spec</param>
</service>
</services>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/bitcoin/bitcoin.git</param>
<param name="changesrevision">8105bce5b384c72cf08b25b7c5343622754e7337</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12d4ad6dfab4767d460d73307e56d13c72997e114fad4f274650f95560f5f2ff
size 11412628

3
bitcoin-25.0.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4bfb64d82bc65e5aaecb400c2da32a34bb9f7693503c5d9617a8cd8ea0bbdb06
size 42999821

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed May 31 09:24:59 UTC 2023 - Martin Pluskal <mpluskal@suse.com>
- Update to version 25.0:
* doc: update release notes for 25.0
* doc: update manual pages for 25.0
* build: bump version to v25.0 final
* doc: update manual pages for v25.0rc2
* build: bump version to v25.0rc2
* net_processing: Boost inv trickle rate
* txmempool: have CompareDepthAndScore sort missing txs first
* p2p: Avoid prematurely clearing download state for other peers
- Drop 392dc68e.patch
-------------------------------------------------------------------
Thu Apr 6 11:56:11 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>

4
bitcoin.obsinfo Normal file
View File

@ -0,0 +1,4 @@
name: bitcoin
version: 25.0
mtime: 1685009439
commit: 8105bce5b384c72cf08b25b7c5343622754e7337

View File

@ -30,18 +30,17 @@
%bcond_without tests
%endif
Name: bitcoin
Version: 24.0.1
Version: 25.0
Release: 0
Summary: P2P Digital Currency
License: MIT
Group: Productivity/Networking/Other
URL: https://%{name}.org
Source0: https://bitcoincore.org/bin/bitcoin-core-%{version}/bitcoin-%{version}.tar.gz
Source0: %{name}-%{version}.tar.gz
Source1: %{base}d.service
Source3: %{base}d.conf
Source4: %{base}.conf
Patch0: harden_bitcoind.service.patch
Patch1: https://github.com/bitcoin/bitcoin/commit/392dc68e.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@ -68,7 +67,7 @@ BuildRequires: pkgconfig(libzmq)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(protobuf)
BuildRequires: pkgconfig(python3)
%{?systemd_requires}
%{?systemd_ordering}
%description
%{name_pretty} is a peer-to-peer electronic cash system
@ -84,7 +83,7 @@ several GB of space, slowly growing.
Summary: An end-user Qt5 GUI for the %{name_pretty} crypto-currency
Group: Development/Libraries/Other
Requires(post): update-desktop-files
Requires(postun):update-desktop-files
Requires(postun): update-desktop-files
%description qt5
%{name_pretty} is a peer-to-peer electronic cash system