diff --git a/.gitignore b/.gitignore index 9056261..883e903 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /bitcoin-24.0.1.tar.gz /bitcoin-24.1.tar.gz /bitcoin-25.0.tar.gz +/bitcoin-25.1.tar.gz diff --git a/README.md b/README.md index 8a25139..ff8bb8a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ The bitcoin-core package. ## Preparing a new update -Perform the following steps to prepare the update to a new version. The sample commands below are performed with version 24.0. +Perform the following steps to prepare the update to a new version. The sample commands below are performed with version 25.0. Generic package update steps: @@ -14,13 +14,13 @@ $ rm -f bitcoin-core-*.tar.gz SHA256SUMS* $ rpmdev-bumpspec -D -c "Update to 25.0." -n 25.0 bitcoin-core.spec $ spectool -g bitcoin-core.spec -Downloading: https://bitcoincore.org/bin/bitcoin-core-24.0/bitcoin-24.0.tar.gz +Downloading: https://bitcoincore.org/bin/bitcoin-core-25.0/bitcoin-25.0.tar.gz 100% of 10.9 MiB |#######################################################| Elapsed Time: 0:00:01 Time: 0:00:01 -Downloaded: bitcoin-24.0.tar.gz -Downloading: https://bitcoincore.org/bin/bitcoin-core-24.0/SHA256SUMS.asc +Downloaded: bitcoin-25.0.tar.gz +Downloading: https://bitcoincore.org/bin/bitcoin-core-25.0/SHA256SUMS.asc 100% of 10.3 KiB |#######################################################| Elapsed Time: 0:00:00 Time: 0:00:00 Downloaded: SHA256SUMS.asc -Downloading: https://bitcoincore.org/bin/bitcoin-core-24.0/SHA256SUMS +Downloading: https://bitcoincore.org/bin/bitcoin-core-25.0/SHA256SUMS 100% of 2.8 KiB |#######################################################| Elapsed Time: 0:00:00 Time: 0:00:00 Downloaded: SHA256SUMS Downloading: https://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz @@ -28,9 +28,9 @@ File '/home/slaanesh/workspace/fedora/bitcoin-core/db-4.8.30.NC.tar.gz' already ``` When uploading sources, make sure the DB tarball is included even if it has not changed as otherwise will not be available in the Koji build root: ``` -$ fedpkg new-sources bitcoin-24.0.tar.gz SHA256SUMS SHA256SUMS.asc db-4.8.30.NC.tar.gz +$ fedpkg new-sources bitcoin-25.0.tar.gz SHA256SUMS SHA256SUMS.asc db-4.8.30.NC.tar.gz File already uploaded: db-4.8.30.NC.tar.gz -Uploading: bitcoin-24.0.tar.gz +Uploading: bitcoin-25.0.tar.gz ######################################################################## 100.0% Uploading: SHA256SUMS ######################################################################## 100.0% diff --git a/bitcoin-core.spec b/bitcoin-core.spec index 450f529..e4a4da3 100644 --- a/bitcoin-core.spec +++ b/bitcoin-core.spec @@ -5,7 +5,7 @@ %bcond_with extended_tests Name: bitcoin-core -Version: 25.0 +Version: 25.1 Release: 1%{?dist} Summary: Peer to Peer Cryptographic Currency License: MIT @@ -57,13 +57,17 @@ BuildRequires: checkpolicy BuildRequires: desktop-file-utils BuildRequires: gnupg2 BuildRequires: libappstream-glib +BuildRequires: libnatpmp-devel BuildRequires: libtool BuildRequires: miniupnpc-devel BuildRequires: procps-ng +%if 0%{?rhel} == 8 +BuildRequires: python3.11 +%else BuildRequires: python3 -BuildRequires: python3-zmq -BuildRequires: pkgconfig(libevent) >= 2.0.21 -BuildRequires: pkgconfig(libevent_pthreads) >= 2.0.21 +%endif +BuildRequires: pkgconfig(libevent) >= 2.1.8 +BuildRequires: pkgconfig(libevent_pthreads) >= 2.1.8 BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libzmq) >= 4 BuildRequires: pkgconfig(sqlite3) >= 3.7.17 @@ -154,7 +158,7 @@ need this package. # Bundled script to verify release signatures using offline pubring: cp %{SOURCE4} . -contrib/verify-binaries/verify.py bin %{SOURCE2} +contrib/verify-binaries/verify.py --min-good-sigs 3 bin %{SOURCE2} %{SOURCE0} # Check the hash of the tarball, not in the same folder where we are now: grep -q $(sha256sum %{SOURCE0}) %{SOURCE2} @@ -336,6 +340,14 @@ exit 0 %{_userunitdir}/%{project_name}.service %changelog +* Fri Oct 20 2023 Simone Caronni - 25.1-1 +- Update to 25.1. + +* Fri Aug 11 2023 Simone Caronni - 25.0-2 +- Adjust verify script invocation. +- Fix build on el8. +- Drop unused build requirement. + * Tue May 30 2023 Simone Caronni - 25.0-1 - Update to 25.0. - Update verification of signatures to use the new bundled script. diff --git a/bitcoin-offline-pubring.gpg b/bitcoin-offline-pubring.gpg index 68262ad..86370d2 100644 Binary files a/bitcoin-offline-pubring.gpg and b/bitcoin-offline-pubring.gpg differ diff --git a/sources b/sources index 0de1a56..071a0ef 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (bitcoin-25.0.tar.gz) = 2be57fc760fa12d291dcf946522838b2e791e24e5dd98de20b5b72af2269269a66539c5bddce590e6cdb6464fd5ecb530cf549edc188ee6f08b4365fdcf850a2 -SHA512 (SHA256SUMS) = 55e5f88ff7493366c490cad5e6a5849db74ee5cef1705dd28c69b23e925a8b6f599ad84154602c6bb9a28feebc7edf4821ea82b717096aa200b66b5d3b0c133c -SHA512 (SHA256SUMS.asc) = bbd571f5492d685d2ea7eb5acc32671c632e23fd1285aa91227d7810471bc14aecdf02164cde0e50e8b174efa77f66630996f1ea61416467dcd55235093ed009 +SHA512 (bitcoin-25.1.tar.gz) = 310e5d976a062496d2b99d0e64c4d5d2b536a747901e887f85b75151d94237f0de800163b534c812d390eb5e93b3f7284cd7f71843ec35e891f34634b6b142ab +SHA512 (SHA256SUMS) = 193154587f3f12dcc09cf1e0dd43abce8fcc7e0bdb5fc44c45469e6aefa196f3deaa67302f651b68ddabfd5e60e8c73a181cb88c84129dbb8937c2acdc7fbb94 +SHA512 (SHA256SUMS.asc) = 11328411025da2a15b9b758441b12e9b317eb7f8bcd2eb5a172fd56f4f512610fa6cbdac59d5bbe8d4c9253164154241515a9357a47f5239861e1d180fd0a7b5 SHA512 (db-4.8.30.NC.tar.gz) = 8d313f1f896e0b0c05cc510c0313324743de3fb660a0bd948c957d5a2d50f1625d8a9a36ec4e6fea09daf1d682dbe1ffccd5c3ec5f066eef72f7525343d0194c