ThomasV
4 years ago
committed by
GitHub
GitHub
4 changed files with 201 additions and 17 deletions
@ -0,0 +1,58 @@ |
|||
#!/bin/sh |
|||
# Copyright (c) 2014-2019 The Bitcoin Core developers |
|||
# Distributed under the MIT software license, see the accompanying |
|||
# file COPYING or http://www.opensource.org/licenses/mit-license.php. |
|||
# |
|||
# This script is based on https://github.com/bitcoin/bitcoin/blob/194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf/contrib/macdeploy/detached-sig-apply.sh |
|||
|
|||
export LC_ALL=C |
|||
set -e |
|||
|
|||
if [ $(uname) != "Darwin" ]; then |
|||
echo "This script needs to be run on macOS." |
|||
exit 1 |
|||
fi |
|||
|
|||
CP=gcp |
|||
|
|||
UNSIGNED="$1" |
|||
SIGNATURE="$2" |
|||
ARCH=x86_64 |
|||
OUTDIR="/tmp/electrum_compare_dmg/signed_app" |
|||
|
|||
if [ -z "$UNSIGNED" ]; then |
|||
echo "usage: $0 <unsigned app> <path to mac_extracted_sigs.tar.gz>" |
|||
exit 1 |
|||
fi |
|||
|
|||
if [ -z "$SIGNATURE" ]; then |
|||
echo "usage: $0 <unsigned app> <path to mac_extracted_sigs.tar.gz>" |
|||
exit 1 |
|||
fi |
|||
|
|||
rm -rf ${OUTDIR} && mkdir -p ${OUTDIR} |
|||
${CP} -rf ${UNSIGNED} ${OUTDIR} |
|||
tar xf "${SIGNATURE}" -C ${OUTDIR} |
|||
|
|||
find ${OUTDIR} -name "*.sign" | while read i; do |
|||
SIZE=$(gstat -c %s "${i}") |
|||
TARGET_FILE="$(echo "${i}" | sed 's/\.sign$//')" |
|||
|
|||
if [ -z ${QUIET} ]; then |
|||
echo "Allocating space for the signature of size ${SIZE} in ${TARGET_FILE}" |
|||
fi |
|||
codesign_allocate -i "${TARGET_FILE}" -a ${ARCH} ${SIZE} -o "${i}.tmp" |
|||
|
|||
OFFSET=$(pagestuff "${i}.tmp" -p | tail -2 | grep offset | sed 's/[^0-9]*//g') |
|||
if [ -z ${QUIET} ]; then |
|||
echo "Attaching signature at offset ${OFFSET}" |
|||
fi |
|||
|
|||
dd if="$i" of="${i}.tmp" bs=1 seek=${OFFSET} count=${SIZE} 2>/dev/null |
|||
mv "${i}.tmp" "${TARGET_FILE}" |
|||
rm "${i}" |
|||
if [ -z ${QUIET} ]; then |
|||
echo "Success." |
|||
fi |
|||
done |
|||
echo "Done. .app with sigs applied is at: ${OUTDIR}" |
|||
@ -1,28 +1,60 @@ |
|||
#!/usr/bin/env bash |
|||
set -e |
|||
|
|||
src_dir=$(dirname "$0") |
|||
cd "$src_dir/../.." |
|||
if [ $(uname) != "Darwin" ]; then |
|||
echo "This script needs to be run on macOS." |
|||
exit 1 |
|||
fi |
|||
|
|||
UNSIGNED_DMG="$1" |
|||
RELEASE_DMG="$2" |
|||
CONTRIB_OSX="$(dirname "$(grealpath "$0")")" |
|||
PROJECT_ROOT="$CONTRIB_OSX/../.." |
|||
WORKSPACE="/tmp/electrum_compare_dmg" |
|||
|
|||
if [ -z "$UNSIGNED_DMG" ]; then |
|||
echo "usage: $0 <unsigned dmg> <release dmg>" |
|||
exit 1 |
|||
fi |
|||
|
|||
if [ -z "$RELEASE_DMG" ]; then |
|||
echo "usage: $0 <unsigned dmg> <release dmg>" |
|||
exit 1 |
|||
fi |
|||
|
|||
UNSIGNED_DMG=$(grealpath "$UNSIGNED_DMG") |
|||
RELEASE_DMG=$(grealpath "$RELEASE_DMG") |
|||
|
|||
cd "$PROJECT_ROOT" |
|||
rm -rf "$WORKSPACE" && mkdir -p "$WORKSPACE" |
|||
|
|||
rm -rf dmg1 |
|||
hdiutil attach $1 |
|||
cp -r /Volumes/Electrum/Electrum.app/ dmg1 |
|||
DMG_UNSIGNED_UNPACKED="$WORKSPACE/dmg1" |
|||
DMG_RELEASE_UNPACKED="$WORKSPACE/dmg2" |
|||
|
|||
hdiutil attach "$UNSIGNED_DMG" |
|||
cp -r /Volumes/Electrum "$DMG_UNSIGNED_UNPACKED" |
|||
hdiutil detach /Volumes/Electrum |
|||
|
|||
rm -rf dmg2 |
|||
hdiutil attach $2 |
|||
cp -r /Volumes/Electrum/Electrum.app/ dmg2 |
|||
hdiutil attach "$RELEASE_DMG" |
|||
cp -r /Volumes/Electrum "$DMG_RELEASE_UNPACKED" |
|||
hdiutil detach /Volumes/Electrum |
|||
|
|||
# remove signatures |
|||
for i in $(find dmg1/ ); do codesign --remove-signature $i || true; done; |
|||
for i in $(find dmg2/ ); do codesign --remove-signature $i || true; done; |
|||
# copy signatures from RELEASE_DMG to UNSIGNED_DMG |
|||
echo "Extracting signatures from release app..." |
|||
QUIET="1" "$CONTRIB_OSX/extract_sigs.sh" "$DMG_RELEASE_UNPACKED"/Electrum.app |
|||
echo "Applying extracted signatures to unsigned app..." |
|||
QUIET="1" "$CONTRIB_OSX/apply_sigs.sh" "$DMG_UNSIGNED_UNPACKED"/Electrum.app mac_extracted_sigs.tar.gz |
|||
|
|||
rm mac_extracted_sigs.tar.gz |
|||
|
|||
diff=$(diff -qr dmg1 dmg2) |
|||
diff=$(diff -qr "$WORKSPACE/signed_app" "$DMG_RELEASE_UNPACKED") || true |
|||
echo $diff |
|||
if [ "$diff" ] |
|||
then |
|||
if [ "$diff" ]; then |
|||
echo "DMGs do *not* match." |
|||
echo "failure" |
|||
exit 1 |
|||
else |
|||
echo "DMGs match." |
|||
echo "success" |
|||
exit 0 |
|||
fi |
|||
|
|||
@ -0,0 +1,66 @@ |
|||
#!/bin/sh |
|||
# Copyright (c) 2014-2019 The Bitcoin Core developers |
|||
# Distributed under the MIT software license, see the accompanying |
|||
# file COPYING or http://www.opensource.org/licenses/mit-license.php. |
|||
# |
|||
# This script is based on https://github.com/bitcoin/bitcoin/blob/194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf/contrib/macdeploy/detached-sig-create.sh |
|||
|
|||
export LC_ALL=C |
|||
set -e |
|||
|
|||
if [ $(uname) != "Darwin" ]; then |
|||
echo "This script needs to be run on macOS." |
|||
exit 1 |
|||
fi |
|||
|
|||
TEMPDIR="/tmp/electrum_compare_dmg/sigs.temp" |
|||
OUT=mac_extracted_sigs.tar.gz |
|||
OUTROOT=. |
|||
|
|||
if [ -z "$1" ]; then |
|||
echo "usage: $0 <path to .app>" |
|||
exit 1 |
|||
fi |
|||
BUNDLE="$1" |
|||
BUNDLE_BASENAME=$(basename "$BUNDLE") |
|||
|
|||
rm -rf ${TEMPDIR} |
|||
mkdir -p ${TEMPDIR} |
|||
|
|||
MAYBE_SIGNED_FILES=$(find "$BUNDLE/Contents/MacOS/" -type f) |
|||
|
|||
echo "${MAYBE_SIGNED_FILES}" | while read i; do |
|||
# skip files where pagestuff errors; these probably do not need signing: |
|||
pagestuff "$i" -p 1>/dev/null 2>/dev/null || continue |
|||
TARGETFILE="${BUNDLE_BASENAME}/$(echo "${i}" | sed "s|.*${BUNDLE}/||")" |
|||
SIZE=$(pagestuff "$i" -p | tail -2 | grep size | sed 's/[^0-9]*//g') |
|||
OFFSET=$(pagestuff "$i" -p | tail -2 | grep offset | sed 's/[^0-9]*//g') |
|||
SIGNFILE="${TEMPDIR}/${OUTROOT}/${TARGETFILE}.sign" |
|||
DIRNAME="$(dirname "${SIGNFILE}")" |
|||
mkdir -p "${DIRNAME}" |
|||
if [ -z ${QUIET} ]; then |
|||
echo "Adding detached signature for: ${TARGETFILE}. Size: ${SIZE}. Offset: ${OFFSET}" |
|||
fi |
|||
dd if="$i" of="${SIGNFILE}" bs=1 skip=${OFFSET} count=${SIZE} 2>/dev/null |
|||
done |
|||
|
|||
FILES_TO_COPY=$(cat << EOF |
|||
$BUNDLE/Contents/_CodeSignature/CodeResources |
|||
$BUNDLE/Contents/CodeResources |
|||
EOF |
|||
) |
|||
|
|||
echo "${FILES_TO_COPY}" | while read i; do |
|||
TARGETFILE="${BUNDLE_BASENAME}/$(echo "${i}" | sed "s|.*${BUNDLE}/||")" |
|||
RESOURCE="${TEMPDIR}/${OUTROOT}/${TARGETFILE}" |
|||
DIRNAME="$(dirname "${RESOURCE}")" |
|||
mkdir -p "${DIRNAME}" |
|||
if [ -z ${QUIET} ]; then |
|||
echo "Adding resource for: \"${TARGETFILE}\"" |
|||
fi |
|||
cp "${i}" "${RESOURCE}" |
|||
done |
|||
|
|||
tar -C "${TEMPDIR}" -czf "${OUT}" . |
|||
rm -rf "${TEMPDIR}" |
|||
echo "Created ${OUT}" |
|||
Loading…
Reference in new issue