Preserve patch definitions for now

diff --git a/msi/WiX/Patch-x64.wxs b/msi/WiX/Patch-x64.wxs
index 3204b95..a2af8e2 100644 (file)
--- a/msi/WiX/Patch-x64.wxs
+++ b/msi/WiX/Patch-x64.wxs
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
     <PatchCreation\r
-        Id="{688837CE-C1B0-438B-B540-FAD14CEC8E21}"\r
+        Id="{FE38D447-D9B5-48BE-96E3-A620ACC0D266}"\r
         CleanWorkingFolder="yes"\r
-        OutputPath="patch.pcp"\r
+        OutputPath="openssl-on-2.5.3-patch-win64.pcp"\r
         WholeFilesOnly="yes"\r
         >\r
-\r
-    <!-- Information oput into the summary (Details) field -->\r
  \r
+    <!-- Information put into the summary (Details) field -->\r
+\r
         <PatchInformation \r
-            Description="Security Patch for Shibboleth SP 2.5.2 (x64)"\r
-            Comments="Provides curl 7.33.0"\r
+            Description="Security Patch for Shibboleth SP 2.5.3 (x64)"\r
+            Comments="Provides OpenSSL 1.0.1g"\r
             ShortNames="no" \r
             Languages="1033" \r
             Compressed="yes" \r
@@ -25,29 +25,28 @@
 \r
         <PatchMetadata\r
             AllowRemoval="yes"\r
-            Description="Security Patch for Shibboleth SP 2.5.2 (x64)"\r
+            Description="Security Patch for Shibboleth SP 2.5.3 (x64)"\r
             ManufacturerName="Shibboleth Consortium"\r
             TargetProductName="Shibboleth SP"\r
             MoreInfoURL="http://shibboleth.net/"\r
             Classification="Security Rollup"\r
-            DisplayName="2013-11-15 Security Patch for Shibboleth SP 2.5.2"/>\r
+            DisplayName="2014-04-08 Security Patch for Shibboleth SP 2.5.3"/>\r
  \r
     <!-- Note:\r
          That SequenceStart must be greater than the last\r
          sequence in the File table in the target package or the patch\r
          will not install. -->\r
 \r
-\r
         <Family DiskId="5000"\r
             MediaSrcProp="Sample" \r
             Name="Sample"\r
             SequenceStart="5000">\r
-            <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Original-2.5.2-x64\shibboleth-sp-2.5.2-win64.msi" Id="Upgrade">\r
-                <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Patched-2.5.2-x64\shibboleth-sp-2.5.2-win64.msi" Order="2"      \r
+            <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-patched-win64\shibboleth-sp-2.5.3-win64.msi" Id="Upgrade">\r
+                <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-orig-win64\shibboleth-sp-2.5.3-orig-win64.msi" Order="2"      \r
                     Id="Target" IgnoreMissingFiles="no" />\r
             </UpgradeImage>\r
         </Family>\r
-\r
+ \r
     <!-- Supersede:  Set this value to 'yes' to indicate that this patch will\r
          supersede all previous patches in this patch family.  The\r
          default value is 'no'. \r
@@ -55,7 +54,7 @@
          PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed\r
       -->\r
 \r
-        <PatchSequence PatchFamily="ShibbolethSP2.5.2PatchFamily"\r
+        <PatchSequence PatchFamily="ShibbolethSP2.5.3PatchFamily"\r
             Sequence="1.0.0.0"\r
             Supersede="yes" />\r
  \r

diff --git a/msi/WiX/Patch-x86.wxs b/msi/WiX/Patch-x86.wxs
index 4350111..0aa2e1a 100644 (file)
--- a/msi/WiX/Patch-x86.wxs
+++ b/msi/WiX/Patch-x86.wxs
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
     <PatchCreation\r
-        Id="{55E9DC33-DE26-471F-846C-2C2A5C600A94}"\r
+        Id="{F1AFC035-D574-4203-B5EF-9ACBE1C9C4FC}"\r
         CleanWorkingFolder="yes"\r
-        OutputPath="patch.pcp"\r
+        OutputPath="openssl-on-2.5.3-patch-win32.pcp"\r
         WholeFilesOnly="yes"\r
         >\r
  \r
     <!-- Information put into the summary (Details) field -->\r
 \r
         <PatchInformation \r
-            Description="Security Patch for Shibboleth SP 2.5.2 (x86)"\r
-            Comments="Provides curl 7.33.0"\r
+            Description="Security Patch for Shibboleth SP 2.5.3 (x86)"\r
+            Comments="Provides OpenSSL 1.0.1g"\r
             ShortNames="no" \r
             Languages="1033" \r
             Compressed="yes" \r
@@ -25,12 +25,12 @@
 \r
         <PatchMetadata\r
             AllowRemoval="yes"\r
-            Description="Security Patch for Shibboleth SP 2.5.2 (x86)"\r
+            Description="Security Patch for Shibboleth SP 2.5.3 (x86)"\r
             ManufacturerName="Shibboleth Consortium"\r
             TargetProductName="Shibboleth SP"\r
-            MoreInfoURL="http://www.shibboleth.net/"\r
+            MoreInfoURL="http://shibboleth.net/"\r
             Classification="Security Rollup"\r
-            DisplayName="2013-11-15 Security Patch for Shibboleth SP 2.5.2"/>\r
+            DisplayName="2014-04-08 Security Patch for Shibboleth SP 2.5.3"/>\r
  \r
     <!-- Note:\r
          That SequenceStart must be greater than the last\r
@@ -41,8 +41,8 @@
             MediaSrcProp="Sample" \r
             Name="Sample"\r
             SequenceStart="5000">\r
-            <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Original-2.5.2-x86\shibboleth-sp-2.5.2-win32.msi" Id="Upgrade">\r
-                <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Patched-2.5.2-x86\shibboleth-sp-2.5.2-win32.msi" Order="2"      \r
+            <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-patched-win32\shibboleth-sp-2.5.3-win32.msi" Id="Upgrade">\r
+                <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-orig-win32\shibboleth-sp-2.5.3-orig-win32.msi" Order="2"      \r
                     Id="Target" IgnoreMissingFiles="no" />\r
             </UpgradeImage>\r
         </Family>\r
@@ -54,7 +54,7 @@
          PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed\r
       -->\r
 \r
-        <PatchSequence PatchFamily="ShibbolethSP2.5.2PatchFamily"\r
+        <PatchSequence PatchFamily="ShibbolethSP2.5.3PatchFamily"\r
             Sequence="1.0.0.0"\r
             Supersede="yes" />\r
  \r