From 33c29dddebc8d57a015e0cf193ce16492e1a1f36 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Fri, 27 Jul 2018 13:50:18 +0200 Subject: [PATCH] bitcoin-core: update to 0.16.2 --- bitcoin-core/PKGBUILD | 100 ++++++++++++--------------- bitcoin-core/bitcoin-reindex.service | 18 ----- bitcoin-core/bitcoin.install | 11 --- bitcoin-core/bitcoin.service | 17 ----- bitcoin-core/bitcoin.sysusers | 1 + bitcoin-core/bitcoin.tmpfiles | 2 + bitcoin-core/bitcoin128.svg | 19 ----- 7 files changed, 48 insertions(+), 120 deletions(-) delete mode 100644 bitcoin-core/bitcoin-reindex.service delete mode 100644 bitcoin-core/bitcoin.install delete mode 100644 bitcoin-core/bitcoin.service create mode 100644 bitcoin-core/bitcoin.sysusers create mode 100644 bitcoin-core/bitcoin.tmpfiles delete mode 100644 bitcoin-core/bitcoin128.svg diff --git a/bitcoin-core/PKGBUILD b/bitcoin-core/PKGBUILD index 61e69afb5..93446f048 100644 --- a/bitcoin-core/PKGBUILD +++ b/bitcoin-core/PKGBUILD @@ -1,34 +1,30 @@ pkgname=bitcoin-core -pkgver=0.16.1 +pkgver=0.16.2 pkgrel=1 pkgdesc="Bitcoin is a peer-to-peer network based digital currency" arch=('x86_64') url="https://www.bitcoin.org/" -depends=('boost' 'boost-libs' 'zeromq' 'miniupnpc' 'libevent' 'qt5-base' 'qrencode' 'protobuf') -makedepends=('boost' 'qt5-tools') +depends=('boost' 'zeromq' 'miniupnpc' 'libevent' 'qt5-base' 'qrencode' 'protobuf') +makedepends=('qt5-tools') license=('MIT') conflicts=('bitcoin-daemon' 'bitcoin-cli' 'bitcoin-qt' 'bitcoin') replaces=('bitcoin-daemon' 'bitcoin-cli' 'bitcoin-qt' 'bitcoin') provides=('bitcoin-daemon' 'bitcoin-cli' 'bitcoin-qt' 'bitcoin') source=("https://github.com/bitcoin/bitcoin/archive/v$pkgver.tar.gz" - "https://raw.github.com/bitcoin/bitcoin/v$pkgver/contrib/debian/bitcoin-qt.desktop" - "bitcoin128.svg" - "https://raw.github.com/bitcoin/bitcoin/v$pkgver/contrib/debian/examples/bitcoin.conf" - "bitcoin.service" - "bitcoin-reindex.service") -sha256sums=('c0065f63509c1ca8b45057b415f8e4cbaf0f234def6090511d68fd3df3a56380' - '3d4eb0cfd0750adeadc7820e43159e5c6d622dbd8bb0177669c43c61d20958be' - '7ddc5b4f0e6a217663c4cc8bbf6dc237c8e16aff3159f0fe3e0de18810676f90' - 'f5b34a5ff5f8bf4240a365dcca1f76eb1868054badf90117f2153f6254b96e10' - '5e45f2ceaeb7bfa60aeb66ca4167068191eb4358af03f95ac70fd96d9b006349' - '10ad0b8c356559886634eaf658992004045853ec26cddee143d16125cb75e8f1') + "bitcoin.sysusers" + "bitcoin.tmpfiles") +sha256sums=('0d99c4be777943954c4fea1aff0c405dbd5e30d87bcb9a939f26fa19ccb76f93' + '6f70b0d3d5e4a3f78b15d8f49515cd33cbf0c9d2ac22f94f0d3fabb3f620e458' + 'b769c977b193680f2f549997fd8e07f6aa507071dfd519d59255ab4c687ebfcd') +prepare() { + cd ${pkgname%-core}-$pkgver + autoreconf -fi +} build() { cd ${pkgname%-core}-$pkgver - msg2 'Building...' - ./autogen.sh ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ @@ -45,45 +41,39 @@ build() { package() { cd ${pkgname%-core}-$pkgver - msg2 'Installing bitcoin...' - make DESTDIR=$pkgdir install - - msg "installing .desktop and icon" - install -Dm644 "$srcdir"/bitcoin-qt.desktop \ + install -Dm755 src/qt/bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt + install -Dm644 doc/man/bitcoin-qt.1 \ + "$pkgdir"/usr/share/man/man1/bitcoin-qt.1 + install -Dm644 contrib/debian/bitcoin-qt.desktop \ "$pkgdir"/usr/share/applications/bitcoin.desktop - install -Dm644 "$srcdir"/bitcoin128.svg \ - "$pkgdir"/usr/share/pixmaps/bitcoin128.svg - - msg "installing license" + install -Dm644 share/pixmaps/bitcoin128.png \ + "$pkgdir"/usr/share/pixmaps/bitcoin128.png + + install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind + install -Dm644 contrib/bitcoind.bash-completion \ + "$pkgdir"/usr/share/bash-completion/completions/bitcoind + install -Dm644 doc/man/bitcoind.1 \ + "$pkgdir"/usr/share/man/man1/bitcoind.1 + install -Dm644 contrib/debian/examples/bitcoin.conf \ + "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf" + install -Dm644 contrib/init/bitcoind.service \ + "$pkgdir/usr/lib/systemd/system/bitcoind.service" + install -Dm644 "$srcdir/bitcoin.sysusers" \ + "$pkgdir/usr/lib/sysusers.d/bitcoin.conf" + install -Dm644 "$srcdir/bitcoin.tmpfiles" \ + "$pkgdir/usr/lib/tmpfiles.d/bitcoin.conf" + + install -Dm755 src/bitcoin-cli "$pkgdir"/usr/bin/bitcoin-cli + install -Dm644 contrib/bitcoin-cli.bash-completion \ + "$pkgdir"/usr/share/bash-completion/completions/bitcoin-cli + install -Dm644 doc/man/bitcoin-cli.1 \ + "$pkgdir"/usr/share/man/man1/bitcoin-cli.1 + + install -Dm755 src/bitcoin-tx "$pkgdir"/usr/bin/bitcoin-tx + install -Dm644 contrib/bitcoin-tx.bash-completion \ + "$pkgdir"/usr/share/bash-completion/completions/bitcoin-tx + install -Dm644 doc/man/bitcoin-tx.1 \ + "$pkgdir"/usr/share/man/man1/bitcoin-tx.1 + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - - msg2 'Installing man pages...' - install -Dm 644 doc/man/*.1 -t "$pkgdir/usr/share/man/man1" - - msg2 'Installing documentation...' - install -dm 755 "$pkgdir/usr/share/doc/bitcoin" - for _doc in \ - $(find doc -maxdepth 1 -type f -name "*.md" -printf '%f\n') \ - release-notes; do - cp -dpr --no-preserve=ownership "doc/$_doc" \ - "$pkgdir/usr/share/doc/bitcoin/$_doc" - done - - - msg2 'Installing bitcoin.conf...' - install -Dm 600 "$srcdir/bitcoin.conf" -t "$pkgdir/etc/bitcoin" - - msg2 'Installing bitcoin.service...' - install -Dm 644 "$srcdir/bitcoin.service" -t "$pkgdir/usr/lib/systemd/system" - install -Dm 644 "$srcdir/bitcoin-reindex.service" \ - -t "$pkgdir/usr/lib/systemd/system" - - #msg2 'Installing bitcoin.logrotate...' - #install -Dm 644 "$srcdir/bitcoin.logrotate" "$pkgdir/etc/logrotate.d/bitcoin" - - msg2 'Installing bash completion...' - for _compl in bitcoin-cli bitcoin-tx bitcoind; do - install -Dm 644 "contrib/${_compl}.bash-completion" \ - "$pkgdir/usr/share/bash-completion/completions/$_compl" - done } diff --git a/bitcoin-core/bitcoin-reindex.service b/bitcoin-core/bitcoin-reindex.service deleted file mode 100644 index ca40c191e..000000000 --- a/bitcoin-core/bitcoin-reindex.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Bitcoin Daemon (reindex) -Conflicts=bitcoin.service -After=network.target - -[Service] -User=bitcoin -Group=bitcoin -ExecStart=/usr/bin/bitcoind -daemon=0 \ - -conf=/etc/bitcoin/bitcoin.conf \ - -datadir=/srv/bitcoin \ - -reindex \ - -pid=/run/bitcoind.pid -ExecReload=/usr/bin/kill -HUP $MAINPID -ExecStop=/usr/bin/bitcoind stop - -[Install] -WantedBy=multi-user.target diff --git a/bitcoin-core/bitcoin.install b/bitcoin-core/bitcoin.install deleted file mode 100644 index 677345e20..000000000 --- a/bitcoin-core/bitcoin.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} \ No newline at end of file diff --git a/bitcoin-core/bitcoin.service b/bitcoin-core/bitcoin.service deleted file mode 100644 index fda8f3270..000000000 --- a/bitcoin-core/bitcoin.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Bitcoin Daemon -Conflicts=bitcoin-reindex.service -After=network.target - -[Service] -User=bitcoin -Group=bitcoin -ExecStart=/usr/bin/bitcoind -daemon=0 \ - -conf=/etc/bitcoin/bitcoin.conf \ - -datadir=/srv/bitcoin \ - -pid=/run/bitcoind.pid -ExecReload=/usr/bin/kill -HUP $MAINPID -ExecStop=/usr/bin/bitcoind stop - -[Install] -WantedBy=multi-user.target diff --git a/bitcoin-core/bitcoin.sysusers b/bitcoin-core/bitcoin.sysusers new file mode 100644 index 000000000..cf232dccb --- /dev/null +++ b/bitcoin-core/bitcoin.sysusers @@ -0,0 +1 @@ +u bitcoin - - /var/lib/bitcoin diff --git a/bitcoin-core/bitcoin.tmpfiles b/bitcoin-core/bitcoin.tmpfiles new file mode 100644 index 000000000..704b54141 --- /dev/null +++ b/bitcoin-core/bitcoin.tmpfiles @@ -0,0 +1,2 @@ +d /var/lib/bitcoin 0770 bitcoin bitcoin - - +d /etc/bitcoin 0770 bitcoin bitcoin - - diff --git a/bitcoin-core/bitcoin128.svg b/bitcoin-core/bitcoin128.svg deleted file mode 100644 index f04f82a54..000000000 --- a/bitcoin-core/bitcoin128.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - -