Date: Tuesday, January 2, 2018 @ 14:42:20 Author: jelle Revision: 277706
archrelease: copy trunk to community-staging-x86_64 Added: bitcoin/repos/community-staging-x86_64/ bitcoin/repos/community-staging-x86_64/0001-Make-boost-multi_index-comparators-const.patch (from rev 277705, bitcoin/trunk/0001-Make-boost-multi_index-comparators-const.patch) bitcoin/repos/community-staging-x86_64/PKGBUILD (from rev 277705, bitcoin/trunk/PKGBUILD) -----------------------------------------------------+ 0001-Make-boost-multi_index-comparators-const.patch | 85 +++++++ PKGBUILD | 210 ++++++++++++++++++ 2 files changed, 295 insertions(+) Copied: bitcoin/repos/community-staging-x86_64/0001-Make-boost-multi_index-comparators-const.patch (from rev 277705, bitcoin/trunk/0001-Make-boost-multi_index-comparators-const.patch) =================================================================== --- community-staging-x86_64/0001-Make-boost-multi_index-comparators-const.patch (rev 0) +++ community-staging-x86_64/0001-Make-boost-multi_index-comparators-const.patch 2018-01-02 14:42:20 UTC (rev 277706) @@ -0,0 +1,85 @@ +From 1ec0c0a01c316146434642ab2f14a7367306dbec Mon Sep 17 00:00:00 2001 +From: Suhas Daftuar <sdaft...@gmail.com> +Date: Thu, 7 Dec 2017 09:57:53 -0500 +Subject: [PATCH] Make boost::multi_index comparators const + +This fixes compatibility with boost 1.66 +--- + src/miner.h | 4 ++-- + src/txmempool.h | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/miner.h b/src/miner.h +index 36276dc36..d81ec6421 100644 +--- a/src/miner.h ++++ b/src/miner.h +@@ -71,7 +71,7 @@ struct modifiedentry_iter { + // except operating on CTxMemPoolModifiedEntry. + // TODO: refactor to avoid duplication of this logic. + struct CompareModifiedEntry { +- bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b) ++ bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b) const + { + double f1 = (double)a.nModFeesWithAncestors * b.nSizeWithAncestors; + double f2 = (double)b.nModFeesWithAncestors * a.nSizeWithAncestors; +@@ -86,7 +86,7 @@ struct CompareModifiedEntry { + // This is sufficient to sort an ancestor package in an order that is valid + // to appear in a block. + struct CompareTxIterByAncestorCount { +- bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) ++ bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) const + { + if (a->GetCountWithAncestors() != b->GetCountWithAncestors()) + return a->GetCountWithAncestors() < b->GetCountWithAncestors(); +diff --git a/src/txmempool.h b/src/txmempool.h +index 346585ab1..86a008d7b 100644 +--- a/src/txmempool.h ++++ b/src/txmempool.h +@@ -204,7 +204,7 @@ struct mempoolentry_txid + class CompareTxMemPoolEntryByDescendantScore + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + bool fUseADescendants = UseDescendantScore(a); + bool fUseBDescendants = UseDescendantScore(b); +@@ -226,7 +226,7 @@ public: + } + + // Calculate which score to use for an entry (avoiding division). +- bool UseDescendantScore(const CTxMemPoolEntry &a) ++ bool UseDescendantScore(const CTxMemPoolEntry &a) const + { + double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants(); + double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize(); +@@ -241,7 +241,7 @@ public: + class CompareTxMemPoolEntryByScore + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + double f1 = (double)a.GetModifiedFee() * b.GetTxSize(); + double f2 = (double)b.GetModifiedFee() * a.GetTxSize(); +@@ -255,7 +255,7 @@ public: + class CompareTxMemPoolEntryByEntryTime + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + return a.GetTime() < b.GetTime(); + } +@@ -264,7 +264,7 @@ public: + class CompareTxMemPoolEntryByAncestorFee + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + double aFees = a.GetModFeesWithAncestors(); + double aSize = a.GetSizeWithAncestors(); +-- +2.15.1 + Copied: bitcoin/repos/community-staging-x86_64/PKGBUILD (from rev 277705, bitcoin/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2018-01-02 14:42:20 UTC (rev 277706) @@ -0,0 +1,210 @@ +# $Id$ +# Maintainer : Christian Rebischke <chris.rebisc...@archlinux.org> +# Contributor: Timothy Redaelli <timothy.redae...@gmail.com> +# Contributor: shahid <hellla...@gmail.com> + +#_dbver=4.8.30 +pkgbase=bitcoin +pkgname=('bitcoin-daemon' 'bitcoin-cli' 'bitcoin-qt' 'bitcoin-tx') +pkgver=0.15.1 +pkgrel=3 +arch=('x86_64') +url="http://www.bitcoin.org/" +makedepends=('boost' 'libevent' 'qt5-base' 'qt5-tools' 'qrencode' 'miniupnpc' 'protobuf' 'zeromq') +license=('MIT') +source=($pkgname-$pkgver.tar.gz::"https://github.com/bitcoin/bitcoin/archive/v$pkgver.tar.gz" "0001-Make-boost-multi_index-comparators-const.patch") +sha256sums=('e429d4f257f2b5b6d0caaf36ed1a5f5203e5918c57837efac00b0c322a1fef79' + 'f302218b0366c2102a3447330684adcdb576217aba5d1bb157e73717d6734ce5') +validpgpkeys=(71A3B16735405025D447E8F274810B012346C9A6) + + _parse_gpg_statusfile() { + local type arg1 arg6 arg10 + + while read -r _ type arg1 _ _ _ _ arg6 _ _ _ arg10 _; do + case "$type" in + GOODSIG) + pubkey=$arg1 + success=1 + status="good" + ;; + EXPSIG) + pubkey=$arg1 + success=1 + status="expired" + ;; + EXPKEYSIG) + pubkey=$arg1 + success=1 + status="expiredkey" + ;; + REVKEYSIG) + pubkey=$arg1 + success=0 + status="revokedkey" + ;; + BADSIG) + pubkey=$arg1 + success=0 + status="bad" + ;; + ERRSIG) + pubkey=$arg1 + success=0 + if [[ $arg6 == 9 ]]; then + status="missingkey" + else + status="error" + fi + ;; + VALIDSIG) + if [[ $arg10 ]]; then + # If the file was signed with a subkey, arg10 contains + # the fingerprint of the primary key + fingerprint=$arg10 + else + fingerprint=$arg1 + fi + ;; + TRUST_UNDEFINED|TRUST_NEVER) + trusted=0 + ;; + TRUST_MARGINAL|TRUST_FULLY|TRUST_ULTIMATE) + trusted=1 + ;; + esac + done < "$1" +} + +_validate_gpg_tag() { + local file ext decompress found pubkey success status fingerprint trusted + local warning=0 + local errors=0 + local statusfile=$(mktemp) + + msg "$(gettext "Verifying source file signatures with %s...")" "gpg" + + git verify-tag --raw "$1" 2>"$statusfile" + + # these variables are assigned values in parse_gpg_statusfile + success=0 + status= + pubkey= + fingerprint= + trusted= + _parse_gpg_statusfile "$statusfile" + if (( ! $success )); then + printf '%s' "$(gettext "FAILED")" >&2 + case "$status" in + "missingkey") + printf ' (%s)' "$(gettext "unknown public key") $pubkey" >&2 + ;; + "revokedkey") + printf " ($(gettext "public key %s has been revoked"))" "$pubkey" >&2 + ;; + "bad") + printf ' (%s)' "$(gettext "bad signature from public key") $pubkey" >&2 + ;; + "error") + printf ' (%s)' "$(gettext "error during signature verification")" >&2 + ;; + esac + errors=1 + else + if (( ${#validpgpkeys[@]} == 0 && !trusted )); then + printf "%s ($(gettext "the public key %s is not trusted"))" $(gettext "FAILED") "$fingerprint" >&2 + errors=1 + elif (( ${#validpgpkeys[@]} > 0 )) && ! in_array "$fingerprint" "${validpgpkeys[@]}"; then + printf "%s (%s %s)" "$(gettext "FAILED")" "$(gettext "invalid public key")" "$fingerprint" + errors=1 + else + printf '%s' "$(gettext "Passed")" >&2 + case "$status" in + "expired") + printf ' (%s)' "$(gettext "WARNING:") $(gettext "the signature has expired.")" >&2 + warnings=1 + ;; + "expiredkey") + printf ' (%s)' "$(gettext "WARNING:") $(gettext "the key has expired.")" >&2 + warnings=1 + ;; + esac + fi + fi + printf '\n' >&2 + + rm -f "$statusfile" + + if (( errors )); then + error "$(gettext "One or more PGP signatures could not be verified!")" + false + fi + + if (( warnings )); then + warning "$(gettext "Warnings have occurred while verifying the signatures.")" + plain "$(gettext "Please make sure you really trust them.")" + fi +} + +prepare() { + cd "$pkgbase-$pkgver" +# _validate_gpg_tag "v${pkgver}" + patch -Np1 -i $srcdir/0001-Make-boost-multi_index-comparators-const.patch +} + +build() { + cd $pkgbase-$pkgver + ./autogen.sh + ./configure --prefix=/usr --with-gui=qt5 --with-incompatible-bdb #LDFLAGS="-L$srcdir/db4/lib/ $LDFLAGS" CPPFLAGS="-I$srcdir/db4/include/ $CPPFLAGS" + make +} + +package_bitcoin-qt() { + pkgdesc="Bitcoin is a peer-to-peer network based digital currency - Qt" + depends=(boost-libs libevent qt5-base miniupnpc qrencode protobuf zeromq) + + cd $pkgbase-$pkgver + install -Dm755 src/qt/bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt + install -Dm644 contrib/debian/bitcoin-qt.desktop \ + "$pkgdir"/usr/share/applications/bitcoin.desktop + install -Dm644 share/pixmaps/bitcoin128.png \ + "$pkgdir"/usr/share/pixmaps/bitcoin128.png + install -Dm644 doc/man/bitcoin-qt.1 \ + "$pkgdir"/usr/share/man/man1/bitcoin-qt.1 + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +package_bitcoin-daemon() { + pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon" + depends=(boost-libs libevent miniupnpc zeromq) + + cd $pkgbase-$pkgver + install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind + install -Dm644 contrib/debian/examples/bitcoin.conf \ + "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf" + install -Dm644 doc/man/bitcoind.1 \ + "$pkgdir"/usr/share/man/man1/bitcoind.1 + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +package_bitcoin-cli() { + pkgdesc="Bitcoin is a peer-to-peer network based digital currency - RPC client" + depends=(boost-libs libevent) + + cd $pkgbase-$pkgver + install -Dm755 src/bitcoin-cli "$pkgdir"/usr/bin/bitcoin-cli + install -Dm644 doc/man/bitcoin-cli.1 \ + "$pkgdir"/usr/share/man/man1/bitcoin-cli.1 + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +package_bitcoin-tx() { + pkgdesc="Bitcoin is a peer-to-peer network based digital currency - Transaction tool" + depends=(boost-libs openssl) + + cd $pkgbase-$pkgver + install -Dm755 src/bitcoin-tx "$pkgdir"/usr/bin/bitcoin-tx + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: