[cpp-sp] 02/03: CPPSP-28 Windows Installers for Sp4 Agents

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository cpp-sp.

View the commit online:
https://codeberg.org/Shibboleth/cpp-sp/commit/15f333c73649d7399ab11571b9122a99a4d4fd8f

commit 15f333c73649d7399ab11571b9122a99a4d4fd8f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jan 19 20:07:57 2026 +0000

    CPPSP-28 Windows Installers for Sp4 Agents
    
    https://shibboleth.atlassian.net/browse/CPPSP-28
    
    When uninstalling for IIS we need to delete and uninstall the modules
    (in that order) otherwise we leave dropping in the application.config
    file and things deteriorate from then on.
---
 msi/wix6/sp4.wxs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/msi/wix6/sp4.wxs b/msi/wix6/sp4.wxs
index 4037e892..24e7ce37 100644
--- a/msi/wix6/sp4.wxs
+++ b/msi/wix6/sp4.wxs
@@ -190,6 +190,9 @@
        <CustomAction Id="SetIISInstall" Property="QtIISInstall"
                      Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" install module /name:ShibNative /image:"[#IIS_lib]" /precondition:"bitness64""/>
 
+       <CustomAction Id="QtIISDelete" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" Return="ignore"/>
+       <CustomAction Id="SetIISDelete" Property="QtIISDelete"
+                     Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" delete module ShibNative" />
        <CustomAction Id="QtIISUnInstall" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" Return="ignore"/>
        <CustomAction Id="SetIISUnInstall" Property="QtIISUnInstall"
                      Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative" />
@@ -199,6 +202,9 @@
        <CustomAction Id="SetIISInstall32" Property="QtIISInstall32"
                      Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" install module /name:ShibNative32 /image:"[#IIS_x86_lib]" /precondition:"bitness32"" />
 
+       <CustomAction Id="QtIISDelete32" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" Return="ignore"/>
+       <CustomAction Id="SetIISDelete32" Property="QtIISDelete32"
+                     Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" delete module ShibNative32" />
        <CustomAction Id="QtIISUnInstall32" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" Return="ignore"/>
        <CustomAction Id="SetIISUnInstall32" Property="QtIISUnInstall32"
                      Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative32" />
@@ -222,13 +228,19 @@
 
            <!-- IIS Uninstall -->
 
+           <Custom Action="SetIISDelete" Before="StopServices"/>
            <Custom Action="SetIISUnInstall" Before="StopServices"/>
-           <Custom Action="QtIISUnInstall" After="StopServices"
+           <Custom Action="QtIISDelete" After="StopServices"
+		   Condition="Installed AND IISMAJORVERSION AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)"/>
+           <Custom Action="QtIISUnInstall" After="QtIISDelete"
 		   Condition="Installed AND IISMAJORVERSION AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)"/>
 
            <?if $(sys.BUILDARCH) = "x64"?>
+           <Custom Action="SetIISDelete32" Before="StopServices"/>
+           <Custom Action="QtIISDelete32" After="StopServices"
+		   Condition="Installed AND IISMAJORVERSION AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)"/>
            <Custom Action="SetIISUnInstall32" Before="StopServices"/>
-           <Custom Action="QtIISUnInstall32" After="StopServices"
+           <Custom Action="QtIISUnInstall32" After="QtIISDelete32"
 		   Condition="Installed AND IISMAJORVERSION AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)"/>
            <?endif?>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.