Bump gitian descriptors to latest ver and update signer code

ghost-coin · Aug 23, 2020 · 4a4b352 · 4a4b352
1 parent 8bc75e8
commit 4a4b352
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 29 deletions.
diff --git a/configure.ac b/configure.ac
@@ -10,7 +10,7 @@ define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2020)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Ghost Core]])
-AC_INIT([Ghost Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION._CLIENT_VERSION_GHOST],[https://github.com/ghost/ghost-core/issues],[ghost],[https://www.ghostbyjohnmcafee.com/])
+AC_INIT([Ghost Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION._CLIENT_VERSION_GHOST],[https://github.com/ghost-coin/ghost-core/issues],[ghost],[https://www.ghostbyjohnmcafee.com/])
 AC_CONFIG_SRCDIR([src/validation.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
@@ -18,7 +18,7 @@ osx=true
 SIGNER=
 VERSION=
 commit=false
-url=https://github.com/ghost/ghost-core
+url=https://github.com/ghost-coin/ghost-core
 proc=2
 mem=3000
 lxc=true
@@ -41,7 +41,7 @@ version         Version number, commit, or branch to build. If building a commit
 
 Options:
 -c|--commit     Indicate that the version argument is for a commit or branch
--u|--url        Specify the URL of the repository. Default is https://github.com/ghost/ghost-core
+-u|--url        Specify the URL of the repository. Default is https://github.com/ghost-coin/ghost-core
 -v|--verify     Verify the Gitian build
 -b|--build      Do a Gitian build
 -s|--sign       Make signed binaries for Windows and Mac OSX

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "ghost-linux-0.19.1.7"
+name: "ghost-linux-0.19.1.8"
 enable_cache: true
 sudo: true
 distro: "ubuntu"
@@ -35,7 +35,7 @@ packages:
 - "python3"
 - "libudev-dev"
 remotes:
-- "url": "https://github.com/ghost/ghost-core.git"
+- "url": "https://github.com/ghost-coin/ghost-core.git"
   "dir": "ghost-core"
 files: []
 script: |

diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml
@@ -8,7 +8,7 @@ architectures:
 packages:
 - "faketime"
 remotes:
-- "url": "https://github.com/ghost/ghost-detached-sigs.git"
+- "url": "https://github.com/ghost-coin/ghost-detached-sigs.git"
   "dir": "signature"
 files:
 - "ghost-osx-unsigned.tar.gz"
@@ -17,14 +17,14 @@ script: |
 
   WRAP_DIR=$HOME/wrapped
   mkdir -p ${WRAP_DIR}
-  export PATH=`pwd`:$PATH
+  export PATH="$PWD":$PATH
   FAKETIME_PROGS="dmg genisoimage"
 
   # Create global faketime wrappers
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}
     echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog}
-    echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}
+    echo "export LD_PRELOAD='/usr/\$LIB/faketime/libfaketime.so.1'" >> ${WRAP_DIR}/${prog}
     echo "export FAKETIME=\"${REFERENCE_DATETIME}\"" >> ${WRAP_DIR}/${prog}
     echo "\$REAL \$@" >> $WRAP_DIR/${prog}
     chmod +x ${WRAP_DIR}/${prog}
@@ -37,4 +37,4 @@ script: |
   OSX_VOLNAME="$(cat osx_volname)"
   ./detached-sig-apply.sh ${UNSIGNED} signature/osx
   ${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "${OSX_VOLNAME}" -no-pad -r -dir-mode 0755 -apple -o uncompressed.dmg signed-app
-  ${WRAP_DIR}/dmg dmg uncompressed.dmg ${OUTDIR}/${SIGNED}
+  ${WRAP_DIR}/dmg dmg uncompressed.dmg ${OUTDIR}/${SIGNED}
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
@@ -1,5 +1,5 @@
 ---
-name: "ghost-osx-0.19.1.7"
+name: "ghost-osx-0.19.1.8"
 enable_cache: true
 distro: "ubuntu"
 suites:
@@ -29,7 +29,7 @@ packages:
 - "python3-setuptools"
 - "fonts-tuffy"
 remotes:
-- "url": "https://github.com/ghost/ghost-core.git"
+- "url": "https://github.com/ghost-coin/ghost-core.git"
   "dir": "ghost-core"
 files:
 - "MacOSX10.11.sdk.tar.gz"

diff --git a/contrib/gitian-descriptors/gitian-particl-desktop.yml b/contrib/gitian-descriptors/gitian-particl-desktop.yml
@@ -23,7 +23,7 @@ packages:
 - "apt-transport-https"
 - "libjpeg-dev"
 remotes:
-- "url": "https://github.com/ghost/ghost-desktop"
+- "url": "https://github.com/ghost-coin/ghost-desktop"
   "dir": "ghost-desktop"
 files: []
 script: |

diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml
@@ -6,37 +6,37 @@ suites:
 architectures:
 - "amd64"
 packages:
-# Once osslsigncode supports openssl 1.1, we can change this back to libssl-dev
-- "libssl1.0-dev"
+- "libssl-dev"
 - "autoconf"
+- "automake"
+- "libtool"
+- "pkg-config"
 remotes:
-- "url": "https://github.com/ghost/ghost-detached-sigs.git"
+- "url": "https://github.com/ghost-coin/ghost-detached-sigs.git"
   "dir": "signature"
 files:
-- "osslsigncode-1.7.1.tar.gz"
-- "osslsigncode-Backports-to-1.7.1.patch"
+- "osslsigncode-2.0.tar.gz"
 - "ghost-win-unsigned.tar.gz"
 script: |
   set -e -o pipefail
 
-  BUILD_DIR=`pwd`
+  BUILD_DIR="$PWD"
   SIGDIR=${BUILD_DIR}/signature/win
   UNSIGNED_DIR=${BUILD_DIR}/unsigned
 
-  echo "f9a8cdb38b9c309326764ebc937cba1523a3a751a7ab05df3ecc99d18ae466c9  osslsigncode-1.7.1.tar.gz" | sha256sum -c
-  echo "a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911  osslsigncode-Backports-to-1.7.1.patch" | sha256sum -c
+  echo "5a60e0a4b3e0b4d655317b2f12a810211c50242138322b16e7e01c6fbb89d92f  osslsigncode-2.0.tar.gz" | sha256sum -c
 
   mkdir -p ${UNSIGNED_DIR}
   tar -C ${UNSIGNED_DIR} -xf ghost-win-unsigned.tar.gz
 
-  tar xf osslsigncode-1.7.1.tar.gz
-  cd osslsigncode-1.7.1
-  patch -p1 < ${BUILD_DIR}/osslsigncode-Backports-to-1.7.1.patch
+  tar xf osslsigncode-2.0.tar.gz
+  cd osslsigncode-2.0
 
+  ./autogen.sh
   ./configure --without-gsf --without-curl --disable-dependency-tracking
   make
   find ${UNSIGNED_DIR} -name "*-unsigned.exe" | while read i; do
-    INFILE="`basename "${i}"`"
-    OUTFILE="`echo "${INFILE}" | sed s/-unsigned//`"
+    INFILE="$(basename "${i}")"
+    OUTFILE="${INFILE/-unsigned}"
     ./osslsigncode attach-signature -in "${i}" -out "${OUTDIR}/${OUTFILE}" -sigin "${SIGDIR}/${INFILE}.pem"
-  done
+  done
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
@@ -1,5 +1,5 @@
 ---
-name: "ghost-win-0.19.1.7"
+name: "ghost-win-0.19.1.8"
 enable_cache: true
 sudo: true
 distro: "ubuntu"
@@ -25,7 +25,7 @@ packages:
 - "python3"
 - "rename"
 remotes:
-- "url": "https://github.com/ghost/ghost-core.git"
+- "url": "https://github.com/ghost-coin/ghost-core.git"
   "dir": "ghost-core"
 files: []
 script: |

diff --git a/doc/man/ghost-qt.1 b/doc/man/ghost-qt.1
@@ -825,7 +825,7 @@ Copyright (C) 2009-2019 The Bitcoin Core developers
 
 Please contribute if you find Ghost Core useful. Visit <https://ghostbyjohnmcafee.com/>
 for further information about the software.
-The source code is available from <https://github.com/ghost/ghost-core>.
+The source code is available from <https://github.com/ghost-coin/ghost-core>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING