postprocess/CustomTarget_signing.mk | 2 +- postprocess/signing/signing.pl | 3 ++- solenv/bin/modules/installer.pm | 2 +- solenv/bin/modules/installer/windows/msp.pm | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-)
New commits: commit 20ef2e0801f78515ccacc63e43a6490ded141f98 Author: Andras Timar <[email protected]> AuthorDate: Wed Apr 18 07:19:00 2018 -0700 Commit: Andras Timar <[email protected]> CommitDate: Mon May 10 10:26:06 2021 +0200 [cp] HACK: sleep before sign On Windows, with 16x parallel build, build-nocheck target fails, because it tries to sign a file that is already in use (gengal). Change-Id: Ic582334f2c02f5e38f49d048fc0425025ffeee41 Reviewed-on: https://gerrit.libreoffice.org/75235 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl index 2d70fa8448fa..1c62c8dcedb2 100644 --- a/postprocess/signing/signing.pl +++ b/postprocess/signing/signing.pl @@ -41,6 +41,7 @@ my @args = (); my @files_to_sign = (); #### main ##### +sleep(120); $myname = script_id(); if ( $#ARGV < 2 ) { usage(); commit e623af1510f23243dee9951ef6fa41806a7d208d Author: Andras Timar <[email protected]> AuthorDate: Thu Feb 11 08:27:23 2021 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon May 10 10:24:58 2021 +0200 try to use a different timestamp service Change-Id: I0fdbe2871d74836d530a69532bf22c17f642c922 diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index 573c396f49de..535404d505fc 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -15,7 +15,7 @@ $(eval $(call gb_CustomTarget_register_targets,postprocess/signing,\ )) # PFXFILE and PFXPASSWORD should be set in environment -TIMESTAMPURL ?= "http://timestamp.globalsign.com/scripts/timestamp.dll"; +TIMESTAMPURL ?= "http://timestamp.digicert.com/"; $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \ $(SRCDIR)/postprocess/signing/signing.pl \ diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl index bd5c2e3fe0d1..2d70fa8448fa 100644 --- a/postprocess/signing/signing.pl +++ b/postprocess/signing/signing.pl @@ -240,7 +240,7 @@ sub usage #09.07.2007 08:39 print "\t -e filename\t\t\tFile which contains a list of files which don't have to be signed.\n"; print "\t -f pfx_filename\t\t\"Personal Information Exchange\" file.\n"; print "\t -p password\t\t\tPassword for \"Personal Information Exchange\" file.\n"; - print "\t -t timestamp\t\t\tTimestamp URL e.g. \"http://timestamp.verisign.com/scripts/timstamp.dll\"\n";; + print "\t -t timestamp\t\t\tTimestamp URL e.g. \"http://timestamp.digicert.com/\"\n";; print "\t -l log_filename\t\tFile for logging.\n"; print "\t -v\t\t\t\tVerbose.\n"; } ##usage diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index 151462f94ffc..d2bc261b14e0 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -1671,7 +1671,7 @@ sub run { my $systemcall = "signtool.exe sign "; if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= "-f $ENV{'PFXFILE'} "; } if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall .= "-p $ENV{'PFXPASSWORD'} "; } - if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t $ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t http://timestamp.globalsign.com/scripts/timestamp.dll "; } + if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t $ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t http://timestamp.digicert.com/ "; } $systemcall .= "-d \"" . installer::download::get_downloadname_productname($allvariableshashref) . " " . installer::download::get_download_version($allvariableshashref) . " " . installer::download::get_downloadname_language($languagestringref) . " " . installer::download::get_download_functionality($allvariableshashref) . "\" "; $systemcall .= $finalinstalldir . $installer::globals::separator . $$downloadname . ".msi"; installer::logger::print_message( "... code signing and timestamping with signtool.exe ...\n" ); diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm index 1bbeea8d20cb..95f51d846c40 100644 --- a/solenv/bin/modules/installer/windows/msp.pm +++ b/solenv/bin/modules/installer/windows/msp.pm @@ -1194,7 +1194,7 @@ sub create_msp_patch my $systemcall = "signtool.exe sign "; if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= "-f $ENV{'PFXFILE'} "; } if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall .= "-p $ENV{'PFXPASSWORD'} "; } - if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t $ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t http://timestamp.globalsign.com/scripts/timestamp.dll "; } + if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t $ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t http://timestamp.digicert.com/ "; } $systemcall .= "-d \"" . $allvariables->{'PRODUCTNAME'} . " " . $allvariables->{'PRODUCTVERSION'} . " Patch " . $allvariables->{'WINDOWSPATCHLEVEL'} . "\" "; $systemcall .= $localmspfilename; installer::logger::print_message( "... code signing and timestamping with signtool.exe ...\n" ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
