Merge pull request #155 from syscoin/dev-2.1.6

Dev 2.1.6

Former-commit-id: 3babe9d

configure.ac

@@ -1,10 +1,14 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
-define(_CLIENT_VERSION_MAJOR, 0)
-define(_CLIENT_VERSION_MINOR, 13)
-define(_CLIENT_VERSION_REVISION, 2)
+define(_CLIENT_VERSION_MAJOR, 2)
+define(_CLIENT_VERSION_MINOR, 1)
+define(_CLIENT_VERSION_REVISION, 6)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
+define(_BITCOIN_VERSION_MAJOR, 0)
+define(_BITCOIN_VERSION_MINOR, 13)
+define(_BITCOIN_VERSION_REVISION, 2)
+define(_BITCOIN_VERSION_BUILD, 0)
 define(_COPYRIGHT_YEAR, 2016)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Syscoin Core]])
@@ -1044,11 +1048,15 @@ AM_CONDITIONAL([USE_COMPARISON_TOOL_REORG_TESTS],[test x$use_comparison_tool_reo
 AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
 AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
 
-AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version])
-AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version])
-AC_DEFINE(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION, [Build revision])
-AC_DEFINE(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD, [Version Build])
+AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Syscoin Major version])
+AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Syscoin Minor version])
+AC_DEFINE(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION, [Syscoin Build revision])
+AC_DEFINE(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD, [Syscoin Version Build])
 AC_DEFINE(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE, [Version is release])
+AC_DEFINE(BITCOIN_VERSION_MAJOR, _BITCOIN_VERSION_MAJOR, [Bitcoin Major version])
+AC_DEFINE(BITCOIN_VERSION_MINOR, _BITCOIN_VERSION_MINOR, [Bitcoin Minor version])
+AC_DEFINE(BITCOIN_VERSION_REVISION, _BITCOIN_VERSION_REVISION, [Bitcoin Build revision])
+AC_DEFINE(BITCOIN_VERSION_BUILD, _BITCOIN_VERSION_BUILD, [Bitcoin Version Build])
 AC_DEFINE(COPYRIGHT_YEAR, _COPYRIGHT_YEAR, [Copyright year])
 AC_DEFINE(COPYRIGHT_HOLDERS, "_COPYRIGHT_HOLDERS", [Copyright holder(s) before %s replacement])
 AC_DEFINE(COPYRIGHT_HOLDERS_SUBSTITUTION, "_COPYRIGHT_HOLDERS_SUBSTITUTION", [Replacement for %s in copyright holders string])
@@ -1059,6 +1067,10 @@ AC_SUBST(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR)
 AC_SUBST(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION)
 AC_SUBST(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD)
 AC_SUBST(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE)
+AC_SUBST(BITCOIN_VERSION_MAJOR, _BITCOIN_VERSION_MAJOR)
+AC_SUBST(BITCOIN_VERSION_MINOR, _BITCOIN_VERSION_MINOR)
+AC_SUBST(BITCOIN_VERSION_REVISION, _BITCOIN_VERSION_REVISION)
+AC_SUBST(BITCOIN_VERSION_BUILD, _BITCOIN_VERSION_BUILD)
 AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR)
 AC_SUBST(COPYRIGHT_HOLDERS, "_COPYRIGHT_HOLDERS")
 AC_SUBST(COPYRIGHT_HOLDERS_SUBSTITUTION, "_COPYRIGHT_HOLDERS_SUBSTITUTION")

contrib/gitian-build.sh

@@ -1,4 +1,4 @@
-# Copyright (c) 2016 The syscoin Core developers
+# Copyright (c) 2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -20,11 +20,11 @@ commit=false
 url=https://github.com/syscoin/syscoin2
 proc=2
 mem=2000
-lxc=true
+lxc=false
 osslTarUrl=http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
 osslPatchUrl=https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch
 scriptName=$(basename -- "$0")
-signProg="gpg --detach-sign"
+signProg="-p gpg"
 commitFiles=true
 
 # Help Message
@@ -40,15 +40,15 @@ version		Version number, commit, or branch to build. If building a commit or bra
 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/syscoin/syscoin2
--v|--verify 	Verify the gitian build
--b|--build	Do a gitiain build
+-v|--verify 	Verify the Gitian build
+-b|--build	Do a Gitian build
 -s|--sign	Make signed binaries for Windows and Mac OSX
 -B|--buildsign	Build both signed and unsigned binaries
 -o|--os		Specify which Operating Systems the build is for. Default is lwx. l for linux, w for windows, x for osx
 -j		Number of processes to use. Default 2
 -m		Memory to allocate in MiB. Default 2000
---kvm           Use KVM instead of LXC
---setup         Setup the gitian building environment. Uses KVM. If you want to use lxc, use the --lxc option. Only works on Debian-based systems (Ubuntu, Debian)
+--lxc           Use LXC instead of KVM
+--setup         Set up the Gitian building environment. Uses KVM. If you don't want to use lxc, use the --kvm option. Only works on Debian-based systems (Ubuntu, Debian)
 --detach-sign   Create the assert file for detached signing. Will not commit anything.
 --no-commit     Do not commit anything to git
 -h|--help	Print this help message
@@ -152,13 +152,14 @@ while :; do
 		exit 1
 	    fi
 	    ;;
-        # kvm
-        --kvm)
-            lxc=false
+        # lxc
+        --lxc)
+            lxc=true
             ;;
         # Detach sign
         --detach-sign)
-            signProg="true"
+            sign=true
+            signProg=""
             commitFiles=false
             ;;
         # Commit files
@@ -179,8 +180,6 @@ done
 if [[ $lxc = true ]]
 then
     export USE_LXC=1
-    export LXC_BRIDGE=lxcbr0
-    sudo ifconfig lxcbr0 up 10.0.2.2
 fi
 
 # Check for OSX SDK
@@ -224,16 +223,16 @@ fi
 # Add a "v" if no -c
 if [[ $commit = false ]]
 then
-	COMMIT="v${VERSION}"
+	COMMIT="${VERSION}"
 fi
 echo ${COMMIT}
 
 # Setup build environment
 if [[ $setup = true ]]
 then
-    sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm qemu-utils
-    git clone https://github.com/syscoin-core/gitian.sigs.git
-    git clone https://github.com/syscoin-core/syscoin-detached-sigs.git
+    sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm qemu-utils binutils
+    git clone https://github.com/syscoin/gitian.sigs.git
+    git clone https://github.com/syscoin/syscoin-detached-sigs.git
     git clone https://github.com/devrandom/gitian-builder.git
     pushd ./gitian-builder
     if [[ -n "$USE_LXC" ]]
@@ -257,12 +256,12 @@ if [[ $build = true ]]
 then
 	# Make output folder
 	mkdir -p ./syscoin-binaries/${VERSION}
-	
+
 	# Build Dependencies
 	echo ""
 	echo "Building Dependencies"
 	echo ""
-	pushd ./gitian-builder	
+	pushd ./gitian-builder
 	mkdir -p inputs
 	wget -N -P inputs $osslPatchUrl
 	wget -N -P inputs $osslTarUrl
@@ -275,7 +274,7 @@ then
 	    echo "Compiling ${VERSION} Linux"
 	    echo ""
 	    ./bin/gbuild -j ${proc} -m ${mem} --commit syscoin=${COMMIT} --url syscoin=${url} ../syscoin/contrib/gitian-descriptors/gitian-linux.yml
-	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../syscoin/contrib/gitian-descriptors/gitian-linux.yml
+	    ./bin/gsign $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../syscoin/contrib/gitian-descriptors/gitian-linux.yml
 	    mv build/out/syscoin-*.tar.gz build/out/src/syscoin-*.tar.gz ../syscoin-binaries/${VERSION}
 	fi
 	# Windows
@@ -285,7 +284,7 @@ then
 	    echo "Compiling ${VERSION} Windows"
 	    echo ""
 	    ./bin/gbuild -j ${proc} -m ${mem} --commit syscoin=${COMMIT} --url syscoin=${url} ../syscoin/contrib/gitian-descriptors/gitian-win.yml
-	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../syscoin/contrib/gitian-descriptors/gitian-win.yml
+	    ./bin/gsign $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../syscoin/contrib/gitian-descriptors/gitian-win.yml
 	    mv build/out/syscoin-*-win-unsigned.tar.gz inputs/syscoin-win-unsigned.tar.gz
 	    mv build/out/syscoin-*.zip build/out/syscoin-*.exe ../syscoin-binaries/${VERSION}
 	fi
@@ -296,7 +295,7 @@ then
 	    echo "Compiling ${VERSION} Mac OSX"
 	    echo ""
 	    ./bin/gbuild -j ${proc} -m ${mem} --commit syscoin=${COMMIT} --url syscoin=${url} ../syscoin/contrib/gitian-descriptors/gitian-osx.yml
-	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../syscoin/contrib/gitian-descriptors/gitian-osx.yml
+	    ./bin/gsign $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../syscoin/contrib/gitian-descriptors/gitian-osx.yml
 	    mv build/out/syscoin-*-osx-unsigned.tar.gz inputs/syscoin-osx-unsigned.tar.gz
 	    mv build/out/syscoin-*.tar.gz build/out/syscoin-*.dmg ../syscoin-binaries/${VERSION}
 	fi
@@ -331,10 +330,10 @@ then
 	echo "Verifying v${VERSION} Windows"
 	echo ""
 	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../syscoin/contrib/gitian-descriptors/gitian-win.yml
-	# Mac OSX	
+	# Mac OSX
 	echo ""
 	echo "Verifying v${VERSION} Mac OSX"
-	echo ""	
+	echo ""
 	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../syscoin/contrib/gitian-descriptors/gitian-osx.yml
 	# Signed Windows
 	echo ""
@@ -345,23 +344,23 @@ then
 	echo ""
 	echo "Verifying v${VERSION} Signed Mac OSX"
 	echo ""
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../syscoin/contrib/gitian-descriptors/gitian-osx-signer.yml	
+	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../syscoin/contrib/gitian-descriptors/gitian-osx-signer.yml
 	popd
 fi
 
 # Sign binaries
 if [[ $sign = true ]]
 then
-	
+
         pushd ./gitian-builder
 	# Sign Windows
 	if [[ $windows = true ]]
 	then
 	    echo ""
 	    echo "Signing ${VERSION} Windows"
 	    echo ""
-	    ./bin/gbuild -i --commit signature=${COMMIT} ../syscoin/contrib/gitian-descriptors/gitian-win-signer.yml
-	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../syscoin/contrib/gitian-descriptors/gitian-win-signer.yml
+	    ./bin/gbuild -i --commit signature=${COMMIT} --url signature=${url} ../syscoin/contrib/gitian-descriptors/gitian-win-signer.yml
+	    ./bin/gsign $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../syscoin/contrib/gitian-descriptors/gitian-win-signer.yml
 	    mv build/out/syscoin-*win64-setup.exe ../syscoin-binaries/${VERSION}
 	    mv build/out/syscoin-*win32-setup.exe ../syscoin-binaries/${VERSION}
 	fi
@@ -371,8 +370,8 @@ then
 	    echo ""
 	    echo "Signing ${VERSION} Mac OSX"
 	    echo ""
-	    ./bin/gbuild -i --commit signature=${COMMIT} ../syscoin/contrib/gitian-descriptors/gitian-osx-signer.yml
-	    ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../syscoin/contrib/gitian-descriptors/gitian-osx-signer.yml
+	    ./bin/gbuild -i --commit signature=${COMMIT} --url signature=${url} ../syscoin/contrib/gitian-descriptors/gitian-osx-signer.yml
+	    ./bin/gsign $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../syscoin/contrib/gitian-descriptors/gitian-osx-signer.yml
 	    mv build/out/syscoin-osx-signed.dmg ../syscoin-binaries/${VERSION}/syscoin-${VERSION}-osx.dmg
 	fi
 	popd

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,38 +1,37 @@
 ---
-name: "syscoin-linux-0.13"
+name: "syscoin-linux-2.1.6"
 enable_cache: true
 suites:
 - "trusty"
 architectures:
 - "amd64"
 packages:
+- "autoconf"
+- "automake"
+- "binutils"
+- "binutils-aarch64-linux-gnu"
+- "binutils-arm-linux-gnueabihf"
+- "bsdmainutils"
+- "ca-certificates"
 - "curl"
-- "g++-aarch64-linux-gnu"
-- "g++-4.8-aarch64-linux-gnu"
+- "faketime"
 - "gcc-4.8-aarch64-linux-gnu"
-- "binutils-aarch64-linux-gnu"
-- "g++-arm-linux-gnueabihf"
-- "g++-4.8-arm-linux-gnueabihf"
 - "gcc-4.8-arm-linux-gnueabihf"
-- "binutils-arm-linux-gnueabihf"
-- "g++-4.8-multilib"
 - "gcc-4.8-multilib"
-- "binutils-gold"
+- "g++-4.8-aarch64-linux-gnu"
+- "g++-4.8-arm-linux-gnueabihf"
+- "g++-4.8-multilib"
+- "g++-aarch64-linux-gnu"
+- "g++-arm-linux-gnueabihf"
 - "git-core"
 - "pkg-config"
-- "autoconf"
 - "libtool"
-- "automake"
-- "faketime"
-- "bsdmainutils"
-- "ca-certificates"
 - "python"
 remotes:
 - "url": "https://github.com/syscoin/syscoin2.git"
   "dir": "syscoin"
 files: []
 script: |
-
   WRAP_DIR=$HOME/wrapped
   HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu"
   CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
@@ -174,7 +173,6 @@ script: |
     find . -name "lib*.a" -delete
     rm -rf ${DISTNAME}/lib/pkgconfig
     find ${DISTNAME}/bin -type f -executable -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \;
-    find ${DISTNAME}/lib -type f -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \;
     find ${DISTNAME} -not -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
     find ${DISTNAME} -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz
     cd ../../

contrib/gitian-descriptors/gitian-osx-signer.yml

@@ -7,7 +7,7 @@ architectures:
 packages:
 - "faketime"
 remotes:
-- "url": "https://github.com/syscoin-core/syscoin-detached-sigs.git"
+- "url": "https://github.com/syscoin/syscoin-detached-sigs.git"
   "dir": "signature"
 files:
 - "syscoin-osx-unsigned.tar.gz"

contrib/gitian-descriptors/gitian-osx.yml

@@ -1,32 +1,32 @@
 ---
-name: "syscoin-osx-0.13"
+name: "syscoin-osx-2.1.6"
 enable_cache: true
 suites:
 - "trusty"
 architectures:
 - "amd64"
 packages:
+- "autoconf"
+- "automake"
+- "bsdmainutils"
 - "ca-certificates"
+- "cmake"
 - "curl"
+- "faketime"
+- "fonts-tuffy"
 - "g++"
 - "git-core"
-- "pkg-config"
-- "autoconf"
+- "imagemagick"
+- "libcap-dev"
 - "librsvg2-bin"
 - "libtiff-tools"
 - "libtool"
-- "automake"
-- "faketime"
-- "bsdmainutils"
-- "cmake"
-- "imagemagick"
-- "libcap-dev"
 - "libz-dev"
 - "libbz2-dev"
+- "pkg-config"
 - "python"
 - "python-dev"
 - "python-setuptools"
-- "fonts-tuffy"
 remotes:
 - "url": "https://github.com/syscoin/syscoin2.git"
   "dir": "syscoin"

contrib/gitian-descriptors/gitian-win-signer.yml

@@ -8,7 +8,7 @@ packages:
 - "libssl-dev"
 - "autoconf"
 remotes:
-- "url": "https://github.com/syscoin-core/syscoin-detached-sigs.git"
+- "url": "https://github.com/syscoin/syscoin-detached-sigs.git"
   "dir": "signature"
 files:
 - "osslsigncode-1.7.1.tar.gz"