From 755e305686fde881db31ef76cb0c7dc45d596bff Mon Sep 17 00:00:00 2001
From: rsadowski <rsadowski@openbsd.org>
Date: Thu, 22 Dec 2022 15:32:10 +0000
Subject: [PATCH] Update bitcoin to 24.0.1

---
 net/bitcoin/Makefile                         | 6 +++---
 net/bitcoin/distinfo                         | 4 ++--
 net/bitcoin/patches/patch-configure_ac       | 2 +-
 net/bitcoin/patches/patch-src_wallet_bdb_cpp | 4 ++--
 net/bitcoin/pkg/PLIST                        | 2 --
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/net/bitcoin/Makefile b/net/bitcoin/Makefile
index 1833a7ffb5c..515eb80f755 100644
--- a/net/bitcoin/Makefile
+++ b/net/bitcoin/Makefile
@@ -4,10 +4,10 @@ COMMENT =		P2P payment system
 
 GH_ACCOUNT =		bitcoin
 GH_PROJECT =		bitcoin
-GH_TAGNAME =		v23.0
+GH_TAGNAME =		v24.0.1
 
-SHARED_LIBS +=  bitcoinconsensus          5.0 # 0.0
-SHARED_LIBS +=  secp256k1                 0.2 # 0.0
+SHARED_LIBS +=  bitcoinconsensus          6.0 # 0.0
+SHARED_LIBS +=  secp256k1                 0.1 # 0.0
 
 CATEGORIES =		net
 
diff --git a/net/bitcoin/distinfo b/net/bitcoin/distinfo
index a7706c0b41d..ce94ec876a3 100644
--- a/net/bitcoin/distinfo
+++ b/net/bitcoin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bitcoin-23.0.tar.gz) = JnSL9J1ta0AU0P7cysRr8rzKQunTSzrP2eNGfEFazAU=
-SIZE (bitcoin-23.0.tar.gz) = 10978750
+SHA256 (bitcoin-24.0.1.tar.gz) = EtStbfq0dn1GDXMwflbRPHKZfhFPrU8nRlD5VWD18v8=
+SIZE (bitcoin-24.0.1.tar.gz) = 11412628
diff --git a/net/bitcoin/patches/patch-configure_ac b/net/bitcoin/patches/patch-configure_ac
index ce97510caae..93773df1d52 100644
--- a/net/bitcoin/patches/patch-configure_ac
+++ b/net/bitcoin/patches/patch-configure_ac
@@ -3,7 +3,7 @@ We already uses PIE as default. Unbreak with lld
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
-@@ -945,7 +945,6 @@ if test "$use_hardening" != "no"; then
+@@ -988,7 +988,6 @@ if test "$use_hardening" != "no"; then
    AX_CHECK_LINK_FLAG([-Wl,-z,relro], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,relro"], [], [$LDFLAG_WERROR])
    AX_CHECK_LINK_FLAG([-Wl,-z,now], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"], [], [$LDFLAG_WERROR])
    AX_CHECK_LINK_FLAG([-Wl,-z,separate-code], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,separate-code"], [], [$LDFLAG_WERROR])
diff --git a/net/bitcoin/patches/patch-src_wallet_bdb_cpp b/net/bitcoin/patches/patch-src_wallet_bdb_cpp
index b7141fa89c4..3ed86a09272 100644
--- a/net/bitcoin/patches/patch-src_wallet_bdb_cpp
+++ b/net/bitcoin/patches/patch-src_wallet_bdb_cpp
@@ -1,7 +1,7 @@
 Index: src/wallet/bdb.cpp
 --- src/wallet/bdb.cpp.orig
 +++ src/wallet/bdb.cpp
-@@ -157,7 +157,9 @@ bool BerkeleyEnvironment::Open(bilingual_str& err)
+@@ -159,7 +159,9 @@ bool BerkeleyEnvironment::Open(bilingual_str& err)
      dbenv->set_errfile(fsbridge::fopen(pathErrorFile, "a")); /// debug
      dbenv->set_flags(DB_AUTO_COMMIT, 1);
      dbenv->set_flags(DB_TXN_WRITE_NOSYNC, 1);
@@ -11,7 +11,7 @@ Index: src/wallet/bdb.cpp
      int ret = dbenv->open(strPath.c_str(),
                           DB_CREATE |
                               DB_INIT_LOCK |
-@@ -200,7 +202,9 @@ BerkeleyEnvironment::BerkeleyEnvironment()
+@@ -202,7 +204,9 @@ BerkeleyEnvironment::BerkeleyEnvironment() : m_use_sha
      dbenv->set_lk_max_locks(10000);
      dbenv->set_lk_max_objects(10000);
      dbenv->set_flags(DB_AUTO_COMMIT, 1);
diff --git a/net/bitcoin/pkg/PLIST b/net/bitcoin/pkg/PLIST
index 390da1576fb..bf8d18bb54f 100644
--- a/net/bitcoin/pkg/PLIST
+++ b/net/bitcoin/pkg/PLIST
@@ -35,8 +35,6 @@ lib/pkgconfig/libsecp256k1.pc
 @man man/man1/bitcoin-util.1
 @man man/man1/bitcoin-wallet.1
 @man man/man1/bitcoind.1
-share/bash-completion/
-share/bash-completion/completions/
 share/bash-completion/completions/bitcoin/
 share/bash-completion/completions/bitcoin/bitcoin-cli.bash-completion
 share/bash-completion/completions/bitcoin/bitcoin-tx.bash-completion