From 8c4a60de3bcb5929d530777f750151aab7305666 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 2 May 2023 11:32:17 +0200 Subject: [PATCH 01/10] libbitcoin-blockchain: remove package. The version packaged for Void Linux is extremely outdated. Removing it will help moving from libbitcoin-secp256k1 to bitcoin-core/secp256k1 for providing updated libsecp256k1. --- common/shlibs | 1 - srcpkgs/libbitcoin-blockchain-devel | 1 - srcpkgs/libbitcoin-blockchain/template | 38 -------------------------- srcpkgs/removed-packages/template | 2 ++ 4 files changed, 2 insertions(+), 40 deletions(-) delete mode 120000 srcpkgs/libbitcoin-blockchain-devel delete mode 100644 srcpkgs/libbitcoin-blockchain/template diff --git a/common/shlibs b/common/shlibs index e347aeacd8c5..43259513c004 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3677,7 +3677,6 @@ libbitcoin-explorer.so.0 libbitcoin-explorer-3.5.0_1 libltc.so.11 libltc-1.3.1_1 libbitcoin-consensus.so.0 libbitcoin-consensus-3.5.0_1 libbitcoin-database.so.0 libbitcoin-database-3.5.0_1 -libbitcoin-blockchain.so.0 libbitcoin-blockchain-3.5.0_1 libbitcoin-node.so.0 libbitcoin-node-3.5.0_1 libbitcoin-server.so.0 libbitcoin-server-3.5.0_1 libvpd-2.2.so.2 libvpd-2.2.6_1 diff --git a/srcpkgs/libbitcoin-blockchain-devel b/srcpkgs/libbitcoin-blockchain-devel deleted file mode 120000 index faa9010195a3..000000000000 --- a/srcpkgs/libbitcoin-blockchain-devel +++ /dev/null @@ -1 +0,0 @@ -libbitcoin-blockchain \ No newline at end of file diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template deleted file mode 100644 index 9afd8560a287..000000000000 --- a/srcpkgs/libbitcoin-blockchain/template +++ /dev/null @@ -1,38 +0,0 @@ -# Template file for 'libbitcoin-blockchain' -pkgname=libbitcoin-blockchain -version=3.6.0 -revision=10 -archs="aarch64* ppc64* x86_64*" -build_style=gnu-configure -configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib - --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" -hostmakedepends="autoconf automake libtool m4 pkg-config" -makedepends="boost-devel icu-devel libbitcoin-consensus-devel - libbitcoin-database-devel libbitcoin-secp256k1-devel libbitcoin-system-devel - libpng-devel qrencode-devel" -short_desc="Bitcoin Blockchain Library" -maintainer="Andy Weidenbaum " -license="AGPL-3.0-or-later" -homepage="https://github.com/libbitcoin/libbitcoin-blockchain" -distfiles="https://github.com/libbitcoin/libbitcoin-blockchain/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=18c52ebda4148ab9e6dec62ee8c2d7826b60868f82710f21e40ff0131bc659e0 - -pre_configure() { - ./autogen.sh -} - -post_install() { - vlicense COPYING - vdoc README.md -} - -libbitcoin-blockchain-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 9d87a81fde56..72f8cfe2d9b5 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -268,6 +268,8 @@ replaces=" libantimicrox-devel<=3.1.3_1 libantimicrox<=3.1.3_1 libapp<=20140527_2 + libbitcoin-blockchain<=3.6.0_9 + libbitcoin-blockchain-devel<=3.6.0_9 libco-devel<=20_1 libco<=20_1 libechonest-qt5<=2.3.1_2 From 971cfa7a03e7fc6c10d277955da479594e5be15a Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 2 May 2023 11:47:09 +0200 Subject: [PATCH 02/10] libbitcoin-client: remove package. The version packaged for Void Linux is extremely outdated. Removing it will help moving from libbitcoin-secp256k1 to bitcoin-core/secp256k1 for providing updated libsecp256k1. --- common/shlibs | 1 - srcpkgs/libbitcoin-client-devel | 1 - srcpkgs/libbitcoin-client/template | 37 ------------------------------ srcpkgs/removed-packages/template | 2 ++ 4 files changed, 2 insertions(+), 39 deletions(-) delete mode 120000 srcpkgs/libbitcoin-client-devel delete mode 100644 srcpkgs/libbitcoin-client/template diff --git a/common/shlibs b/common/shlibs index 43259513c004..b5069db32f94 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3671,7 +3671,6 @@ libclxclient.so.3 clxclient-3.9.2_1 libsecp256k1.so.0 libbitcoin-secp256k1-0.1.0.13_1 libbitcoin.so.0 libbitcoin-system-3.5.0_1 libbitcoin-protocol.so.0 libbitcoin-protocol-3.5.0_1 -libbitcoin-client.so.0 libbitcoin-client-3.5.0_1 libbitcoin-network.so.0 libbitcoin-network-3.5.0_1 libbitcoin-explorer.so.0 libbitcoin-explorer-3.5.0_1 libltc.so.11 libltc-1.3.1_1 diff --git a/srcpkgs/libbitcoin-client-devel b/srcpkgs/libbitcoin-client-devel deleted file mode 120000 index b52c6b7d370a..000000000000 --- a/srcpkgs/libbitcoin-client-devel +++ /dev/null @@ -1 +0,0 @@ -libbitcoin-client \ No newline at end of file diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template deleted file mode 100644 index e2bdc9933ec8..000000000000 --- a/srcpkgs/libbitcoin-client/template +++ /dev/null @@ -1,37 +0,0 @@ -# Template file for 'libbitcoin-client' -pkgname=libbitcoin-client -version=3.6.0 -revision=10 -build_style=gnu-configure -configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib - --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples" -hostmakedepends="autoconf automake libtool m4 pkg-config" -makedepends="boost-devel icu-devel libbitcoin-protocol-devel - libbitcoin-secp256k1-devel libbitcoin-system-devel libpng-devel - libsodium-devel qrencode-devel zeromq-devel" -short_desc="Bitcoin Client Query Library" -maintainer="Andy Weidenbaum " -license="AGPL-3.0-or-later" -homepage="https://github.com/libbitcoin/libbitcoin-client" -distfiles="https://github.com/libbitcoin/libbitcoin-client/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=75969ac0a358458491b101cae784de90452883b5684199d3e3df619707802420 - -pre_configure() { - ./autogen.sh -} - -post_install() { - vlicense COPYING - vdoc README.md -} - -libbitcoin-client-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 72f8cfe2d9b5..e9279e9f9d31 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -270,6 +270,8 @@ replaces=" libapp<=20140527_2 libbitcoin-blockchain<=3.6.0_9 libbitcoin-blockchain-devel<=3.6.0_9 + libbitcoin-client<=3.6.0_9 + libbitcoin-client-devel<=3.6.0_9 libco-devel<=20_1 libco<=20_1 libechonest-qt5<=2.3.1_2 From fa94aa621c48a19eb9143329bc8a29f27455b433 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 2 May 2023 11:53:50 +0200 Subject: [PATCH 03/10] libbitcoin-consensus: remove package. The version packaged for Void Linux is extremely outdated. Removing it will help moving from libbitcoin-secp256k1 to bitcoin-core/secp256k1 for providing updated libsecp256k1. --- common/shlibs | 1 - srcpkgs/libbitcoin-consensus-devel | 1 - srcpkgs/libbitcoin-consensus/template | 35 --------------------------- srcpkgs/removed-packages/template | 2 ++ 4 files changed, 2 insertions(+), 37 deletions(-) delete mode 120000 srcpkgs/libbitcoin-consensus-devel delete mode 100644 srcpkgs/libbitcoin-consensus/template diff --git a/common/shlibs b/common/shlibs index b5069db32f94..0e05ed7976c1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3674,7 +3674,6 @@ libbitcoin-protocol.so.0 libbitcoin-protocol-3.5.0_1 libbitcoin-network.so.0 libbitcoin-network-3.5.0_1 libbitcoin-explorer.so.0 libbitcoin-explorer-3.5.0_1 libltc.so.11 libltc-1.3.1_1 -libbitcoin-consensus.so.0 libbitcoin-consensus-3.5.0_1 libbitcoin-database.so.0 libbitcoin-database-3.5.0_1 libbitcoin-node.so.0 libbitcoin-node-3.5.0_1 libbitcoin-server.so.0 libbitcoin-server-3.5.0_1 diff --git a/srcpkgs/libbitcoin-consensus-devel b/srcpkgs/libbitcoin-consensus-devel deleted file mode 120000 index 01eb2cda87c4..000000000000 --- a/srcpkgs/libbitcoin-consensus-devel +++ /dev/null @@ -1 +0,0 @@ -libbitcoin-consensus \ No newline at end of file diff --git a/srcpkgs/libbitcoin-consensus/template b/srcpkgs/libbitcoin-consensus/template deleted file mode 100644 index f9054a45e1b8..000000000000 --- a/srcpkgs/libbitcoin-consensus/template +++ /dev/null @@ -1,35 +0,0 @@ -# Template file for 'libbitcoin-consensus' -pkgname=libbitcoin-consensus -version=3.6.0 -revision=1 -build_style=gnu-configure -configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib - --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" -hostmakedepends="autoconf automake libtool m4 pkg-config" -makedepends="boost-devel libbitcoin-secp256k1-devel" -short_desc="Bitcoin Consensus Library" -maintainer="Andy Weidenbaum " -license="AGPL-3.0-or-later" -homepage="https://github.com/libbitcoin/libbitcoin-consensus" -distfiles="https://github.com/libbitcoin/libbitcoin-consensus/archive/v${version}.tar.gz" -checksum=a4252f40910fcb61da14cf8028bf3824125bacb0fc251491c9bb4e2818065fca - -pre_configure() { - ./autogen.sh -} - -post_install() { - vlicense COPYING - vdoc README.md -} - -libbitcoin-consensus-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index e9279e9f9d31..fc0cc406be9d 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -272,6 +272,8 @@ replaces=" libbitcoin-blockchain-devel<=3.6.0_9 libbitcoin-client<=3.6.0_9 libbitcoin-client-devel<=3.6.0_9 + libbitcoin-consensus<=3.6.0_1 + libbitcoin-consensus-devel<=3.6.0_1 libco-devel<=20_1 libco<=20_1 libechonest-qt5<=2.3.1_2 From 231a042766433b3abb052a642512fd8d913db6fe Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 2 May 2023 11:57:51 +0200 Subject: [PATCH 04/10] libbitcoin-database: remove package. The version packaged for Void Linux is extremely outdated. Removing it will help moving from libbitcoin-secp256k1 to bitcoin-core/secp256k1 for providing updated libsecp256k1. --- common/shlibs | 1 - srcpkgs/libbitcoin-database-devel | 1 - srcpkgs/libbitcoin-database/template | 37 ---------------------------- srcpkgs/removed-packages/template | 2 ++ 4 files changed, 2 insertions(+), 39 deletions(-) delete mode 120000 srcpkgs/libbitcoin-database-devel delete mode 100644 srcpkgs/libbitcoin-database/template diff --git a/common/shlibs b/common/shlibs index 0e05ed7976c1..89f5eefaceb0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3674,7 +3674,6 @@ libbitcoin-protocol.so.0 libbitcoin-protocol-3.5.0_1 libbitcoin-network.so.0 libbitcoin-network-3.5.0_1 libbitcoin-explorer.so.0 libbitcoin-explorer-3.5.0_1 libltc.so.11 libltc-1.3.1_1 -libbitcoin-database.so.0 libbitcoin-database-3.5.0_1 libbitcoin-node.so.0 libbitcoin-node-3.5.0_1 libbitcoin-server.so.0 libbitcoin-server-3.5.0_1 libvpd-2.2.so.2 libvpd-2.2.6_1 diff --git a/srcpkgs/libbitcoin-database-devel b/srcpkgs/libbitcoin-database-devel deleted file mode 120000 index 5ce218e1730a..000000000000 --- a/srcpkgs/libbitcoin-database-devel +++ /dev/null @@ -1 +0,0 @@ -libbitcoin-database \ No newline at end of file diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template deleted file mode 100644 index 552a1eee211c..000000000000 --- a/srcpkgs/libbitcoin-database/template +++ /dev/null @@ -1,37 +0,0 @@ -# Template file for 'libbitcoin-database' -pkgname=libbitcoin-database -version=3.6.0 -revision=10 -archs="aarch64* ppc64* x86_64*" -build_style=gnu-configure -configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib - --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" -hostmakedepends="autoconf automake libtool m4 pkg-config" -makedepends="boost-devel icu-devel libbitcoin-secp256k1-devel - libbitcoin-system-devel libpng-devel qrencode-devel" -short_desc="Bitcoin High Performance Blockchain Database" -maintainer="Andy Weidenbaum " -license="AGPL-3.0-or-later" -homepage="https://github.com/libbitcoin/libbitcoin-database" -distfiles="https://github.com/libbitcoin/libbitcoin-database/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=d65b35745091b93feed61c5665b5a07b404b578e2582640e93c1a01f6b746f5a - -pre_configure() { - ./autogen.sh -} - -post_install() { - vlicense COPYING - vdoc README.md -} - -libbitcoin-database-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index fc0cc406be9d..7cc9f886ecb5 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -274,6 +274,8 @@ replaces=" libbitcoin-client-devel<=3.6.0_9 libbitcoin-consensus<=3.6.0_1 libbitcoin-consensus-devel<=3.6.0_1 + libbitcoin-database<=3.6.0_9 + libbitcoin-database-devel<=3.6.0_9 libco-devel<=20_1 libco<=20_1 libechonest-qt5<=2.3.1_2 From 803a11bb57b0057c48c180d54ec1074239bf5c0e Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 2 May 2023 12:00:44 +0200 Subject: [PATCH 05/10] libbitcoin-explorer: remove package. The version packaged for Void Linux is extremely outdated. Removing it will help moving from libbitcoin-secp256k1 to bitcoin-core/secp256k1 for providing updated libsecp256k1. --- common/shlibs | 1 - srcpkgs/libbitcoin-explorer-devel | 1 - srcpkgs/libbitcoin-explorer/template | 45 ---------------------------- srcpkgs/removed-packages/template | 2 ++ 4 files changed, 2 insertions(+), 47 deletions(-) delete mode 120000 srcpkgs/libbitcoin-explorer-devel delete mode 100644 srcpkgs/libbitcoin-explorer/template diff --git a/common/shlibs b/common/shlibs index 89f5eefaceb0..73a559ccc2ea 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3672,7 +3672,6 @@ libsecp256k1.so.0 libbitcoin-secp256k1-0.1.0.13_1 libbitcoin.so.0 libbitcoin-system-3.5.0_1 libbitcoin-protocol.so.0 libbitcoin-protocol-3.5.0_1 libbitcoin-network.so.0 libbitcoin-network-3.5.0_1 -libbitcoin-explorer.so.0 libbitcoin-explorer-3.5.0_1 libltc.so.11 libltc-1.3.1_1 libbitcoin-node.so.0 libbitcoin-node-3.5.0_1 libbitcoin-server.so.0 libbitcoin-server-3.5.0_1 diff --git a/srcpkgs/libbitcoin-explorer-devel b/srcpkgs/libbitcoin-explorer-devel deleted file mode 120000 index f064c373870a..000000000000 --- a/srcpkgs/libbitcoin-explorer-devel +++ /dev/null @@ -1 +0,0 @@ -libbitcoin-explorer \ No newline at end of file diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template deleted file mode 100644 index dfe13ab89d3c..000000000000 --- a/srcpkgs/libbitcoin-explorer/template +++ /dev/null @@ -1,45 +0,0 @@ -# Template file for 'libbitcoin-explorer' -pkgname=libbitcoin-explorer -version=3.6.0 -revision=10 -build_style=gnu-configure -configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions - --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib - --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" -hostmakedepends="autoconf automake libtool m4 pkg-config" -makedepends="bash-completion boost-devel icu-devel libbitcoin-client-devel - libbitcoin-network-devel libbitcoin-protocol-devel libbitcoin-secp256k1-devel - libbitcoin-system-devel libpng-devel libsodium-devel qrencode-devel - zeromq-devel" -short_desc="Bitcoin Command Line Tool" -maintainer="Andy Weidenbaum " -license="AGPL-3.0-or-later" -homepage="https://github.com/libbitcoin/libbitcoin-explorer" -distfiles="https://github.com/libbitcoin/libbitcoin-explorer/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=e1b3fa2723465f7366a6e8c55e14df53106e90b82cc977db638c78f9bc5c47db -conf_files="/etc/libbitcoin/bx.cfg" - -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" - LDFLAGS="-latomic" -fi - -pre_configure() { - ./autogen.sh -} - -post_install() { - vlicense COPYING - vdoc README.md -} - -libbitcoin-explorer-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 7cc9f886ecb5..442b052d20f9 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -276,6 +276,8 @@ replaces=" libbitcoin-consensus-devel<=3.6.0_1 libbitcoin-database<=3.6.0_9 libbitcoin-database-devel<=3.6.0_9 + libbitcoin-explorer<=3.6.0_9 + libbitcoin-explorer-devel<=3.6.0_9 libco-devel<=20_1 libco<=20_1 libechonest-qt5<=2.3.1_2 From 22f60f1e1338029c826b09fa5de92bd4459d90b6 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 2 May 2023 12:04:39 +0200 Subject: [PATCH 06/10] libbitcoin-network: remove package. The version packaged for Void Linux is extremely outdated. Removing it will help moving from libbitcoin-secp256k1 to bitcoin-core/secp256k1 for providing updated libsecp256k1. --- common/shlibs | 1 - srcpkgs/libbitcoin-network-devel | 1 - .../patches/boost-1.80.patch | 76 ------------------- srcpkgs/libbitcoin-network/template | 36 --------- srcpkgs/removed-packages/template | 2 + 5 files changed, 2 insertions(+), 114 deletions(-) delete mode 120000 srcpkgs/libbitcoin-network-devel delete mode 100644 srcpkgs/libbitcoin-network/patches/boost-1.80.patch delete mode 100644 srcpkgs/libbitcoin-network/template diff --git a/common/shlibs b/common/shlibs index 73a559ccc2ea..08be1c7daa29 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3671,7 +3671,6 @@ libclxclient.so.3 clxclient-3.9.2_1 libsecp256k1.so.0 libbitcoin-secp256k1-0.1.0.13_1 libbitcoin.so.0 libbitcoin-system-3.5.0_1 libbitcoin-protocol.so.0 libbitcoin-protocol-3.5.0_1 -libbitcoin-network.so.0 libbitcoin-network-3.5.0_1 libltc.so.11 libltc-1.3.1_1 libbitcoin-node.so.0 libbitcoin-node-3.5.0_1 libbitcoin-server.so.0 libbitcoin-server-3.5.0_1 diff --git a/srcpkgs/libbitcoin-network-devel b/srcpkgs/libbitcoin-network-devel deleted file mode 120000 index c46441142504..000000000000 --- a/srcpkgs/libbitcoin-network-devel +++ /dev/null @@ -1 +0,0 @@ -libbitcoin-network \ No newline at end of file diff --git a/srcpkgs/libbitcoin-network/patches/boost-1.80.patch b/srcpkgs/libbitcoin-network/patches/boost-1.80.patch deleted file mode 100644 index fb59ac61723d..000000000000 --- a/srcpkgs/libbitcoin-network/patches/boost-1.80.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- a/src/channel.cpp -+++ b/src/channel.cpp -@@ -147,7 +147,7 @@ void channel::handle_expiration(const co - LOG_DEBUG(LOG_NETWORK) - << "Channel lifetime expired [" << authority() << "]"; - -- stop(error::channel_timeout); -+ stop(error::make_error_code(error::channel_timeout)); - } - - void channel::start_inactivity() -@@ -168,7 +168,7 @@ void channel::handle_inactivity(const co - LOG_DEBUG(LOG_NETWORK) - << "Channel inactivity timeout [" << authority() << "]"; - -- stop(error::channel_timeout); -+ stop(error::make_error_code(error::channel_timeout)); - } - - } // namespace network ---- a/src/proxy.cpp -+++ b/src/proxy.cpp -@@ -150,7 +150,7 @@ void proxy::handle_read_heading(const bo - { - LOG_WARNING(LOG_NETWORK) - << "Invalid heading from [" << authority() << "]"; -- stop(error::bad_stream); -+ stop(error::make_error_code(error::bad_stream)); - return; - } - -@@ -160,7 +160,7 @@ void proxy::handle_read_heading(const bo - LOG_DEBUG(LOG_NETWORK) - << "Invalid heading magic (" << head.magic() << ") from [" - << authority() << "]"; -- stop(error::bad_stream); -+ stop(error::make_error_code(error::bad_stream)); - return; - } - -@@ -170,7 +170,7 @@ void proxy::handle_read_heading(const bo - << "Oversized payload indicated by " << head.command() - << " heading from [" << authority() << "] (" - << head.payload_size() << " bytes)"; -- stop(error::bad_stream); -+ stop(error::make_error_code(error::bad_stream)); - return; - } - -@@ -212,7 +212,7 @@ void proxy::handle_read_payload(const bo - LOG_WARNING(LOG_NETWORK) - << "Invalid " << head.command() << " payload from [" << authority() - << "] bad checksum."; -- stop(error::bad_stream); -+ stop(error::make_error_code(error::bad_stream)); - return; - } - -@@ -250,7 +250,7 @@ void proxy::handle_read_payload(const bo - LOG_WARNING(LOG_NETWORK) - << "Invalid " << head.command() << " payload from [" << authority() - << "] trailing bytes."; -- stop(error::bad_stream); -+ stop(make_error_code(error::bad_stream)); - return; - } - -@@ -333,7 +333,7 @@ void proxy::stop(const code& ec) - - void proxy::stop(const boost_code& ec) - { -- stop(error::boost_to_error_code(ec)); -+ stop(error::make_error_code(error::boost_to_error_code(ec))); - } - - bool proxy::stopped() const diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template deleted file mode 100644 index 2600e50c6096..000000000000 --- a/srcpkgs/libbitcoin-network/template +++ /dev/null @@ -1,36 +0,0 @@ -# Template file for 'libbitcoin-network' -pkgname=libbitcoin-network -version=3.6.0 -revision=10 -build_style=gnu-configure -configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib - --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" -hostmakedepends="autoconf automake libtool m4 pkg-config" -makedepends="boost-devel icu-devel libbitcoin-secp256k1-devel - libbitcoin-system-devel libpng-devel qrencode-devel" -short_desc="Bitcoin P2P Network Library" -maintainer="Andy Weidenbaum " -license="AGPL-3.0-or-later" -homepage="https://github.com/libbitcoin/libbitcoin-network" -distfiles="https://github.com/libbitcoin/libbitcoin-network/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=68d36577d44f7319280c446a5327a072eb20749dfa859c0e1ac768304c9dd93a - -pre_configure() { - ./autogen.sh -} - -post_install() { - vlicense COPYING - vdoc README.md -} - -libbitcoin-network-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 442b052d20f9..268346b169ff 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -278,6 +278,8 @@ replaces=" libbitcoin-database-devel<=3.6.0_9 libbitcoin-explorer<=3.6.0_9 libbitcoin-explorer-devel<=3.6.0_9 + libbitcoin-network<=3.6.0_9 + libbitcoin-network-devel<=3.6.0_9 libco-devel<=20_1 libco<=20_1 libechonest-qt5<=2.3.1_2 From c39d01546c68f6b0b1ff13e295de317626050131 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 2 May 2023 12:06:48 +0200 Subject: [PATCH 07/10] libbitcoin-node: remove package. The version packaged for Void Linux is extremely outdated. Removing it will help moving from libbitcoin-secp256k1 to bitcoin-core/secp256k1 for providing updated libsecp256k1. --- common/shlibs | 1 - srcpkgs/libbitcoin-node-devel | 1 - srcpkgs/libbitcoin-node/template | 40 ------------------------------- srcpkgs/removed-packages/template | 2 ++ 4 files changed, 2 insertions(+), 42 deletions(-) delete mode 120000 srcpkgs/libbitcoin-node-devel delete mode 100644 srcpkgs/libbitcoin-node/template diff --git a/common/shlibs b/common/shlibs index 08be1c7daa29..74aceef37a5c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3672,7 +3672,6 @@ libsecp256k1.so.0 libbitcoin-secp256k1-0.1.0.13_1 libbitcoin.so.0 libbitcoin-system-3.5.0_1 libbitcoin-protocol.so.0 libbitcoin-protocol-3.5.0_1 libltc.so.11 libltc-1.3.1_1 -libbitcoin-node.so.0 libbitcoin-node-3.5.0_1 libbitcoin-server.so.0 libbitcoin-server-3.5.0_1 libvpd-2.2.so.2 libvpd-2.2.6_1 libvpd_cxx-2.2.so.2 libvpd-2.2.6_1 diff --git a/srcpkgs/libbitcoin-node-devel b/srcpkgs/libbitcoin-node-devel deleted file mode 120000 index 373283d34f1b..000000000000 --- a/srcpkgs/libbitcoin-node-devel +++ /dev/null @@ -1 +0,0 @@ -libbitcoin-node \ No newline at end of file diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template deleted file mode 100644 index bbf5ee272453..000000000000 --- a/srcpkgs/libbitcoin-node/template +++ /dev/null @@ -1,40 +0,0 @@ -# Template file for 'libbitcoin-node' -pkgname=libbitcoin-node -version=3.6.0 -revision=10 -archs="aarch64* ppc64* x86_64*" -build_style=gnu-configure -configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions - --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib - --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" -hostmakedepends="autoconf automake libtool m4 pkg-config" -makedepends="bash-completion boost-devel icu-devel libbitcoin-blockchain-devel - libbitcoin-consensus-devel libbitcoin-database-devel libbitcoin-network-devel - libbitcoin-secp256k1-devel libbitcoin-system-devel libpng-devel qrencode-devel" -short_desc="Bitcoin Full Node" -maintainer="Andy Weidenbaum " -license="AGPL-3.0-or-later" -homepage="https://github.com/libbitcoin/libbitcoin-node" -distfiles="https://github.com/libbitcoin/libbitcoin-node/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=9556ee8aab91e893db1cf343883034571153b206ffbbce3e3133c97e6ee4693b -conf_files="/etc/libbitcoin/bn.cfg" - -pre_configure() { - ./autogen.sh -} - -post_install() { - vlicense COPYING - vdoc README.md -} - -libbitcoin-node-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 268346b169ff..8ccd09307a6e 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -280,6 +280,8 @@ replaces=" libbitcoin-explorer-devel<=3.6.0_9 libbitcoin-network<=3.6.0_9 libbitcoin-network-devel<=3.6.0_9 + libbitcoin-node<=3.6.0_9 + libbitcoin-node-devel<=3.6.0_9 libco-devel<=20_1 libco<=20_1 libechonest-qt5<=2.3.1_2 From f50ea40b83af6373948fd23c6bd3eea208cd9331 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 2 May 2023 12:08:24 +0200 Subject: [PATCH 08/10] libbitcoin-protocol: remove package. The version packaged for Void Linux is extremely outdated. Removing it will help moving from libbitcoin-secp256k1 to bitcoin-core/secp256k1 for providing updated libsecp256k1. --- common/shlibs | 1 - srcpkgs/libbitcoin-protocol-devel | 1 - srcpkgs/libbitcoin-protocol/template | 37 ---------------------------- srcpkgs/removed-packages/template | 2 ++ 4 files changed, 2 insertions(+), 39 deletions(-) delete mode 120000 srcpkgs/libbitcoin-protocol-devel delete mode 100644 srcpkgs/libbitcoin-protocol/template diff --git a/common/shlibs b/common/shlibs index 74aceef37a5c..abd9ba6bde52 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3670,7 +3670,6 @@ libclthreads.so.2 clthreads-2.4.2_1 libclxclient.so.3 clxclient-3.9.2_1 libsecp256k1.so.0 libbitcoin-secp256k1-0.1.0.13_1 libbitcoin.so.0 libbitcoin-system-3.5.0_1 -libbitcoin-protocol.so.0 libbitcoin-protocol-3.5.0_1 libltc.so.11 libltc-1.3.1_1 libbitcoin-server.so.0 libbitcoin-server-3.5.0_1 libvpd-2.2.so.2 libvpd-2.2.6_1 diff --git a/srcpkgs/libbitcoin-protocol-devel b/srcpkgs/libbitcoin-protocol-devel deleted file mode 120000 index 9b77587743d3..000000000000 --- a/srcpkgs/libbitcoin-protocol-devel +++ /dev/null @@ -1 +0,0 @@ -libbitcoin-protocol \ No newline at end of file diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template deleted file mode 100644 index 9458a9b2836b..000000000000 --- a/srcpkgs/libbitcoin-protocol/template +++ /dev/null @@ -1,37 +0,0 @@ -# Template file for 'libbitcoin-protocol' -pkgname=libbitcoin-protocol -version=3.6.0 -revision=10 -build_style=gnu-configure -configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib - --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" -hostmakedepends="autoconf automake libtool m4 pkg-config" -makedepends="boost-devel icu-devel libbitcoin-secp256k1-devel - libbitcoin-system-devel libpng-devel libsodium-devel qrencode-devel - zeromq-devel" -short_desc="Bitcoin Blockchain Query Protocol" -maintainer="Andy Weidenbaum " -license="AGPL-3.0-or-later" -homepage="https://github.com/libbitcoin/libbitcoin-protocol" -distfiles="https://github.com/libbitcoin/libbitcoin-protocol/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=fc41c64f6d3ee78bcccb63fd0879775c62bba5326f38c90b4c6804e2b9e8686e - -pre_configure() { - ./autogen.sh -} - -post_install() { - vlicense COPYING - vdoc README.md -} - -libbitcoin-protocol-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 8ccd09307a6e..69223e46822e 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -282,6 +282,8 @@ replaces=" libbitcoin-network-devel<=3.6.0_9 libbitcoin-node<=3.6.0_9 libbitcoin-node-devel<=3.6.0_9 + libbitcoin-protocol<=3.6.0_9 + libbitcoin-protocol-devel<=3.6.0_9 libco-devel<=20_1 libco<=20_1 libechonest-qt5<=2.3.1_2 From ed880a56f4ec364833b54223d40d9af0e0a00bb5 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 2 May 2023 12:10:20 +0200 Subject: [PATCH 09/10] libbitcoin-server: remove package. The version packaged for Void Linux is extremely outdated. Removing it will help moving from libbitcoin-secp256k1 to bitcoin-core/secp256k1 for providing updated libsecp256k1. --- common/shlibs | 1 - srcpkgs/libbitcoin-server-devel | 1 - srcpkgs/libbitcoin-server/template | 42 ------------------------------ srcpkgs/removed-packages/template | 2 ++ 4 files changed, 2 insertions(+), 44 deletions(-) delete mode 120000 srcpkgs/libbitcoin-server-devel delete mode 100644 srcpkgs/libbitcoin-server/template diff --git a/common/shlibs b/common/shlibs index abd9ba6bde52..825d8906c81e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3671,7 +3671,6 @@ libclxclient.so.3 clxclient-3.9.2_1 libsecp256k1.so.0 libbitcoin-secp256k1-0.1.0.13_1 libbitcoin.so.0 libbitcoin-system-3.5.0_1 libltc.so.11 libltc-1.3.1_1 -libbitcoin-server.so.0 libbitcoin-server-3.5.0_1 libvpd-2.2.so.2 libvpd-2.2.6_1 libvpd_cxx-2.2.so.2 libvpd-2.2.6_1 liblcf.so.0 liblcf-0.6.0_1 diff --git a/srcpkgs/libbitcoin-server-devel b/srcpkgs/libbitcoin-server-devel deleted file mode 120000 index 1ac5e3a47201..000000000000 --- a/srcpkgs/libbitcoin-server-devel +++ /dev/null @@ -1 +0,0 @@ -libbitcoin-server \ No newline at end of file diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template deleted file mode 100644 index 186bf2befbcc..000000000000 --- a/srcpkgs/libbitcoin-server/template +++ /dev/null @@ -1,42 +0,0 @@ -# Template file for 'libbitcoin-server' -pkgname=libbitcoin-server -version=3.6.0 -revision=10 -archs="aarch64* ppc64* x86_64*" -build_style=gnu-configure -configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions - --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib - --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" -hostmakedepends="autoconf automake libtool m4 pkg-config" -makedepends="bash-completion boost-devel icu-devel libbitcoin-blockchain-devel - libbitcoin-consensus-devel libbitcoin-database-devel libbitcoin-network-devel - libbitcoin-node-devel libbitcoin-protocol-devel libbitcoin-secp256k1-devel - libbitcoin-system-devel libpng-devel libsodium-devel qrencode-devel - zeromq-devel" -short_desc="Bitcoin Full Node and Query Server" -maintainer="Andy Weidenbaum " -license="AGPL-3.0-or-later" -homepage="https://github.com/libbitcoin/libbitcoin-server" -distfiles="https://github.com/libbitcoin/libbitcoin-server/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=283fa7572fcde70a488c93e8298e57f7f9a8e8403e209ac232549b2c433674e1 -conf_files="/etc/libbitcoin/bs.cfg" - -pre_configure() { - ./autogen.sh -} - -post_install() { - vlicense COPYING - vdoc README.md -} - -libbitcoin-server-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 69223e46822e..cd70f05ab23f 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -284,6 +284,8 @@ replaces=" libbitcoin-node-devel<=3.6.0_9 libbitcoin-protocol<=3.6.0_9 libbitcoin-protocol-devel<=3.6.0_9 + libbitcoin-server<=3.6.0_9 + libbitcoin-server-devel<=3.6.0_9 libco-devel<=20_1 libco<=20_1 libechonest-qt5<=2.3.1_2 From 7e28643dd3ef6bea1c072b2185f9cca82721ec3b Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 2 May 2023 12:14:05 +0200 Subject: [PATCH 10/10] libbitcoin-system: remove package. The version packaged for Void Linux is extremely outdated. Removing it will help moving from libbitcoin-secp256k1 to bitcoin-core/secp256k1 for providing updated libsecp256k1. --- common/shlibs | 1 - srcpkgs/libbitcoin-system-devel | 1 - .../patches/boost-1.80.patch | 79 ------------------- srcpkgs/libbitcoin-system/patches/gcc12.patch | 10 --- srcpkgs/libbitcoin-system/template | 37 --------- srcpkgs/removed-packages/template | 2 + 6 files changed, 2 insertions(+), 128 deletions(-) delete mode 120000 srcpkgs/libbitcoin-system-devel delete mode 100644 srcpkgs/libbitcoin-system/patches/boost-1.80.patch delete mode 100644 srcpkgs/libbitcoin-system/patches/gcc12.patch delete mode 100644 srcpkgs/libbitcoin-system/template diff --git a/common/shlibs b/common/shlibs index 825d8906c81e..da8b12690cb6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3669,7 +3669,6 @@ libdwarves_reorganize.so.1 pahole-1.12_1 libclthreads.so.2 clthreads-2.4.2_1 libclxclient.so.3 clxclient-3.9.2_1 libsecp256k1.so.0 libbitcoin-secp256k1-0.1.0.13_1 -libbitcoin.so.0 libbitcoin-system-3.5.0_1 libltc.so.11 libltc-1.3.1_1 libvpd-2.2.so.2 libvpd-2.2.6_1 libvpd_cxx-2.2.so.2 libvpd-2.2.6_1 diff --git a/srcpkgs/libbitcoin-system-devel b/srcpkgs/libbitcoin-system-devel deleted file mode 120000 index 13797e5b5855..000000000000 --- a/srcpkgs/libbitcoin-system-devel +++ /dev/null @@ -1 +0,0 @@ -libbitcoin-system \ No newline at end of file diff --git a/srcpkgs/libbitcoin-system/patches/boost-1.80.patch b/srcpkgs/libbitcoin-system/patches/boost-1.80.patch deleted file mode 100644 index 2d44e24ea5ab..000000000000 --- a/srcpkgs/libbitcoin-system/patches/boost-1.80.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/include/bitcoin/bitcoin/log/file_collector.hpp -+++ b/include/bitcoin/bitcoin/log/file_collector.hpp -@@ -68,14 +68,18 @@ public: - void store_file(boost::filesystem::path const& src_path) override; - - //! Scans the target directory for the files that have already been stored -+ boost::log::sinks::file::scan_result scan_for_files( -+ boost::log::sinks::file::scan_method method, -+ boost::filesystem::path const& pattern) override; - uintmax_t scan_for_files(boost::log::sinks::file::scan_method method, -- boost::filesystem::path const& pattern, unsigned int* counter) override; -+ boost::filesystem::path const& pattern, unsigned int* counter); - - //! The function updates storage restrictions - void update(size_t max_size, size_t min_free_space, size_t max_files); - - //! The function checks if the directory is governed by this collector - bool is_governed(boost::filesystem::path const& dir) const; -+ bool is_in_storage(boost::filesystem::path const & src_path) const override; - - private: - //! Information about a single stored file ---- a/src/log/file_collector.cpp -+++ b/src/log/file_collector.cpp -@@ -357,6 +357,17 @@ void file_collector::store_file(filesyst - - - //! Scans the target directory for the files that have already been stored -+boost::log::sinks::file::scan_result file_collector::scan_for_files( -+ boost::log::sinks::file::scan_method method, -+ filesystem::path const& pattern) -+{ -+ boost::log::sinks::file::scan_result result; -+ unsigned int counter = 0; -+ result.found_count = scan_for_files(method, pattern, &counter); -+ result.last_file_counter = counter; -+ return result; -+} -+ - uintmax_t file_collector::scan_for_files( - boost::log::sinks::file::scan_method method, - filesystem::path const& pattern, unsigned int* counter) -@@ -450,6 +461,15 @@ bool file_collector::is_governed(filesys - return filesystem::equivalent(storage_dir_, dir); - } - -+/* I don't care if this is correct or not */ -+/* upstream removed */ -+bool file_collector::is_in_storage(filesystem::path const& src_path) const -+{ -+ if (!is_governed(src_path.parent_path())) -+ return false; -+ return filesystem::exists(src_path); -+} -+ - filesystem::path file_collector::make_absolute( - filesystem::path const& path) - { ---- a/include/bitcoin/bitcoin/unicode/file_lock.hpp -+++ b/include/bitcoin/bitcoin/unicode/file_lock.hpp -@@ -14,14 +14,11 @@ - #define LIBBITCOIN_INTERPROCESS_FILE_LOCK_HPP - - #include --#include --#include -+#include - #include --#include --#include --#include --#include --#include -+#include -+#include -+#include - #include - - // Includes from bitcoin/unicode.hpp under _MSC_VER. diff --git a/srcpkgs/libbitcoin-system/patches/gcc12.patch b/srcpkgs/libbitcoin-system/patches/gcc12.patch deleted file mode 100644 index 0347ac22d215..000000000000 --- a/srcpkgs/libbitcoin-system/patches/gcc12.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/bitcoin/bitcoin/wallet/dictionary.hpp -+++ b/include/bitcoin/bitcoin/wallet/dictionary.hpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - namespace libbitcoin { - namespace wallet { diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template deleted file mode 100644 index ac13e044c276..000000000000 --- a/srcpkgs/libbitcoin-system/template +++ /dev/null @@ -1,37 +0,0 @@ -# Template file for 'libbitcoin-system' -pkgname=libbitcoin-system -version=3.6.0 -revision=10 -build_style=gnu-configure -configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib - --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png - --with-qrencode --without-examples" -hostmakedepends="autoconf automake libtool m4 pkg-config" -makedepends="boost-devel icu-devel libbitcoin-secp256k1-devel libpng-devel - qrencode-devel" -short_desc="Bitcoin Cross-Platform C++ Development Toolkit" -maintainer="Andy Weidenbaum " -license="AGPL-3.0-or-later" -homepage="https://github.com/libbitcoin/libbitcoin-system" -distfiles="https://github.com/libbitcoin/libbitcoin-system/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=5bcc4c31b53acbc9c0d151ace95d684909db4bf946f8d724f76c711934c6775c - -pre_configure() { - ./autogen.sh -} - -post_install() { - vlicense COPYING - vdoc README.md -} - -libbitcoin-system-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index cd70f05ab23f..637e0ac3a137 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -286,6 +286,8 @@ replaces=" libbitcoin-protocol-devel<=3.6.0_9 libbitcoin-server<=3.6.0_9 libbitcoin-server-devel<=3.6.0_9 + libbitcoin-system<=3.6.0_9 + libbitcoin-system-devel<=3.6.0_9 libco-devel<=20_1 libco<=20_1 libechonest-qt5<=2.3.1_2