From 2c4338ce253c308ad4641b90ccda675e93bc2f0c Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Thu, 4 May 2023 19:02:21 +0200 Subject: [PATCH 1/4] libbitcoin-secp256k1: remove package. An updated version of the libsecp256k1 library is provided via new libsecp256k1 package (bitcoin-core version). --- common/shlibs | 6 +++++ srcpkgs/libbitcoin-secp256k1-devel | 1 - srcpkgs/libbitcoin-secp256k1/template | 35 --------------------------- srcpkgs/removed-packages/template | 1 + 4 files changed, 7 insertions(+), 36 deletions(-) delete mode 120000 srcpkgs/libbitcoin-secp256k1-devel delete mode 100644 srcpkgs/libbitcoin-secp256k1/template diff --git a/common/shlibs b/common/shlibs index da8b12690cb6..fe31bfe223b3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3669,6 +3669,12 @@ 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 +libsecp256k1.so.2 libsecp256k1-0.3.1_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 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-secp256k1-devel b/srcpkgs/libbitcoin-secp256k1-devel deleted file mode 120000 index 527eb8d59d7e..000000000000 --- a/srcpkgs/libbitcoin-secp256k1-devel +++ /dev/null @@ -1 +0,0 @@ -libbitcoin-secp256k1 \ No newline at end of file diff --git a/srcpkgs/libbitcoin-secp256k1/template b/srcpkgs/libbitcoin-secp256k1/template deleted file mode 100644 index 42f5ad1ded0e..000000000000 --- a/srcpkgs/libbitcoin-secp256k1/template +++ /dev/null @@ -1,35 +0,0 @@ -# Template file for 'libbitcoin-secp256k1' -pkgname=libbitcoin-secp256k1 -version=0.1.0.13 -revision=1 -build_style=gnu-configure -configure_args="--disable-benchmark --disable-coverage --disable-jni - --disable-openssl-tests --enable-exhaustive-tests --enable-module-recovery - --enable-tests --with-gnu-ld" -hostmakedepends="autoconf automake libtool m4 pkg-config" -short_desc="Optimized C library for EC operations on curve secp256k1" -maintainer="Andy Weidenbaum " -license="MIT" -homepage="https://github.com/libbitcoin/secp256k1" -distfiles="https://github.com/libbitcoin/secp256k1/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=9e48dbc88d0fb5646d40ea12df9375c577f0e77525e49833fb744d3c2a69e727 - -pre_configure() { - ./autogen.sh -} - -post_install() { - vlicense COPYING - vdoc README.md -} - -libbitcoin-secp256k1-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 ec0ddd9262f1..90d5339e7ef7 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -290,6 +290,7 @@ replaces=" libbitcoin-system-devel<=3.6.0_10 libco-devel<=20_1 libco<=20_1 + libbitcoin-secp256k1<=0.1.0.13_1 libechonest-qt5<=2.3.1_2 libechonest-qt5-devel<=2.3.1_2 libdbusmenu-qt<=0.9.2_4 From 9eda704b27e45ed4defea61d503f98faa11ed35b Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 1 May 2023 17:55:47 +0200 Subject: [PATCH 2/4] New package: libsecp256k1-0.3.1 --- common/shlibs | 1 + srcpkgs/libbitcoin-secp256k1 | 1 + srcpkgs/libsecp256k1-devel | 1 + srcpkgs/libsecp256k1/template | 41 +++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+) create mode 120000 srcpkgs/libbitcoin-secp256k1 create mode 120000 srcpkgs/libsecp256k1-devel create mode 100644 srcpkgs/libsecp256k1/template diff --git a/common/shlibs b/common/shlibs index fe31bfe223b3..d388321ee989 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3668,6 +3668,7 @@ libdwarves_emit.so.1 pahole-1.12_1 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.2 libsecp256k1-0.3.1_1 libsecp256k1.so.0 libbitcoin-secp256k1-0.1.0.13_1 libsecp256k1.so.2 libsecp256k1-0.3.1_1 libbitcoin.so.0 libbitcoin-system-3.5.0_1 diff --git a/srcpkgs/libbitcoin-secp256k1 b/srcpkgs/libbitcoin-secp256k1 new file mode 120000 index 000000000000..1a5b8eebddec --- /dev/null +++ b/srcpkgs/libbitcoin-secp256k1 @@ -0,0 +1 @@ +libsecp256k1 \ No newline at end of file diff --git a/srcpkgs/libsecp256k1-devel b/srcpkgs/libsecp256k1-devel new file mode 120000 index 000000000000..1a5b8eebddec --- /dev/null +++ b/srcpkgs/libsecp256k1-devel @@ -0,0 +1 @@ +libsecp256k1 \ No newline at end of file diff --git a/srcpkgs/libsecp256k1/template b/srcpkgs/libsecp256k1/template new file mode 100644 index 000000000000..31bc89ba72e9 --- /dev/null +++ b/srcpkgs/libsecp256k1/template @@ -0,0 +1,41 @@ +# Template file for 'libsecp256k1' +pkgname=libsecp256k1 +version=0.3.1 +revision=1 +build_style=gnu-configure +configure_args="--disable-benchmark --disable-coverage --enable-experimental + --enable-module-ecdh --enable-module-recovery --enable-tests + --enable-exhaustive-tests --with-gnu-ld" +hostmakedepends="autoconf automake libtool m4 pkg-config" +short_desc="Optimized C library for EC operations on curve secp256k1" +maintainer="Arjan Mossel " +license="MIT" +homepage="https://github.com/bitcoin-core/secp256k1" +distfiles="https://github.com/bitcoin-core/secp256k1/archive/v${version}.tar.gz" +checksum="0e7bb22c29ed6add5e3631e6a9ed0526f3020a20f3b99e6151918fba6cf6affa" + +pre_configure() { + ./autogen.sh +} + +post_install() { + vlicense COPYING + vdoc README.md +} + +libsecp256k1-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 + } +} + +libbitcoin-secp256k1_package() { + depends="libsecp256k1" + short_desc+=" - transitional dummy package" + build_style=meta +} From 871797107f85b0f37a937795686eaf2bade555f5 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 1 May 2023 16:13:03 +0200 Subject: [PATCH 3/4] electrum: update to 4.4.1; use bitcoin-core libsecp256k1 --- srcpkgs/electrum/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template index dcabed755423..702a2ec7c280 100644 --- a/srcpkgs/electrum/template +++ b/srcpkgs/electrum/template @@ -1,14 +1,14 @@ # Template file for 'electrum' pkgname=electrum -version=4.2.0 -revision=3 +version=4.4.1 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools python3-PyQt5-devel-tools" depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx python3-bitstring python3-dnspython python3-ecdsa python3-jsonrpclib python3-protobuf python3-pyaes python3-pycryptodomex python3-PyQt5 - python3-qrcode python3-socks python3-cryptography libbitcoin-secp256k1 - python3-certifi" + python3-qrcode python3-socks python3-cryptography libsecp256k1 + python3-certifi libzbar" # Optional dependencies: # btchip - BTChip hardware wallet support # trezor - TREZOR hardware wallet support @@ -19,8 +19,9 @@ short_desc="Lightweight Bitcoin wallet" maintainer="Charles E. Lehner " license="MIT" homepage="https://electrum.org/" +changelog="https://raw.githubusercontent.com/spesmilo/electrum/master/RELEASE-NOTES" distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz" -checksum=3a24c7ed7a2bb47888f308380b8624a3fff3cf3882fd63d904cd9c3ec543fb3b +checksum=62b7978f880657e272aac23096258e7f9c6a6940731de61c69a4e673f5ac6aa0 post_install() { vsed -i -e 's|electrum %u|electrum|' \ From 8cf706467d558cc958fdee3cc0bec9207c59f74d Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 1 May 2023 19:29:16 +0200 Subject: [PATCH 4/4] Electron-Cash: update to 4.2.14; use bitcoin-core libsecp256k1 --- srcpkgs/Electron-Cash/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template index 38ca3449b093..a858e3d68cea 100644 --- a/srcpkgs/Electron-Cash/template +++ b/srcpkgs/Electron-Cash/template @@ -1,20 +1,20 @@ # Template file for 'Electron-Cash' pkgname=Electron-Cash -version=4.2.10 -revision=3 +version=4.2.14 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools python3-PyQt5-devel-tools" depends="python3-PyQt5 python3-PyQt5-svg python3-qrcode python3-dateutil python3-jsonrpclib python3-protobuf python3-dnspython python3-requests python3-pysocks python3-stem - python3-ecdsa python3-pyaes python3-pycryptodomex libbitcoin-secp256k1 libzbar + python3-ecdsa python3-pyaes python3-pycryptodomex libsecp256k1 libzbar python3-cryptography>=2.6 python3-pathvalidate python3-psutil" short_desc="Lightweight Bitcoin Cash client" maintainer="Orphaned " license="MIT" homepage="https://electroncash.org" distfiles="https://github.com/Electron-Cash/Electron-Cash/releases/download/${version}/Electron-Cash-${version}.tar.gz" -checksum=2c77258c0e8ccdc42d16cd9bdbc26b47f94b92d9ba8a86d63c25a17ec832b324 +checksum=2b987e7074add9631865ee0bd704c4cd8d736945edc5ed038009d00b3aaa2afb make_check=no # Depends on unpackaged SimpleWebSocketServer post_install() {