diff --git a/README.md b/README.md index 3915d1c..d238a9e 100644 --- a/README.md +++ b/README.md @@ -4,30 +4,33 @@ 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 30.0. +Perform the following steps to prepare the update to a new version. The sample commands below are performed with version 29.0. Generic package update steps: ``` $ rm -f bitcoin-*.tar.gz SHA256SUMS* -$ rpmdev-bumpspec -D -c "Update to 30.0." -n 30.0 bitcoin-core.spec +$ rpmdev-bumpspec -D -c "Update to 29.0." -n 29.0 bitcoin-core.spec $ spectool -g bitcoin-core.spec -Downloading: https://bitcoincore.org/bin/bitcoin-core-30.0/bitcoin-30.0.tar.gz +Downloading: https://bitcoincore.org/bin/bitcoin-core-29.0/bitcoin-29.0.tar.gz 100% of 10.9 MiB |#######################################################| Elapsed Time: 0:00:01 Time: 0:00:01 -Downloaded: bitcoin-30.0.tar.gz -Downloading: https://bitcoincore.org/bin/bitcoin-core-30.0/SHA256SUMS.asc +Downloaded: bitcoin-29.0.tar.gz +Downloading: https://bitcoincore.org/bin/bitcoin-core-29.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-30.0/SHA256SUMS +Downloading: https://bitcoincore.org/bin/bitcoin-core-29.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 +File '/home/slaanesh/workspace/fedora/bitcoin-core/db-4.8.30.NC.tar.gz' already present. ``` -When uploading sources, make sure everything is included even if it has not changed as otherwise will not be available in the Koji build root: +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-30.0.tar.gz SHA256SUMS SHA256SUMS.asc -Uploading: bitcoin-30.0.tar.gz +$ fedpkg new-sources bitcoin-29.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-29.0.tar.gz ######################################################################## 100.0% Uploading: SHA256SUMS ######################################################################## 100.0% @@ -39,12 +42,12 @@ After this, based on the list of keys that have signed the release and that are ``` $ ./bitcoin-gpg.sh Prepare official script to verify releases to work offline... done. -Creating GPG keyring with public keys that have signed release 30.0... done. +Creating GPG keyring with public keys that have signed release 29.0... done. ``` After this, it's time to commit and build: ``` $ git add bitcoin-offline-pubring.gpg -$ git commit -a -m "Update to 30.0" +$ git commit -a -m "Update to 29.0" $ git push $ fedpkg build --nowait ``` diff --git a/README.server.redhat b/README.server.redhat index 310888f..7169b2e 100644 --- a/README.server.redhat +++ b/README.server.redhat @@ -49,8 +49,18 @@ group, then these commands should be sufficient: chown -R bitcoin.bitcoin /etc/bitcoin chmod -R u+rw,g+r,o= /etc/bitcoin -Legeacy wallets ---------------- +Berkeley DB +----------- + +On all platforms, including RHEL/CentOS/Fedora and the upstream build, bitcoin +uses Berkeley DB 4.8. +Oracle makes clear that binary compatibility is not guaranteed even between minor +releases of Berkeley DB. This has implications if you move your wallet to and +from a system with a different Berkeley DB version. + +It is strongly recommended that if you change Berkeley DB versions you first +dump your wallet from the old system into a text file, and then import the +wallet into the new system. To dump or import a wallet from a Bitcoin daemon, you will need to use the bitcoin-cli utility. diff --git a/bitcoin-core.spec b/bitcoin-core.spec index 3a3ca07..a66a061 100644 --- a/bitcoin-core.spec +++ b/bitcoin-core.spec @@ -5,7 +5,7 @@ %bcond_with extended_tests Name: bitcoin-core -Version: 30.2 +Version: 30.1 Release: %autorelease Summary: Peer to Peer Cryptographic Currency License: MIT @@ -136,6 +136,8 @@ Provides: bundled(libmultiprocess) Provides: bundled(secp256k1) Provides: bundled(univalue) +%{?sysusers_requires_compat} + %description server This package provides a stand-alone %{name} daemon. For most users, this package is only needed if they need a full-node without the graphical client. @@ -187,6 +189,11 @@ cp -p %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} . find %{buildroot} -name "*.la" -delete +# TODO: Upstream puts bitcoind in the wrong directory. Need to fix the +# upstream Makefiles to install it in the correct place. +mkdir -p -m 755 %{buildroot}%{_sbindir} +mv %{buildroot}%{_bindir}/bitcoind %{buildroot}%{_sbindir}/bitcoind + # Temporary files mkdir -p %{buildroot}%{_tmpfilesdir} install -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{project_name}.conf @@ -233,6 +240,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{project_name test/functional/test_runner.py --tmpdirprefix `pwd` --extended %endif +%pre +%sysusers_create_compat %{SOURCE11} + %post server %systemd_post %{project_name}.service @@ -299,7 +309,7 @@ test/functional/test_runner.py --tmpdirprefix `pwd` --extended %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/%{project_name} %{_compldir}/%{project_name}d %{_mandir}/man1/%{project_name}d.1* -%{_bindir}/%{project_name}d +%{_sbindir}/%{project_name}d %{_tmpfilesdir}/%{project_name}.conf %{_unitdir}/%{project_name}.service %{_userunitdir}/%{project_name}.service diff --git a/bitcoin-offline-pubring.gpg b/bitcoin-offline-pubring.gpg index c104426..ecd29f5 100644 Binary files a/bitcoin-offline-pubring.gpg and b/bitcoin-offline-pubring.gpg differ diff --git a/bitcoin.service.system b/bitcoin.service.system index 44d109c..003ff32 100644 --- a/bitcoin.service.system +++ b/bitcoin.service.system @@ -4,7 +4,7 @@ Documentation=man:bitcoind(1) After=syslog.target network.target [Service] -ExecStart=/usr/bin/bitcoind -conf=${CONFIG_FILE} -datadir=${DATA_DIR} -pid=${PID_FILE} -debuglogfile=${DEBUG_FILE} $OPTIONS +ExecStart=/usr/sbin/bitcoind -conf=${CONFIG_FILE} -datadir=${DATA_DIR} -pid=${PID_FILE} -debuglogfile=${DEBUG_FILE} $OPTIONS EnvironmentFile=/etc/sysconfig/bitcoin User=bitcoin Group=bitcoin diff --git a/bitcoin.service.user b/bitcoin.service.user index 2abc9fa..4db9378 100644 --- a/bitcoin.service.user +++ b/bitcoin.service.user @@ -3,7 +3,7 @@ Description=Bitcoin daemon Documentation=man:bitcoind(1) [Service] -ExecStart=/usr/bin/bitcoind +ExecStart=/usr/sbin/bitcoind Restart=on-failure TimeoutStopSec=120 diff --git a/changelog b/changelog index 62b1a76..ee0c629 100644 --- a/changelog +++ b/changelog @@ -1,21 +1,6 @@ * Sun Apr 13 2025 Simone Caronni - 29.0-1 - Update to 29.0. -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 28.1-6 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Fri Feb 07 2025 Simone Caronni - 28.1-5 -- Rebuild for updated dependencies. - -* Tue Jan 28 2025 Simone Caronni - 28.1-4 -- Rebuild for updated dependencies. - -* Tue Jan 28 2025 Simone Caronni - 28.1-3 -- Update for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin. - -* Thu Jan 16 2025 Fedora Release Engineering - 28.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - * Sat Jan 11 2025 Simone Caronni - 28.1-1 - Update to 28.1. diff --git a/sources b/sources index 4680f74..57bfb22 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (bitcoin-30.2.tar.gz) = 4fcdb70a016f9ad1b44539f19d61d4c9ce06d92f947be156f8d5de29026aa90a17cea8dcd0bd9bf2f7ad959a4b79d851de95a1c0d2ab87862e04c26cf89f493b -SHA512 (SHA256SUMS) = 99df424cfe37197df15c3e12890ba0b3e9fa00d75f4466f36e220d5d9a361c472d140ce9e7e050181e2a41d39f1af6f0c8fe87e1db9bea7a2fc6000b228aed12 -SHA512 (SHA256SUMS.asc) = 1bb28324b7807eaf8bd828039954698cfdbb4ac79ae09a58f84f798ed9da1178ce57459fd7586e51ab514983531045b2a33a28361e4ba302c5527104d0474d53 +SHA512 (bitcoin-30.1.tar.gz) = fd89386524a517def40a94e91e917208eed79492be092cb13a7dc2be07eff555b621197ac50de2e230fb6939ec4ba1481934c3a6172b1fd4f83d404a50c3fa5d +SHA512 (SHA256SUMS) = 0a4ff990543a523e12adeb80a32e8de7471ff28b3e5e2bdde5e1609d525ce503605c931574279ef0ed6059d53afca83bedb3ccc3c692b7d2e25dcbb7a11517f9 +SHA512 (SHA256SUMS.asc) = 2526db64305d0e1349a7bf48ca1bdf0aad6aa10b29e4877bae0dbc5bff1a152dc3e926105f26684f0c52d8fe447da015d5269dc725574049a42eff54890cb3f2