Skip to content

Commit

Permalink
Update Gitian descriptors and keys (dogecoin#1455)
Browse files Browse the repository at this point in the history
* Replace Gitian keys - Note I've removed Leofidus' key due to inactivity, and added a weight of 20
to whit's key.
* Replace Bitcoin with Dogecoin in Gitian descriptors
* Fix Makefile refrence to bash-completion files
* Rename remaining bash-completion files
* Add wallet_bgcoin to Qt Makefile
* Add PureHeader sources to libdogecoinconsensus
  • Loading branch information
Ross Nicoll committed Mar 25, 2019
1 parent 43b585b commit 443b058
Show file tree
Hide file tree
Showing 38 changed files with 253 additions and 2,715 deletions.
6 changes: 3 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW

DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
DIST_CONTRIB = $(top_srcdir)/contrib/bitcoin-cli.bash-completion \
$(top_srcdir)/contrib/bitcoin-tx.bash-completion \
$(top_srcdir)/contrib/bitcoind.bash-completion \
DIST_CONTRIB = $(top_srcdir)/contrib/dogecoin-cli.bash-completion \
$(top_srcdir)/contrib/dogecoin-tx.bash-completion \
$(top_srcdir)/contrib/dogecoind.bash-completion \
$(top_srcdir)/contrib/init \
$(top_srcdir)/contrib/rpm

Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions contrib/gitian-descriptors/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### Gavin's notes on getting gitian builds up and running using KVM
### Based on Gavin's notes on getting gitian builds up and running using KVM:

These instructions distilled from
[https://help.ubuntu.com/community/KVM/Installation](https://help.ubuntu.com/community/KVM/Installation).
Expand All @@ -19,7 +19,7 @@ Sanity checks:

Once you've got the right hardware and software:

git clone git://github.com/bitcoin/bitcoin.git
git clone git://github.com/dogecoin/dogecoin.git
git clone git://github.com/devrandom/gitian-builder.git
mkdir gitian-builder/inputs
cd gitian-builder/inputs
Expand Down Expand Up @@ -61,5 +61,5 @@ Here's a description of Gavin's setup on OSX 10.6:
5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right hardware and software" instructions above:

export USE_LXC=1
git clone git://github.com/bitcoin/bitcoin.git
git clone git://github.com/dogecoin/dogecoin.git
... etc
12 changes: 6 additions & 6 deletions contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "bitcoin-linux-0.14"
name: "dogecoin-linux-1.14"
enable_cache: true
suites:
- "trusty"
Expand Down Expand Up @@ -28,8 +28,8 @@ packages:
- "ca-certificates"
- "python"
remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
- "url": "https://github.com/dogecoin/dogecoin.git"
"dir": "dogecoin"
files: []
script: |
Expand Down Expand Up @@ -113,7 +113,7 @@ script: |
chmod +x ${WRAP_DIR}/${prog}
done
cd bitcoin
cd dogecoin
BASEPREFIX=`pwd`/depends
# Build dependencies for each host
for i in $HOSTS; do
Expand All @@ -135,13 +135,13 @@ script: |
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist
SOURCEDIST=`echo bitcoin-*.tar.gz`
SOURCEDIST=`echo dogecoin-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find dogecoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd
ORIGPATH="$PATH"
Expand Down
10 changes: 5 additions & 5 deletions contrib/gitian-descriptors/gitian-osx-signer.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
---
name: "bitcoin-dmg-signer"
name: "dogecoin-dmg-signer"
suites:
- "trusty"
architectures:
- "amd64"
packages:
- "faketime"
remotes:
- "url": "https://github.com/bitcoin-core/bitcoin-detached-sigs.git"
- "url": "https://github.com/dogecoin/dogecoin-detached-sigs.git"
"dir": "signature"
files:
- "bitcoin-osx-unsigned.tar.gz"
- "dogecoin-osx-unsigned.tar.gz"
script: |
WRAP_DIR=$HOME/wrapped
mkdir -p ${WRAP_DIR}
Expand All @@ -27,8 +27,8 @@ script: |
chmod +x ${WRAP_DIR}/${prog}
done
UNSIGNED=bitcoin-osx-unsigned.tar.gz
SIGNED=bitcoin-osx-signed.dmg
UNSIGNED=dogecoin-osx-unsigned.tar.gz
SIGNED=dogecoin-osx-signed.dmg
tar -xf ${UNSIGNED}
OSX_VOLNAME="$(cat osx_volname)"
Expand Down
12 changes: 6 additions & 6 deletions contrib/gitian-descriptors/gitian-osx.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "bitcoin-osx-0.14"
name: "dogecoin-osx-1.14"
enable_cache: true
suites:
- "trusty"
Expand Down Expand Up @@ -28,8 +28,8 @@ packages:
- "python-setuptools"
- "fonts-tuffy"
remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
- "url": "https://github.com/dogecoin/dogecoin.git"
"dir": "dogecoin"
files:
- "MacOSX10.11.sdk.tar.gz"
script: |
Expand Down Expand Up @@ -83,7 +83,7 @@ script: |
create_per-host_faketime_wrappers "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH}
cd bitcoin
cd dogecoin
BASEPREFIX=`pwd`/depends
mkdir -p ${BASEPREFIX}/SDKs
Expand All @@ -104,14 +104,14 @@ script: |
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist
SOURCEDIST=`echo bitcoin-*.tar.gz`
SOURCEDIST=`echo dogecoin-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find dogecoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd
ORIGPATH="$PATH"
Expand Down
8 changes: 4 additions & 4 deletions contrib/gitian-descriptors/gitian-win-signer.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "bitcoin-win-signer"
name: "dogecoin-win-signer"
suites:
- "trusty"
architectures:
Expand All @@ -8,12 +8,12 @@ packages:
- "libssl-dev"
- "autoconf"
remotes:
- "url": "https://github.com/bitcoin-core/bitcoin-detached-sigs.git"
- "url": "https://github.com/dogecoin/dogecoin-detached-sigs.git"
"dir": "signature"
files:
- "osslsigncode-1.7.1.tar.gz"
- "osslsigncode-Backports-to-1.7.1.patch"
- "bitcoin-win-unsigned.tar.gz"
- "dogecoin-win-unsigned.tar.gz"
script: |
BUILD_DIR=`pwd`
SIGDIR=${BUILD_DIR}/signature/win
Expand All @@ -23,7 +23,7 @@ script: |
echo "a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911 osslsigncode-Backports-to-1.7.1.patch" | sha256sum -c
mkdir -p ${UNSIGNED_DIR}
tar -C ${UNSIGNED_DIR} -xf bitcoin-win-unsigned.tar.gz
tar -C ${UNSIGNED_DIR} -xf dogecoin-win-unsigned.tar.gz
tar xf osslsigncode-1.7.1.tar.gz
cd osslsigncode-1.7.1
Expand Down
14 changes: 7 additions & 7 deletions contrib/gitian-descriptors/gitian-win.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "bitcoin-win-0.14"
name: "dogecoin-win-1.14"
enable_cache: true
suites:
- "trusty"
Expand All @@ -22,8 +22,8 @@ packages:
- "ca-certificates"
- "python"
remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
- "url": "https://github.com/dogecoin/dogecoin.git"
"dir": "dogecoin"
files: []
script: |
WRAP_DIR=$HOME/wrapped
Expand Down Expand Up @@ -101,7 +101,7 @@ script: |
create_per-host_linker_wrapper "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH}
cd bitcoin
cd dogecoin
BASEPREFIX=`pwd`/depends
# Build dependencies for each host
for i in $HOSTS; do
Expand All @@ -119,14 +119,14 @@ script: |
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist
SOURCEDIST=`echo bitcoin-*.tar.gz`
SOURCEDIST=`echo dogecoin-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find dogecoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
mkdir -p $OUTDIR/src
cp ../$SOURCEDIST $OUTDIR/src
popd
Expand All @@ -146,7 +146,7 @@ script: |
make ${MAKEOPTS} -C src check-security
make deploy
make install DESTDIR=${INSTALLPATH}
cp -f bitcoin-*setup*.exe $OUTDIR/
cp -f dogecoin-*setup*.exe $OUTDIR/
cd installed
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
find . -name "lib*.la" -delete
Expand Down
52 changes: 0 additions & 52 deletions contrib/gitian-keys/achow101-key.pgp

This file was deleted.

Binary file removed contrib/gitian-keys/aschildbach-key.pgp
Binary file not shown.
Binary file removed contrib/gitian-keys/bluematt-key.pgp
Binary file not shown.
Binary file removed contrib/gitian-keys/btcdrak-key.pgp
Binary file not shown.
Binary file removed contrib/gitian-keys/cdecker-key.pgp
Binary file not shown.
30 changes: 0 additions & 30 deletions contrib/gitian-keys/centaur1-key.pgp

This file was deleted.

52 changes: 0 additions & 52 deletions contrib/gitian-keys/cfields-key.pgp

This file was deleted.

Binary file removed contrib/gitian-keys/devrandom-key.pgp
Binary file not shown.
Binary file removed contrib/gitian-keys/erkmos.pgp
Binary file not shown.
Loading

0 comments on commit 443b058

Please sign in to comment.