From 6e9308c6d4ed9fbf909c7234ae31245747183be3 Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Wed, 9 Mar 2022 09:50:53 -0500 Subject: [PATCH 1/2] guix: use latest signapple --- contrib/guix/manifest.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 9512050ce47..a0afb7b4f6b 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -485,7 +485,7 @@ and endian independent.") (license license:expat))) (define-public python-signapple - (let ((commit "9f42f3c8295d4107ee7a22e523ec17449a936f43")) + (let ((commit "0777ce58e61b0e6be753a5f524149d6d47905186")) (package (name "python-signapple") (version (git-version "0.1" "1" commit)) @@ -498,7 +498,7 @@ and endian independent.") (file-name (git-file-name name commit)) (sha256 (base32 - "0j1sqi0g8k2z5y56iayh5pw9yyq1r6ry3q5zy0cdy2sispiwvdnp")))) + "19axspyyfqbrfw2r53c17mi9bvm8zsb39mz8v9h7c173qkm3x5ym")))) (build-system python-build-system) (propagated-inputs `(("python-asn1crypto" ,python-asn1crypto) From 0189df1d3171082caf743ef3b0968f43c71303f5 Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Wed, 9 Mar 2022 09:09:40 -0500 Subject: [PATCH 2/2] build, mac: Include arch in codesignature tarball --- contrib/macdeploy/detached-sig-create.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/macdeploy/detached-sig-create.sh b/contrib/macdeploy/detached-sig-create.sh index 0d61ceb9df0..f393331084e 100755 --- a/contrib/macdeploy/detached-sig-create.sh +++ b/contrib/macdeploy/detached-sig-create.sh @@ -8,9 +8,11 @@ set -e ROOTDIR=dist BUNDLE="${ROOTDIR}/Bitcoin-Qt.app" +BINARY="${BUNDLE}/Contents/MacOS/Bitcoin-Qt" SIGNAPPLE=signapple TEMPDIR=sign.temp -OUT=signature-osx.tar.gz +ARCH=$(${SIGNAPPLE} info ${BINARY} | head -n 1 | cut -d " " -f 1) +OUT="signature-osx-${ARCH}.tar.gz" OUTROOT=osx/dist if [ -z "$1" ]; then