diff options
| author | Guilhem Moulin <guilhem@libreoffice.org> | 2018-02-05 13:00:14 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2018-04-15 23:10:08 +0200 |
| commit | ba69036c8e889237da4bb312d7c5c94066abbfd3 (patch) | |
| tree | 6817577e9e276590b19c1c25efa3bb0289e5e7cb /instsetoo_native | |
| parent | 437d008081fe0d185b74ad9daad02ccd8e460fd3 (diff) | |
Upgrade update check and extension URLs to https
Change-Id: I697458fb3deba508e61e414c43fcfc85aff76f9b
Signed-off-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/49237
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 4 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 28 |
2 files changed, 16 insertions, 16 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 95de9f7202fa..315e5c825de3 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -157,11 +157,11 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US)' \ && echo 'BuildVersion=$(BUILD_VER_STRING)' \ && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)' \ - && echo 'ExtensionUpdateURL=http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update' \ + && echo 'ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update' \ && echo 'UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),$(shell cd $(SRCDIR) && bin/update/get_update_channel.py $(UPDATE_CONFIG)))' \ && echo 'ReferenceOOoMajorMinor=4.1' \ && echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \ - && echo 'UpdateURL=$(if $(ENABLE_ONLINE_UPDATE),http://update.libreoffice.org/check.php$(if $(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \ + && echo 'UpdateURL=$(if $(ENABLE_ONLINE_UPDATE),https://update.libreoffice.org/check.php$(if $(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \ && echo 'UpdateUserAgent=<PRODUCT> ($${buildid}; $${_OS}; $${_ARCH}; <OPTIONAL_OS_HW_DATA>)' \ && echo 'Vendor=$(OOO_VENDOR)' \ ) > $@ diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 24bb9761f7f0..b94b7c330e40 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -56,7 +56,7 @@ LibreOffice ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ PCPFILENAME libreoffice.pcp - UPDATEURL http://update.libreoffice.org/check.php + UPDATEURL https://update.libreoffice.org/check.php ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt ADDSYSTEMINTEGRATION 1 PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ @@ -68,10 +68,10 @@ LibreOffice OOODOWNLOADNAME 1 CHANGETARGETDIR 1 PATCHCODEFILE ooo_patchcodes.txt - STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ + STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/ STARTCENTER_INFO_URL https://www.libreoffice.org/ - STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ - DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ + STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/ + DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 } active 1 @@ -107,7 +107,7 @@ LibreOfficeDev UREPACKAGEPREFIX libreofficedev SOLSUREPACKAGEPREFIX libreofficedev REGISTRYLAYERNAME LayerDev - UPDATEURL http://update.libreoffice.org/check.php + UPDATEURL https://update.libreoffice.org/check.php ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt ADDSYSTEMINTEGRATION 1 PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ @@ -121,10 +121,10 @@ LibreOfficeDev PATCHCODEFILE ooodev_patchcodes.txt CODEFILENAME codes_ooodev.txt LOCALUSERDIR $ORIGIN/.. - STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ + STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/ STARTCENTER_INFO_URL https://www.libreoffice.org/ - STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ - DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ + STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/ + DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 } active 1 @@ -163,10 +163,10 @@ LibreOffice_SDK NOSHORTDIRECTORYNAMES 1 CHANGETARGETDIR 1 DONTUSESTARTMENUFOLDER 1 - STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ + STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/ STARTCENTER_INFO_URL https://www.libreoffice.org/ - STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ - DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ + STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/ + DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 } active 1 @@ -209,10 +209,10 @@ LibreOfficeDev_SDK NOSHORTDIRECTORYNAMES 1 CHANGETARGETDIR 1 DONTUSESTARTMENUFOLDER 1 - STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ + STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/ STARTCENTER_INFO_URL https://www.libreoffice.org/ - STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ - DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ + STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/ + DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 } active 1 |