Attachment 212923 Details for Bug 245220 – remove db48 dependency, make sure we link against the correct bdb if more than one is installed

[patch] remove db48 dependency, make sure we link against the correct bdb if more than one is installed

bitcoin-remove-bdb48-v2.diff (text/plain), 4.78 KB, created by Vasil Dimov on 2020-04-01 09:20:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vasil Dimov

Created: 2020-04-01 09:20:05 UTC

Size: 4.78 KB

patch

obsolete

>Index: bitcoin/Makefile
>===================================================================
>--- bitcoin/Makefile	(revision 530003)
>+++ bitcoin/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	bitcoin
> PORTVERSION=	0.19.0.1
>-PORTREVISION?=	2
>+PORTREVISION?=	3
> CATEGORIES=	net-p2p finance
> MASTER_SITES=	https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/ \
> 		LOCAL/swills:icon
>@@ -41,10 +41,8 @@
> 			bin/test_bitcoin
> .endif
> 
>-OPTIONS_DEFINE?=	DBUS DEBUG HARDENING QRCODES TESTS UPNP ZMQ
>-OPTIONS_RADIO?=		WALLET
>-OPTIONS_RADIO_WALLET?=	WALLET_BDB48 WALLET_BDBMODERN
>-OPTIONS_DEFAULT?=	DBUS HARDENING QRCODES UPNP WALLET_BDBMODERN ZMQ
>+OPTIONS_DEFINE?=	DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET ZMQ
>+OPTIONS_DEFAULT?=	DBUS HARDENING QRCODES UPNP WALLET ZMQ
> OPTIONS_SUB=		yes
> 
> HARDENING_DESC=	Attempt to harden binaries (PIE for ASLR, NX Stack)
>@@ -51,8 +49,6 @@
> QRCODES_DESC=	Display QR Codes
> TESTS_DESC=	Build test binary and unit tests
> WALLET_DESC=	Wallet Management Support
>-WALLET_BDB48_DESC=	Wallet using BDB 4.8
>-WALLET_BDBMODERN_DESC=	Wallet using modern BDB 5.x or 6.x
> ZMQ_DESC=	Block and transaction broadcasting with ZeroMQ
> 
> DBUS_CONFIGURE_WITH=	dbus
>@@ -77,6 +73,15 @@
> QRCODES_CONFIGURE_WITH=	qrencode
> QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
> 
>+WALLET_CONFIGURE_OFF=	--disable-wallet
>+WALLET_CONFIGURE_ON=	--enable-wallet \
>+			--with-incompatible-bdb \
>+			BDB_CFLAGS=-I${BDB_INCLUDE_DIR} \
>+			BDB_LIBS="-L${BDB_LIB_DIR} \
>+				-Wl,-rpath=${BDB_LIB_DIR} \
>+				-l${BDB_LIB_CXX_NAME}"
>+WALLET_USES=		bdb:5+
>+
> ZMQ_CONFIGURE_ENABLE=	zmq
> ZMQ_BUILD_DEPENDS=	libzmq4>0:net/libzmq4
> ZMQ_RUN_DEPENDS=	libzmq4>0:net/libzmq4
>@@ -96,25 +101,8 @@
> PLIST_FILES?=	bin/bitcoin-qt man/man1/bitcoin-qt.1.gz \
> 		share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png
> 
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MWALLET_BDB48}
>-CONFIGURE_ARGS+=	--enable-wallet
>-USES+=			bdb:48
>-.elif ${PORT_OPTIONS:MWALLET_BDBMODERN}
>-CONFIGURE_ARGS+=	--enable-wallet --with-incompatible-bdb
>-USES+=			bdb:5+
>-.else
>-CONFIGURE_ARGS+=	--disable-wallet
>-.endif
>-
> .include <bsd.port.pre.mk>
> 
>-.if ${PORT_OPTIONS:MWALLET_BDB48} || ${PORT_OPTIONS:MWALLET_BDBMODERN}
>-CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
>-LIBS+=		-L${BDB_LIB_DIR}
>-.endif
>-
> .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
> 
> post-install:
>Index: bitcoin/pkg-help
>===================================================================
>--- bitcoin/pkg-help	(revision 530003)
>+++ bitcoin/pkg-help	(nonexistent)
>@@ -1,18 +0,0 @@
>-The wallet is stored in a Berkeley database file (BDB) (usually
>-~/.bitcoin/wallets/wallet.dat).
>-
>-Bitcoin Core can use either BDB 4.8, 5.x or 6.x to create and access the
>-wallet file.
>-
>-Wallets created using BDB 4.8 are also accessible by BDB 5.x and 6.x.
>-
>-Wallets created using BDB 5.x or 6.x are not accessible by BDB 4.8.
>-
>-Opening and using a wallet created by 4.8 with a higher major version (5.x
>-or 6.x) does not change its format, so it will still be accessible to 4.8
>-afterwards. But encrypting an unencrypted wallet recreates it, so encrypting
>-a 4.8 wallet with Bitcoin Core linked against BDB 5.x or 6.x will render it
>-unreadable for Bitcoin Core linked against BDB 4.8.
>-
>-If you do not plan on copying the wallet file to another machine that uses
>-BDB 4.8 then it is recommended to use the modern versions of BDB 5.x or 6.x.
>
>Property changes on: bitcoin/pkg-help
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: bitcoin-daemon/Makefile
>===================================================================
>--- bitcoin-daemon/Makefile	(revision 530003)
>+++ bitcoin-daemon/Makefile	(working copy)
>@@ -7,10 +7,8 @@
> 
> SLAVE_PORT=	yes
> 
>-OPTIONS_DEFINE=		DEBUG HARDENING TESTS UPNP ZMQ
>-# WALLET_BDBMODERN is a choice for WALLET, introduced via OPTIONS_RADIO=WALLET
>-# from ${MASTERDIR}/Makefile
>-OPTIONS_DEFAULT=	HARDENING UPNP WALLET_BDBMODERN ZMQ
>+OPTIONS_DEFINE=		DEBUG HARDENING TESTS UPNP WALLET ZMQ
>+OPTIONS_DEFAULT=	HARDENING UPNP WALLET ZMQ
> 
> USERS=		bitcoin
> GROUPS=		bitcoin
>@@ -27,7 +25,7 @@
> 
> USE_RC_SUBR=	bitcoind
> 
>-PORTREVISION=	1
>+PORTREVISION=	2
> 
> post-install:
> 	${INSTALL_DATA} ${FILESDIR}/bitcoin.conf ${STAGEDIR}${PREFIX}/etc/bitcoin.conf.sample
>Index: bitcoin-utils/Makefile
>===================================================================
>--- bitcoin-utils/Makefile	(revision 530003)
>+++ bitcoin-utils/Makefile	(working copy)
>@@ -7,11 +7,8 @@
> SLAVE_PORT=	yes
> 
> OPTIONS_DEFINE=		DEBUG HARDENING TESTS
>-OPTIONS_RADIO=
> OPTIONS_DEFAULT=	HARDENING TESTS
> 
>-PKGHELP=	${NONEXISTENT}
>-
> CONFIGURE_ARGS=	--without-daemon \
> 		--without-gui \
> 		--without-libs \

Flags:

vd: maintainer-approval? (kbowling)

Actions: View | Diff

Attachments on bug 245220: 212914 | 212923