osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

More packaging updates. 

Specify "Application" or "Installer" code signing identities as needed.
Switch back to productbuild for the package. That seems to be the
correct utility to use. Give the package an ID. Package signing is still
broken but this appears to be closer to being correct.

svn path=/trunk/; revision=53211
This commit is contained in:
Gerald Combs 2013-11-10 01:31:25 +00:00
parent 48c5a9ae37
commit 04a7231d91
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/macosx/osx-app.sh
View File

@ -592,7 +592,7 @@ else
fi
codesign_file () {
codesign --sign "$CODE_SIGN_IDENTITY" --verbose "$1"
codesign --sign "Developer ID Application: $CODE_SIGN_IDENTITY" --verbose "$1"
codesign --verify --verbose "$1" || exit 1
spctl --assess --type execute "$1" || exit 1
}

7
packaging/macosx/osx-dmg.sh.in
View File

@ -152,16 +152,17 @@ pkg_file="$pkg_title.pkg"
rm -rf "$pkg_file"
packagemaker --doc "Wireshark_package.pmdoc" \
--title "$pkg_title" \
--id "org.wireshark.pkg.Wireshark"
--version "$version" \
--target 10.5 \
--verbose || exit 1
if [ -n "$CODE_SIGN_IDENTITY" ] ; then
#pkg_file_unsigned="$pkg_title UNSIGNED.pkg"
pkg_file_unsigned="$pkg_title UNSIGNED.pkg"
echo -e "Signing $pkg_file"
#mv "$pkg_file" "$pkg_file_unsigned" || exit 1
#productsign --sign "$CODE_SIGN_IDENTITY" "$pkg_file_unsigned" "$pkg_file" || exit 1
mv "$pkg_file" "$pkg_file_unsigned" || exit 1
productsign --sign "Developer ID Installer: $CODE_SIGN_IDENTITY" "$pkg_file_unsigned" "$pkg_file" || exit 1
codesign --sign "$CODE_SIGN_IDENTITY" --verify "$pkg_file" || exit 1
spctl --assess --type install "$pkg_file" #|| exit 1
shasum "$pkg_file"