Merge branch 'develop' into release/v7.17.3

Knorre · May 9, 2021 · 4823b56 · 4823b56
2 parents 7a4890b + afeea3f
commit 4823b56
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py
@@ -29,7 +29,7 @@ def setup():
     if not os.path.isdir('gitian-builder'):
         subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
     if not os.path.isdir('digibyte'):
-        subprocess.check_call(['git', 'clone', 'https://github.com/digibyte/digibyte.git'])
+        subprocess.check_call(['git', 'clone', 'https://github.com/digibyte-core/digibyte.git'])
     os.chdir('gitian-builder')
     make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
     if args.docker:
@@ -51,8 +51,8 @@ def build():
     os.chdir('gitian-builder')
     os.makedirs('inputs', exist_ok=True)
 
-    subprocess.check_call(['wget', '-N', '-P', 'inputs', 'http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz'])
-    subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://digibytecore.org/cfields/osslsigncode-Backports-to-1.7.1.patch'])
+    subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://github.com/DigiByte-Core/osslsigncode-1.7.1.tar.gz-1/raw/master/osslsigncode-1.7.1.tar.gz'])
+    subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://raw.githubusercontent.com/DigiByte-Core/osslsigncode-1.7.1.tar.gz-1/master/osslsigncode-Backports-to-1.7.1.patch'])
     subprocess.check_call(['make', '-C', '../digibyte/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common'])
 
     if args.linux:

diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
@@ -16,12 +16,12 @@ osx=true
 SIGNER=
 VERSION=
 commit=false
-url=https://github.com/digibyte/digibyte
+url=https://github.com/digibyte-core/digibyte
 proc=2
 mem=2000
 lxc=true
-osslTarUrl=http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
-osslPatchUrl=https://digibytecore.org/cfields/osslsigncode-Backports-to-1.7.1.patch
+osslTarUrl=https://github.com/DigiByte-Core/osslsigncode-1.7.1.tar.gz-1/raw/master/osslsigncode-1.7.1.tar.gz
+osslPatchUrl=https://raw.githubusercontent.com/DigiByte-Core/osslsigncode-1.7.1.tar.gz-1/master/osslsigncode-Backports-to-1.7.1.patch
 scriptName=$(basename -- "$0")
 signProg="gpg --detach-sign"
 commitFiles=true
@@ -38,7 +38,7 @@ 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/digibyte/digibyte
+-u|--url	Specify the URL of the repository. Default is https://github.com/digibyte-core/digibyte
 -v|--verify 	Verify the Gitian build
 -b|--build	Do a Gitian build
 -s|--sign	Make signed binaries for Windows and Mac OSX
@@ -229,8 +229,8 @@ echo ${COMMIT}
 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/digibyte/gitian.sigs.git
-    git clone https://github.com/digibyte/digibyte-detached-sigs.git
+    git clone https://github.com/digibyte-core/gitian.sigs.git
+    git clone https://github.com/digibyte-core/digibyte-detached-sigs.git
     git clone https://github.com/devrandom/gitian-builder.git
     pushd ./gitian-builder
     if [[ -n "$USE_LXC" ]]