Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Publish updates to the new catalog file and switch to SHA-256 (phase 2)

Browse Source 
Version 2.4 switched to the catalog-0001.xml file. The new catalog file
is using SHA-256 hashes and signatures.

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2020-02-25 09:59:52 +01:00
parent 1434c9a2d3
commit 0970997ab7
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -18,7 +18,6 @@
# #
OUTPUT_DIR=output OUTPUT_DIR=output
PUBLISH_DIR_LEGACY=\\amebis.doma\Splet\WWW\Apache2\www.amebis.si-prenos\ZRCola
PUBLISH_DIR=\\amebis.doma\Splet\WWW\IIS-ext\prenos.amebis.si\ZRCola PUBLISH_DIR=\\amebis.doma\Splet\WWW\IIS-ext\prenos.amebis.si\ZRCola
!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" !IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
@ -96,13 +95,11 @@ All :: \
PublishPre :: \ PublishPre :: \
"$(PUBLISH_PACKAGE_DIR)" \ "$(PUBLISH_PACKAGE_DIR)" \
"$(PUBLISH_DIR_LEGACY)" \
"$(PUBLISH_DIR)" "$(PUBLISH_DIR)"
Publish :: \ Publish :: \
PublishPre \ PublishPre \
"$(PUBLISH_DIR_LEGACY)\catalog-0000.xml" \ "$(PUBLISH_DIR)\catalog-0001.xml"
"$(PUBLISH_DIR)\catalog-0000.xml"
###################################################################### ######################################################################
@ -176,7 +173,6 @@ UnregisterShortcuts ::
"$(OUTPUT_DIR)" \ "$(OUTPUT_DIR)" \
"$(OUTPUT_DIR)\Keys" \ "$(OUTPUT_DIR)\Keys" \
"$(OUTPUT_DIR)\locale" \ "$(OUTPUT_DIR)\locale" \
"$(PUBLISH_DIR_LEGACY)" \
"$(PUBLISH_DIR)" \ "$(PUBLISH_DIR)" \
"$(PUBLISH_PACKAGE_DIR)" \ "$(PUBLISH_PACKAGE_DIR)" \
"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" : "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" :
@ -217,8 +213,7 @@ UnregisterShortcuts ::
# Building # Building
###################################################################### ######################################################################
"$(PUBLISH_DIR_LEGACY)\catalog-0000.xml" \ "$(PUBLISH_DIR)\catalog-0001.xml" : "$(OUTPUT_DIR)\catalog.xml"
"$(PUBLISH_DIR)\catalog-0000.xml" : "$(OUTPUT_DIR)\catalog.xml"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\catalog.xml" : \ "$(OUTPUT_DIR)\catalog.xml" : \
@ -229,7 +224,7 @@ UnregisterShortcuts ::
"$(OUTPUT_DIR)\ZRColaSl32.msi" \ "$(OUTPUT_DIR)\ZRColaSl32.msi" \
"$(OUTPUT_DIR)\ZRColaSl64.msi" "$(OUTPUT_DIR)\ZRColaSl64.msi"
-if exist $@ del /f /q $@ -if exist $@ del /f /q $@
copy /y "$(PUBLISH_DIR)\catalog-0000.xml" "$(@:"=).tmp" > NUL copy /y "$(PUBLISH_DIR)\catalog-0001.xml" "$(@:"=).tmp" > NUL
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.msi" "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.msi"
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.msi" "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.msi"
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu32.msi" -f "$(OUTPUT_DIR)\ZRColaRu32.msi" "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu32.msi" -f "$(OUTPUT_DIR)\ZRColaRu32.msi"

2
Updater

@ -1 +1 @@
Subproject commit e7617949b35b875292e5333cf11dfe024bf8212d Subproject commit 8baf612a6ca9eb6955912f208776929413bd5b79

18
include/UpdaterCfg.h
View File

@ -15,3 +15,21 @@
// Update server catalog location // Update server catalog location
// //
#define UPDATER_HTTP_PATH "/ZRCola/catalog-0001.xml" #define UPDATER_HTTP_PATH "/ZRCola/catalog-0001.xml"
//
// Hash for publishing packages and signing catalog
//
#define wxUpdaterHashGen wxCryptoHashSHA256
//
// Hash for verifying catalog signature and packages
//
#define wxUpdaterHashChk wxCryptoHashSHA256
//
// When changing the hash algorithm:
//
// 1. Bump UPDATER_HTTP_PATH and set wxUpdaterHashChk to new hash class.
// 2. Publish the updated product using the old catalog and old wxUpdaterHashGen hash.
// 3. Set wxUpdaterHashGen to new hash class, update Makefile to publish future updates to the new catalog.
//