[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-4' - 2 commits - configure.ac instsetoo_native/CustomTarget_install.mk postprocess/CustomTarget_signing.mk postprocess/signing solenv/bin

[Andras Timar (via logerrit)]

Rebased ref, commits from common ancestor:
commit bdc0bc28caa85175327b87cf7de8176e7bcc47bb
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu May 6 13:07:00 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu May 6 17:09:19 2021 +0200

    Bump product version to 6.4.7.2.M1
    
    Change-Id: I2a6f38caf2e17eaaad6d32610f0ca0f1a1125323

diff --git a/configure.ac b/configure.ac
index 0d61a9640b2a..1a1e10cdbf7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice],[6.4.7.2.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.4.7.2.M1],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
commit 8917da9a4f566e765df6eaf07b35cf25b236b9fe
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: Thu May 6 17:09:19 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 ab620d5844ed..99082b14be22 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -131,7 +131,7 @@ endif
 endif # LIBO_TEST_INSTALL
 	touch $@
 
-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 7ba7c5832f17..c2f03ce937a1 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 b42e5bb17e89..a443984a2a7b 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -242,7 +242,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" );