Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Partially revert "srcpkgs/*: remove all cryptocurrency/blockchain packages" #44778

Closed
wants to merge 12 commits into from
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ while not meeting any of the following requirements, is a good candidate for the
In particular, new themes are highly unlikely to be accepted.
Simple shell scripts are unlikely to be accepted unless they provide considerable value to a broad user base.
New fonts may be accepted if they provide value beyond aesthetics (e.g. they contain glyphs for a script missing in already packaged fonts).
Packages related to cryptocurrencies (wallets, miners, nodes, etc) are not accepted.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to remove that to "grandfather-in" the packages you're planning on reinstating; the other categories have such exceptions


Browser forks, including those based on Chromium and Firefox, are generally not accepted.
Such forks require heavy patching, maintenance and hours of build time.
Expand Down
1 change: 1 addition & 0 deletions common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -3670,6 +3670,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.0 libbitcoin-secp256k1-0.1.0.13_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
Expand Down
1 change: 1 addition & 0 deletions srcpkgs/bitcoin-devel
1 change: 1 addition & 0 deletions srcpkgs/bitcoin-qt
22 changes: 22 additions & 0 deletions srcpkgs/bitcoin/patches/fix-test.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Index: bitcoin-22.0/src/wallet/test/init_tests.cpp
===================================================================
--- bitcoin-22.0.orig/src/wallet/test/init_tests.cpp
+++ bitcoin-22.0/src/wallet/test/init_tests.cpp
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(walletinit_verify_w
BOOST_CHECK(result == true);
fs::path walletdir = gArgs.GetArg("-walletdir", "");
fs::path expected_path = fs::canonical(m_walletdir_path_cases["default"]);
- BOOST_CHECK_EQUAL(walletdir, expected_path);
+ BOOST_TEST(fs::equivalent(walletdir, expected_path));
}

BOOST_AUTO_TEST_CASE(walletinit_verify_walletdir_no_trailing2)
@@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE(walletinit_verify_w
BOOST_CHECK(result == true);
fs::path walletdir = gArgs.GetArg("-walletdir", "");
fs::path expected_path = fs::canonical(m_walletdir_path_cases["default"]);
- BOOST_CHECK_EQUAL(walletdir, expected_path);
+ BOOST_TEST(fs::equivalent(walletdir, expected_path));
}

BOOST_AUTO_TEST_SUITE_END()
74 changes: 74 additions & 0 deletions srcpkgs/bitcoin/template
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
revision=5

Check failure on line 4 in srcpkgs/bitcoin/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint

revision should be set to 1 on creation
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
hostmakedepends="automake libtool pkg-config yasm"
makedepends="db-devel boost-devel miniupnpc-devel qt5-tools-devel
libevent-devel qrencode-devel libatomic-devel sqlite-devel"
short_desc="Bitcoin is a peer-to-peer network based digital currency"
maintainer="Daniel A. Maierhofer <git@damadmai.at>"
license="MIT"
homepage="https://bitcoin.org/"
distfiles="https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz
https://raw.githubusercontent.com/bitcoin-core/packaging/${version%.*}.x/debian/bitcoin-qt.desktop
https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png"
checksum="d0e9d089b57048b1555efa7cd5a63a7ed042482045f6f33402b1df425bf9613b
0a46bbadda140599e807be38999e6848c89f9c3523d26fede02d34d62d50f632
ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722"
conflicts="litecoin>=0" # Both provide libbitcoinconsensus.so.0
skip_extraction="bitcoin-qt.desktop bitcoin128.png"

if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools"
fi

pre_configure() {
autoreconf -fi
case "$XBPS_TARGET_MACHINE" in
aarch64*)
CFLAGS=${CFLAGS/armv8-a/armv8-a+crc+crypto}
CXXFLAGS=${CXXFLAGS/armv8-a/armv8-a+crc+crypto}
;;
esac
}

pre_build() {
export BITCOIN_GENBUILD_NO_GIT=1
}

post_install() {
rm "${DESTDIR}"/usr/bin/{test,bench}_bitcoin

for b in bitcoind bitcoin-cli bitcoin-tx; do
vcompletion contrib/${b}.bash-completion bash $b
done

vlicense COPYING
}

bitcoin-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
vdoc doc/shared-libraries.md # Provides information on libbitcoinconsensus
}
}

bitcoin-qt_package() {
depends="desktop-file-utils"
short_desc+=" - QT GUI"
pkg_install() {
vmove usr/bin/bitcoin-qt
vmove usr/share/man/man1/bitcoin-qt.1
vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/bitcoin-qt.desktop 644 usr/share/applications
vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/bitcoin128.png 644 usr/share/pixmaps
vlicense COPYING
rm "${DESTDIR}"/usr/bin/test_bitcoin-qt
}
}
2 changes: 2 additions & 0 deletions srcpkgs/bitcoin/update
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
site="https://bitcoin.org/bin/"
pattern='bitcoin-core-\K[\d.]+'
3 changes: 3 additions & 0 deletions srcpkgs/electrum/files/README.voidlinux
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Some optional packages must be installed for additional functionality:

- python3-matplotlib: plot transaction history in graphical mode
31 changes: 31 additions & 0 deletions srcpkgs/electrum/template
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Template file for 'electrum'
pkgname=electrum
version=4.2.0
revision=3

Check failure on line 4 in srcpkgs/electrum/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint

revision should be set to 1 on creation
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"
# Optional dependencies:
# btchip - BTChip hardware wallet support
# trezor - TREZOR hardware wallet support
# keepkey - KeepKey hardware wallet support
# qdarkstyle - Dark theme
checkdepends="$depends python3-pytest"
short_desc="Lightweight Bitcoin wallet"
maintainer="Charles E. Lehner <cel@celehner.com>"
license="MIT"
homepage="https://electrum.org/"
distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
checksum=3a24c7ed7a2bb47888f308380b8624a3fff3cf3882fd63d904cd9c3ec543fb3b

post_install() {
vsed -i -e 's|electrum %u|electrum|' \
-e 's|testnet %u|testnet|' \
${DESTDIR}/usr/share/applications/electrum.desktop
vlicense LICENCE
vdoc "${FILESDIR}/README.voidlinux"
}
3 changes: 3 additions & 0 deletions srcpkgs/electrum/update
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
site="https://download.electrum.org"
pattern='<a href="\K[\d.]+(?=/">)'

1 change: 1 addition & 0 deletions srcpkgs/libbitcoin-secp256k1-devel
35 changes: 35 additions & 0 deletions srcpkgs/libbitcoin-secp256k1/template
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# 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 <atweiden@tutanota.de>"
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
}
}
10 changes: 3 additions & 7 deletions srcpkgs/removed-packages/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1.20230627
revision=2
version=0.1.20230701
revision=12

Check failure on line 4 in srcpkgs/removed-packages/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint

revision should be set to 1 on update
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
Expand Down Expand Up @@ -40,7 +40,6 @@
avogadro<=1.2.0_9
beignet<=1.3.2_10
bgc<=1.0.1_1
bitcoin<=22.0_5
bokken<=1.8_3
bomi<=0.9.11_17
burp-client<=1.4.40_13
Expand Down Expand Up @@ -106,7 +105,6 @@
electron7<=7.3.3_1
electron9<=9.4.1_1
electrum-ltc<=3.3.8.1_4
electrum<=4.2.0_3
emacs-gtk2<=27.2_1
empathy<=3.12.14_4
enventor<=1.0.0_2
Expand Down Expand Up @@ -146,9 +144,9 @@
gnome-recipes<=2.0.4_2
gnome-shell-mousewheel-zoom<=0.8.0_2
gnome-twitch<=0.4.2_2
go-ethereum<=1.10.1_2
go-gdm<=1.4_7
go-langserver<=2.0.0_1
go-ethereum<=1.10.1_2
go1.4-bootstrap<=20171003_2
goat<=0.0.0.28022016_10
goffice0.8<=0.8.17_6
Expand Down Expand Up @@ -299,8 +297,6 @@
libbitcoin-node<=3.6.0_10
libbitcoin-protocol-devel<=3.6.0_10
libbitcoin-protocol<=3.6.0_10
libbitcoin-secp256k1-devel<=0.1.0.13_1
libbitcoin-secp256k1<=0.1.0.13_1
libbitcoin-server-devel<=3.6.0_10
libbitcoin-server<=3.6.0_10
libbitcoin-system-devel<=3.6.0_10
Expand Down
Loading