diff --git a/common/shlibs b/common/shlibs index 73a559ccc2e..08be1c7daa2 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 c4644114250..00000000000 --- 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 fb59ac61723..00000000000 --- 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 2600e50c609..00000000000 --- 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 65d18351d61..6f1006554a1 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -278,6 +278,8 @@ replaces=" libbitcoin-database-devel<=3.6.0_10 libbitcoin-explorer<=3.6.0_10 libbitcoin-explorer-devel<=3.6.0_10 + libbitcoin-network<=3.6.0_10 + libbitcoin-network-devel<=3.6.0_10 libco-devel<=20_1 libco<=20_1 libechonest-qt5<=2.3.1_2