diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-12-03 21:47:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-04 22:49:40 +0100 |
| commit | d386392e79d59f0c5647b0d778348b72d7cd7069 (patch) | |
| tree | f44c52ffbee819924114592e00c91b73b09347c8 /platform | |
| parent | b2743153dde1355d13d9c3ab3a7e85cd76ea61f7 (diff) | |
Package a patched openssl which creates certificates with
a validity period starting a week before now; fixes #1422.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/make_dmg.sh | 5 | ||||
| -rw-r--r-- | platform/windows/wscript | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index ab5dd3934..95e8f8db0 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -383,6 +383,7 @@ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2 "$approot/MacOS" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_cli "$approot/MacOS" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_create "$approot/MacOS" copy $ROOT bin/ffprobe "$approot/MacOS" +copy $ROOT src/openssl/apps/openssl "$approot/MacOS" cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2" "$approot/MacOS/dcpomatic2_cli" "$approot/MacOS/dcpomatic2_create" "$approot/MacOS/ffprobe" "$approot/Frameworks/"*.dylib) relink "${rl[@]}" @@ -392,6 +393,7 @@ make_dmg "$appdir" "DCP-o-matic" com.dcpomatic setup "DCP-o-matic 2 KDM Creator.app" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm "$approot/MacOS" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm_cli "$approot/MacOS" +copy $ROOT src/openssl/apps/openssl "$approot/MacOS" cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_kdm.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2_kdm" "$approot/MacOS/dcpomatic2_kdm_cli" "$approot/Frameworks/"*.dylib) relink "${rl[@]}" @@ -401,6 +403,7 @@ make_dmg "$appdir" "DCP-o-matic KDM Creator" com.dcpomatic.kdm setup "DCP-o-matic 2 Encode Server.app" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server "$approot/MacOS" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server_cli "$approot/MacOS" +copy $ROOT src/openssl/apps/openssl "$approot/MacOS" cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_server.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2_server" "$approot/MacOS/dcpomatic2_server_cli" "$approot/Frameworks/"*.dylib) relink "${rl[@]}" @@ -409,6 +412,7 @@ make_dmg "$appdir" "DCP-o-matic Encode Server" com.dcpomatic.server # DCP-o-matic Batch Converter setup "DCP-o-matic 2 Batch converter.app" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_batch "$approot/MacOS" +copy $ROOT src/openssl/apps/openssl "$approot/MacOS" cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_batch.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2_batch" "$approot/Frameworks/"*.dylib) relink "${rl[@]}" @@ -417,6 +421,7 @@ make_dmg "$appdir" "DCP-o-matic Batch Converter" com.dcpomatic.batch # DCP-o-matic Player setup "DCP-o-matic 2 Player.app" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_player "$approot/MacOS" +copy $ROOT src/openssl/apps/openssl "$approot/MacOS" cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_player.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2_player" "$approot/Frameworks/"*.dylib) relink "${rl[@]}" diff --git a/platform/windows/wscript b/platform/windows/wscript index 933c4078f..b5dde858d 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -194,6 +194,7 @@ File "%cdist_deps%/bin/dcp-1.0.dll" File "%cdist_deps%/bin/cxml-0.dll" File "%cdist_deps%/bin/sub-1.0.dll" File "%cdist_deps%/bin/ffprobe.exe" +File "%cdist_deps%/src/openssl/apps/openssl.exe" """, file=f) if windows_version == 'xp': |