From a2241eabfdbdadd2f96c0a538b9901257831b642 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Mon, 1 Jun 2015 15:42:34 +0200 Subject: [PATCH 1/2] [OSX] revert renaming of Bitcoin-Qt.app --- Makefile.am | 2 +- contrib/macdeploy/detached-sig-create.sh | 2 +- contrib/macdeploy/fancy.plist | 2 +- contrib/macdeploy/macdeployqtplus | 2 +- doc/build-osx.md | 4 ++-- share/certs/PrivateKeyNotes.md | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 56c8c0922..3a215a014 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,7 @@ BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT) BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT) BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT) -OSX_APP=Bitcoin-Core.app +OSX_APP=Bitcoin-Qt.app OSX_DMG=Bitcoin-Core.dmg OSX_BACKGROUND_IMAGE=background.tiff OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus diff --git a/contrib/macdeploy/detached-sig-create.sh b/contrib/macdeploy/detached-sig-create.sh index fd7314bd7..18f8661ce 100755 --- a/contrib/macdeploy/detached-sig-create.sh +++ b/contrib/macdeploy/detached-sig-create.sh @@ -2,7 +2,7 @@ set -e ROOTDIR=dist -BUNDLE="${ROOTDIR}/Bitcoin Core.app" +BUNDLE="${ROOTDIR}/Bitcoin-Qt.app" CODESIGN=codesign TEMPDIR=sign.temp TEMPLIST=${TEMPDIR}/signatures.txt diff --git a/contrib/macdeploy/fancy.plist b/contrib/macdeploy/fancy.plist index a333f5dcc..ef277a7f1 100644 --- a/contrib/macdeploy/fancy.plist +++ b/contrib/macdeploy/fancy.plist @@ -22,7 +22,7 @@ 370 156 - Bitcoin Core.app + Bitcoin-Qt.app 128 156 diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index a625987ca..3ac44d024 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -596,7 +596,7 @@ if os.path.exists("dist"): # ------------------------------------------------ -target = os.path.join("dist", "Bitcoin Core.app") +target = os.path.join("dist", "Bitcoin-Qt.app") if verbose >= 2: print "+ Copying source bundle +" diff --git a/doc/build-osx.md b/doc/build-osx.md index 02adff061..913e72519 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -100,7 +100,7 @@ Creating a release build ------------------------ You can ignore this section if you are building `bitcoind` for your own use. -bitcoind/bitcoin-cli binaries are not included in the Bitcoin-Core.app bundle. +bitcoind/bitcoin-cli binaries are not included in the Bitcoin-Qt.app bundle. If you are building `bitcoind` or `Bitcoin-Qt` for others, your build machine should be set up as follows for maximum compatibility: @@ -111,7 +111,7 @@ All dependencies should be compiled with these flags: -arch x86_64 -isysroot $(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk -Once dependencies are compiled, see [doc/release-process.md](release-process.md) for how the Bitcoin-Core.app +Once dependencies are compiled, see [doc/release-process.md](release-process.md) for how the Bitcoin-Qt.app bundle is packaged and signed to create the .dmg disk image that is distributed. Running diff --git a/share/certs/PrivateKeyNotes.md b/share/certs/PrivateKeyNotes.md index cbd060c26..da299d168 100644 --- a/share/certs/PrivateKeyNotes.md +++ b/share/certs/PrivateKeyNotes.md @@ -7,7 +7,7 @@ signing requests. For OSX, the private key was generated by Keychain.app on Gavin's main work machine. The key and certificate is in a separate, passphrase-protected keychain file that is -unlocked to sign the Bitcoin-Core.app bundle. +unlocked to sign the Bitcoin-Qt.app bundle. For Windows, the private key was generated by Firefox running on Gavin's main work machine. The key and certificate were exported into a separate, passphrase-protected PKCS#12 file, and @@ -17,7 +17,7 @@ Threat analysis -- Gavin is a single point of failure. He could be coerced to divulge the secret signing keys, -allowing somebody to distribute a Bitcoin-Core.app or bitcoin-qt-setup.exe with a valid +allowing somebody to distribute a Bitcoin-Qt.app or bitcoin-qt-setup.exe with a valid signature but containing a malicious binary. Or the machine Gavin uses to sign the binaries could be compromised, either remotely or From 0a32a9347e12a8d1d4a46bf9a1d5b3ae13bbe501 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Tue, 2 Jun 2015 13:24:22 +0200 Subject: [PATCH 2/2] OSX: use "Bitcoin Core" as Bundle Display Name --- Makefile.am | 11 ++++++++--- .../macdeploy/Base.lproj/InfoPlist.strings | 1 + contrib/macdeploy/DS_Store | Bin 10244 -> 10244 bytes contrib/macdeploy/macdeployqtplus | 4 ++-- share/qt/Info.plist.in | 6 ++++++ 5 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 contrib/macdeploy/Base.lproj/InfoPlist.strings diff --git a/Makefile.am b/Makefile.am index 3a215a014..2f478e4b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ OSX_DMG=Bitcoin-Core.dmg OSX_BACKGROUND_IMAGE=background.tiff OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist +OSX_BASE_LPROJ_DIR=$(top_srcdir)/contrib/macdeploy/Base.lproj/InfoPlist.strings OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW @@ -30,7 +31,7 @@ WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \ $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \ $(top_srcdir)/doc/README_windows.txt -OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \ +OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) $(OSX_BASE_LPROJ_DIR) \ $(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_IMAGE) \ $(top_srcdir)/contrib/macdeploy/DS_Store \ $(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \ @@ -72,7 +73,7 @@ $(OSX_APP)/Contents/PkgInfo: $(OSX_APP)/Contents/Resources/empty.lproj: $(MKDIR_P) $(@D) - @touch $@ + @touch $@ $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST) $(MKDIR_P) $(@D) @@ -86,9 +87,13 @@ $(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN) $(MKDIR_P) $(@D) STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@ +$(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: $(OSX_BASE_LPROJ_DIR) + $(MKDIR_P) $(@D) + $(INSTALL_DATA) $< $@ + OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \ $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \ - $(OSX_APP)/Contents/MacOS/Bitcoin-Qt + $(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings if BUILD_DARWIN $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) diff --git a/contrib/macdeploy/Base.lproj/InfoPlist.strings b/contrib/macdeploy/Base.lproj/InfoPlist.strings new file mode 100644 index 000000000..b259ea141 --- /dev/null +++ b/contrib/macdeploy/Base.lproj/InfoPlist.strings @@ -0,0 +1 @@ +{ CFBundleDisplayName = "Bitcoin Core"; CFBundleName = "Bitcoin Core"; } diff --git a/contrib/macdeploy/DS_Store b/contrib/macdeploy/DS_Store index ca19b207c06c31ab722f3a9eb4f9d5f3a4a8f6de..db9d16f1d700f18b64edafa0f8d981a680567b4d 100644 GIT binary patch delta 1068 zcmdr~O-NKx6h3#nI%-zV8+DuW}YKKgd>@>aMO%qSurD}{g9vw z#TH4%aiK&6MQ)7HCNPj9Od@Eb;If6#rd7z;2fZy-G7qyYAy<*Wrrh_B<4TQ%c*O+1neZ+n|($Iee?w zY#y20^3L`xk>Y}KfK9QqL!1GZo?N&45Oa<_NTG$!5|O z&8IGqSE3wRp&fc530Gkp9>4;;f_Ly4w&6SMuuA4;K7NJY;G=w!Pw^Q(&!6&V{5fCX zi+G^UPGa{!p8nbOljB=vqHX_;XWw8EO1 z>QCwYf?$ZGYMN?D#gBF86)U3t0UGT6#jne+WN2DUCs5+8lx5^+uH2T?92`(?jIEeBQ=B2%y!4wlx!E=%tL_@ z21y-?ALyZj$2u0fhrq%mg)RjO5nY1l)X{^7=u&Ui6)dk^`rt9&ym{aI-tW!K!ob47 zl($V5<>D)#h!^u?AC~XN{;!8(0-tF|1 z&#iy#^`MxZF7eyWC|l-hPPK0CS(Y*mlmJ`Wiyy=ptY%H7vZ{&MhDQ3gNXXUd_980H z%vPUdXQ{Xqo#?|TCU67y@C471MGhbE4cpAds+gNKv1aCBGV5TStd|Y45jM)k*cD!1 zBU!$O_;`)fm8D^F6z>aHlfN}5umFi*AgIb}KsQ8DHbkE)X?`OvDgj-J8-_FyltodO z{09G2bJ3}^i+?~c-7KoZtFM&V?b1t!=j>uz0qhe?3E&N#2b`*g5F4X z(64rf#V#!(XRP&hR@6T-#9a-oe4yd=shCfXsXoJ}DCQ9~H7=?Cn5HYbq{xaK^!ZgS zq4^Ur^JIL{U2!Pj55#1hKXu=q50R@0^DI|sOcTWdut^&;VHbd}1@0hTU8r#q-zns) zh?_?=AqYUIz(wNp^7CLhAiLLx_^aJKUui6^+t~Bkq&~alxJzH%G=I}5&G%EvMp=vS z?Nq8S(m zBw&esiZW6pkcNR<6iHI0|F&UAsPlf864DG)?-)%qU* diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 3ac44d024..2253c40af 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -757,7 +757,7 @@ if config.dmg is not None: if fancy is None: try: - runHDIUtil("create", dmg_name, srcfolder="dist", format="UDBZ", volname=app_bundle_name, ov=True) + runHDIUtil("create", dmg_name, srcfolder="dist", format="UDBZ", volname="Bitcoin-Core", ov=True) except subprocess.CalledProcessError as e: sys.exit(e.returncode) else: @@ -772,7 +772,7 @@ if config.dmg is not None: if verbose >= 3: print "Creating temp image for modification..." try: - runHDIUtil("create", dmg_name + ".temp", srcfolder="dist", format="UDRW", size=size, volname=app_bundle_name, ov=True) + runHDIUtil("create", dmg_name + ".temp", srcfolder="dist", format="UDRW", size=size, volname="Bitcoin-Core", ov=True) except subprocess.CalledProcessError as e: sys.exit(e.returncode) diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index dd6edde8d..d5a7144be 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -30,6 +30,12 @@ CFBundleExecutable Bitcoin-Qt + + CFBundleName + Bitcoin-Qt + + LSHasLocalizedDisplayName + CFBundleIdentifier org.bitcoinfoundation.Bitcoin-Qt