From 8ca6ca19ad6fd4283b5cf809a381876dba4d7916e0b4b2169fb31dc1be7d958b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 31 May 2023 09:29:23 +0000 Subject: [PATCH] - 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 --- 392dc68e.patch | 42 ------------------------------------------ _service | 19 +++++++++++++++++++ _servicedata | 4 ++++ bitcoin-24.0.1.tar.gz | 3 --- bitcoin-25.0.obscpio | 3 +++ bitcoin.changes | 14 ++++++++++++++ bitcoin.obsinfo | 4 ++++ bitcoin.spec | 9 ++++----- 8 files changed, 48 insertions(+), 50 deletions(-) delete mode 100644 392dc68e.patch create mode 100644 _service create mode 100644 _servicedata delete mode 100644 bitcoin-24.0.1.tar.gz create mode 100644 bitcoin-25.0.obscpio create mode 100644 bitcoin.obsinfo diff --git a/392dc68e.patch b/392dc68e.patch deleted file mode 100644 index 890173f..0000000 --- a/392dc68e.patch +++ /dev/null @@ -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 -+#include -+#include -+#include - #ifdef ARENA_DEBUG - #include - #include -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 -+#include - #include - #include --#include - #include -+#include - #include - - /** diff --git a/_service b/_service new file mode 100644 index 0000000..4cc500f --- /dev/null +++ b/_service @@ -0,0 +1,19 @@ + + + @PARENT_TAG@ + https://github.com/bitcoin/bitcoin.git + git + enable + .* + v(.*) + refs/tags/v25.0 + + + + gz + *.tar + + + bitcoin.spec + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..f953fce --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/bitcoin/bitcoin.git + 8105bce5b384c72cf08b25b7c5343622754e7337 \ No newline at end of file diff --git a/bitcoin-24.0.1.tar.gz b/bitcoin-24.0.1.tar.gz deleted file mode 100644 index 138faef..0000000 --- a/bitcoin-24.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12d4ad6dfab4767d460d73307e56d13c72997e114fad4f274650f95560f5f2ff -size 11412628 diff --git a/bitcoin-25.0.obscpio b/bitcoin-25.0.obscpio new file mode 100644 index 0000000..f79d5a2 --- /dev/null +++ b/bitcoin-25.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bfb64d82bc65e5aaecb400c2da32a34bb9f7693503c5d9617a8cd8ea0bbdb06 +size 42999821 diff --git a/bitcoin.changes b/bitcoin.changes index 4997507..4725d16 100644 --- a/bitcoin.changes +++ b/bitcoin.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed May 31 09:24:59 UTC 2023 - Martin Pluskal + +- 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 diff --git a/bitcoin.obsinfo b/bitcoin.obsinfo new file mode 100644 index 0000000..5c225d2 --- /dev/null +++ b/bitcoin.obsinfo @@ -0,0 +1,4 @@ +name: bitcoin +version: 25.0 +mtime: 1685009439 +commit: 8105bce5b384c72cf08b25b7c5343622754e7337 diff --git a/bitcoin.spec b/bitcoin.spec index e03a622..7fc3391 100644 --- a/bitcoin.spec +++ b/bitcoin.spec @@ -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