[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-0' - 2 commits - instsetoo_native/CustomTarget_install.mk postprocess/CustomTarget_signing.mk postprocess/signing solenv/bin

[Andras Timar (via logerrit)]

 instsetoo_native/CustomTarget_install.mk    |    2 +-
 postprocess/CustomTarget_signing.mk         |    2 +-
 postprocess/signing/signing.pl              |    3 ++-
 solenv/bin/modules/installer/windows/msp.pm |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit b172e43f53e61da262a072ba01e042740ba0498d
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Apr 18 07:19:00 2018 -0700
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 10 23:51:36 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 <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index 769b9efbcc7a..a443984a2a7b 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 a46c219138f18e7fd639b8b25c0959a642385a7a
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Feb 11 08:27:23 2021 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 10 23:51:03 2021 +0200

    try to use a different timestamp service
    
    Change-Id: I0fdbe2871d74836d530a69532bf22c17f642c922

diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index b9991d208dd4..36e8c15fe5dc 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -133,7 +133,7 @@ endif # LIBO_TEST_INSTALL
 	touch $@
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
 
-TIMESTAMPURL ?= "http://timestamp.globalsign.com/scripts/timestamp.dll"
+TIMESTAMPURL ?= "http://timestamp.digicert.com/"
 $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_signing.done: \
         $(if $(filter HELP,$(BUILD_TYPE)),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signing.done) \
         $(if $(filter ODK,$(BUILD_TYPE)),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.done) \
diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk
index a00faa857f2a..3f0c5ec5b6ca 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 ed8065399f05..769b9efbcc7a 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -241,7 +241,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/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" );