Commit db80dbef authored by aker@wsusoffline's avatar aker@wsusoffline
Browse files

- [UNTESTED] Fix: w60 and w61 Windows Update Agent (WUA) started to support...

- [UNTESTED] Fix: w60 and w61 Windows Update Agent (WUA) started to support SHA2-only signed wsusscn2.cab starting from 2020-01, WUA will be updated to at least this version before attempting to perform dynamic update search (Thanks to "DK3 and "aker")
parent d89e6f71
......@@ -14,7 +14,7 @@
#pragma compile(ProductName, "WSUS Offline Update - Community Edition")
#pragma compile(ProductVersion, 11.9.8)
Dim Const $caption = "WSUS Offline Update - Community Edition - 11.9.8 (b60)"
Dim Const $caption = "WSUS Offline Update - Community Edition - 11.9.8 (b61)"
Dim Const $title = $caption & " - Generator"
Dim Const $downloadURL = "https://gitlab.com/wsusoffline/"
Dim Const $downloadLogFile = "download.log"
......
......@@ -15,7 +15,7 @@
#pragma compile(ProductName, "WSUS Offline Update - Community Edition")
#pragma compile(ProductVersion, 11.9.8)
Dim Const $caption = "WSUS Offline Update - Community Edition - 11.9.8 (b60) - Installer"
Dim Const $caption = "WSUS Offline Update - Community Edition - 11.9.8 (b61) - Installer"
; Registry constants
Dim Const $reg_key_wsh_hklm64 = "HKLM64\Software\Microsoft\Windows Script Host\Settings"
......
......@@ -32,7 +32,7 @@ if "%DIRCMD%" NEQ "" set DIRCMD=
cd /D "%~dp0"
set WSUSOFFLINE_VERSION=11.9.8 (b60)
set WSUSOFFLINE_VERSION=11.9.8 (b61)
title %~n0 %*
echo Starting WSUS Offline Update - Community Edition - v. %WSUSOFFLINE_VERSION% at %TIME%...
set UPDATE_LOGFILE=%SystemRoot%\wsusofflineupdate.log
......@@ -563,6 +563,41 @@ set SERVICING_VER=%SERVICING_VER_NEW%
goto CheckServicingStack
:ServicingStackInstalled
:SkipServicingStack
if "%RECALL_REQUIRED%"=="1" goto Installed
rem *** Update Windows Update Agent ***
echo Checking Windows Update Agent version...
if %WUA_VER_MAJOR% LSS %WUA_VER_TARGET_MAJOR% goto InstallWUA
if %WUA_VER_MAJOR% GTR %WUA_VER_TARGET_MAJOR% goto SkipWUAInst
if %WUA_VER_MINOR% LSS %WUA_VER_TARGET_MINOR% goto InstallWUA
if %WUA_VER_MINOR% GTR %WUA_VER_TARGET_MINOR% goto SkipWUAInst
if %WUA_VER_BUILD% LSS %WUA_VER_TARGET_BUILD% goto InstallWUA
if %WUA_VER_BUILD% GTR %WUA_VER_TARGET_BUILD% goto SkipWUAInst
if %WUA_VER_REVIS% LSS %WUA_VER_TARGET_REVIS% goto InstallWUA
if %WUA_VER_REVIS% GEQ %WUA_VER_TARGET_MREVIS% goto SkipWUAInst
:InstallWUA
if exist %SystemRoot%\Temp\wou_wua_tried.txt goto SkipWUAInst
if not exist %SystemRoot%\Temp\nul md %SystemRoot%\Temp
echo. >%SystemRoot%\Temp\wou_wua_tried.txt
if "%WUA_TARGET_ID%"=="" (
echo Warning: Environment variable WUA_TARGET_ID not set.
call :Log "Warning: Environment variable WUA_TARGET_ID not set"
goto SkipWUAInst
)
echo %WUA_TARGET_ID%>"%TEMP%\MissingUpdateIds.txt"
call ListUpdatesToInstall.cmd /excludestatics /ignoreblacklist
if errorlevel 1 goto ListError
if exist "%TEMP%\UpdatesToInstall.txt" (
echo Installing most recent Windows Update Agent...
call InstallListedUpdates.cmd /selectoptions %VERIFY_MODE% %DISM_MODE% /errorsaswarnings
) else (
echo Warning: Windows Update Agent installation file ^(kb%WUA_TARGET_ID%^) not found.
call :Log "Warning: Windows Update Agent installation file (kb%WUA_TARGET_ID%) not found"
goto SkipWUAInst
)
set RECALL_REQUIRED=1
:SkipWUAInst
if "%RECALL_REQUIRED%"=="1" goto Installed
rem *** Install Internet Explorer ***
if "%OS_SRV_CORE%"=="1" goto SkipIEInst
......@@ -1747,6 +1782,7 @@ goto :eof
:Cleanup
if exist %SystemRoot%\Temp\wou_w63upd1_tried.txt del %SystemRoot%\Temp\wou_w63upd1_tried.txt
if exist %SystemRoot%\Temp\wou_w63upd2_tried.txt del %SystemRoot%\Temp\wou_w63upd2_tried.txt
if exist %SystemRoot%\Temp\wou_wua_tried.txt del %SystemRoot%\Temp\wou_wua_tried.txt
if exist %SystemRoot%\Temp\wou_iepre_tried.txt del %SystemRoot%\Temp\wou_iepre_tried.txt
if exist %SystemRoot%\Temp\wou_ie_tried.txt del %SystemRoot%\Temp\wou_ie_tried.txt
if exist %SystemRoot%\Temp\wou_net35_tried.txt del %SystemRoot%\Temp\wou_net35_tried.txt
......
......@@ -10,6 +10,11 @@ if "%OS_RAM_GB%"=="" (
if exist .\custom\SetUpdatesPerStage.cmd call .\custom\SetUpdatesPerStage.cmd
if %UPDATES_PER_STAGE% LSS 40 set UPDATES_PER_STAGE=40
set WUA_VER_TARGET_MAJOR=0
set WUA_VER_TARGET_MINOR=0
set WUA_VER_TARGET_BUILD=0
set WUA_VER_TARGET_REVIS=0
set MSI_VER_TARGET_BUILD=0
set MSI_VER_TARGET_REVIS=0
......@@ -58,6 +63,13 @@ goto SetOfficeName
:Windows6.0
rem *** Windows Server 2008 ***
set OS_NAME=w60
set WUA_VER_TARGET_MAJOR=7
set WUA_VER_TARGET_MINOR=7
set WUA_VER_TARGET_BUILD=6003
set WUA_VER_TARGET_REVIS=20705
if "%LIST_MODE_IDS%"=="/seconly" (set WUA_TARGET_ID=4534312) else (set WUA_TARGET_ID=4534303)
set MSI_VER_TARGET_MAJOR=4
set MSI_VER_TARGET_MINOR=5
set WSH_VER_TARGET_MAJOR=5
......@@ -94,6 +106,11 @@ goto SetOfficeName
:Windows6.1
rem *** Windows 7 / Server 2008 R2 ***
set OS_NAME=w61
set WUA_VER_TARGET_MAJOR=6
set WUA_VER_TARGET_MINOR=1
set WUA_VER_TARGET_BUILD=7601
set WUA_VER_TARGET_REVIS=24542
if "%LIST_MODE_IDS%"=="/seconly" (set WUA_TARGET_ID=4534314) else (set WUA_TARGET_ID=4534310)
set OS_SP_VER_TARGET_MAJOR=1
set OS_SP_TARGET_ID=976932
set MSI_VER_TARGET_MAJOR=5
......
kb4474419,August 2019 SHA-2 code signing support update for Windows 7 and Windows Server 2008 R2
kb3172605,July 2016 update rollup for Windows 7 SP1 and Windows Server 2008 R2 SP1
kb2552343,Time-out error occurs when you install a Windows Update package that contains drivers on a computer that is running Windows 7 or Windows Server 2008 R2
......@@ -35,7 +35,7 @@ if "%DIRCMD%" NEQ "" set DIRCMD=
cd /D "%~dp0"
set WSUSOFFLINE_VERSION=11.9.8 (b60)
set WSUSOFFLINE_VERSION=11.9.8 (b61)
title %~n0 %1 %2 %3 %4 %5 %6 %7 %8 %9
echo Starting WSUS Offline Update - Community Edition - download v. %WSUSOFFLINE_VERSION% for %1 %2...
set DOWNLOAD_LOGFILE=..\log\download.log
......
......@@ -1796,3 +1796,4 @@ Community Edition 11.9.8 -- ??.??.????
- Wget download utility updated to version 1.21.1 [2021-03-25] (Thanks to "boco" and "harry")
- misc. improvements to InstallOSUpdate.cmd and InstallOfficeUpdate.com (Thanks to "aker")
- Fix: ActivateAria2Downloads.cmd did not handle the "/reload" command properly (Thanks to "Dmytro Borys")
- Fix: w60 and w61 Windows Update Agent (WUA) started to support SHA2-only signed wsusscn2.cab starting from 2020-01, WUA will be updated to at least this version before attempting to perform dynamic update search (Thanks to "DK3 and "aker")
......@@ -8,6 +8,8 @@ windows6.0-kb2973201
windows6.0-kb3033889
windows6.0-kb4493730
windows6.0-kb4580971
windows6.0-kb4534303
windows6.0-kb4534312
ndp46-kb3074233
ndp46-kb3098001
ndp46-kb3098786
......@@ -32,6 +34,8 @@ windows6.1-kb4507004
windows6.1-kb4474419-v3
windows6.1-kb4490628
windows6.1-kb4592510
windows6.1-kb4534310
windows6.1-kb4534314
windows8-rt-kb3122649
windows8-rt-kb3173426
windows8-rt-KB5001401
......
......@@ -12,7 +12,6 @@ http://download.windowsupdate.com/c/msdownload/update/software/updt/2013/06/wind
http://download.windowsupdate.com/d/msdownload/update/software/updt/2013/11/windows6.1-kb2830477-x64_21cae4796ac834f66eec9a190815e1e1b8195908.msu
http://download.windowsupdate.com/d/msdownload/update/software/updt/2013/11/windows6.1-kb2857650-x64_83ff2b5ef551e039133437a12b2893eba3ba79b5.msu
http://download.windowsupdate.com/c/msdownload/update/software/updt/2014/02/windows6.1-kb2923545-x64_d263a19b8935efa334ef713cfbfecede3c51a3d1.msu
http://download.windowsupdate.com/d/msdownload/update/software/updt/2016/09/windows6.1-kb3172605-x64_2bb9bc55f347eee34b1454b50c436eb6fd9301fc.msu
http://download.windowsupdate.com/d/msdownload/update/software/secu/2019/05/pciclearstalecache_d243a607b50db10ed50f03cff570498018c61a59.exe
http://download.windowsupdate.com/c/msdownload/update/software/updt/2014/05/windows6.1-kb2852386-v2-x64_5755ff2ce5ccaa980350d3a56fc489ce8838a1c5.msu
http://download.windowsupdate.com/msdownload/update/software/crup/2011/03/windows6.1-kb2506014-x64_cc70f2accbfbae5e68f3c7aa3dba8877d1dc88a7.msu
......@@ -12,6 +12,5 @@ http://download.windowsupdate.com/c/msdownload/update/software/updt/2013/06/wind
http://download.windowsupdate.com/d/msdownload/update/software/updt/2013/11/windows6.1-kb2830477-x86_1319bd953bf956b82e30f7dee5994f3558ec7fdd.msu
http://download.windowsupdate.com/d/msdownload/update/software/updt/2013/11/windows6.1-kb2857650-x86_89364d061ba54833a8af181e5739a25029b00a38.msu
http://download.windowsupdate.com/c/msdownload/update/software/updt/2014/02/windows6.1-kb2923545-x86_fff0876feea186260e48879a68791bcdaacd74f7.msu
http://download.windowsupdate.com/d/msdownload/update/software/updt/2016/09/windows6.1-kb3172605-x86_ae03ccbd299e434ea2239f1ad86f164e5f4deeda.msu
http://download.windowsupdate.com/d/msdownload/update/software/secu/2019/05/pciclearstalecache_7f0c5cff499688bc34fdf52d5a6af3d97881d801.exe
http://download.windowsupdate.com/c/msdownload/update/software/updt/2013/10/windows6.1-kb2852386-x86_f94486e3eb81ec987c923c76553611ea356de6ce.msu
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment