Patch definitions for curl update

diff --git a/msi/WiX/Patch-x64.wxs b/msi/WiX/Patch-x64.wxs
index 02f17e2..3204b95 100644 (file)
--- a/msi/WiX/Patch-x64.wxs
+++ b/msi/WiX/Patch-x64.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
     <PatchCreation\r
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
     <PatchCreation\r

-        Id="{B49B7607-87C9-4E2A-A3F2-13CED629B37A}"\r
+        Id="{688837CE-C1B0-438B-B540-FAD14CEC8E21}"\r

         CleanWorkingFolder="yes"\r
         OutputPath="patch.pcp"\r
         WholeFilesOnly="yes"\r
         CleanWorkingFolder="yes"\r
         OutputPath="patch.pcp"\r
         WholeFilesOnly="yes"\r


@@ -10,8 +10,8 @@
     <!-- Information oput into the summary (Details) field -->\r
  \r
         <PatchInformation \r
     <!-- Information oput into the summary (Details) field -->\r
  \r
         <PatchInformation \r

-            Description="Security Patch for Shibboleth SP 2.5.1 (x64)"\r
-            Comments="Provides OpenSAML 2.5.2, curl 7.29.0, OpenSSL 1.0.1e"\r
+            Description="Security Patch for Shibboleth SP 2.5.2 (x64)"\r
+            Comments="Provides curl 7.33.0"\r

             ShortNames="no" \r
             Languages="1033" \r
             Compressed="yes" \r
             ShortNames="no" \r
             Languages="1033" \r
             Compressed="yes" \r


@@ -25,12 +25,12 @@
 \r
         <PatchMetadata\r
             AllowRemoval="yes"\r
 \r
         <PatchMetadata\r
             AllowRemoval="yes"\r

-            Description="Security Patch for Shibboleth SP 2.5.1 (x64)"\r
+            Description="Security Patch for Shibboleth SP 2.5.2 (x64)"\r

             ManufacturerName="Shibboleth Consortium"\r
             TargetProductName="Shibboleth SP"\r
             ManufacturerName="Shibboleth Consortium"\r
             TargetProductName="Shibboleth SP"\r

-            MoreInfoURL="http://www.shibboleth.net/"\r
+            MoreInfoURL="http://shibboleth.net/"\r

             Classification="Security Rollup"\r
             Classification="Security Rollup"\r

-            DisplayName="Security Patch for Shibboleth SP 2.5.1 28-Feb-2013"/>\r
+            DisplayName="2013-11-15 Security Patch for Shibboleth SP 2.5.2"/>\r

  \r
     <!-- Note:\r
          That SequenceStart must be greater than the last\r
  \r
     <!-- Note:\r
          That SequenceStart must be greater than the last\r


@@ -42,11 +42,12 @@
             MediaSrcProp="Sample" \r
             Name="Sample"\r
             SequenceStart="5000">\r
             MediaSrcProp="Sample" \r
             Name="Sample"\r
             SequenceStart="5000">\r

-            <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Original-2.5.1-x64\shibboleth-sp-2.5.1-win64.msi" Id="Upgrade">\r
-                <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Patched-2.5.1-x64\shibboleth-sp-2.5.1-win64.msi" Order="2"      \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

                     Id="Target" IgnoreMissingFiles="no" />\r
             </UpgradeImage>\r
                     Id="Target" IgnoreMissingFiles="no" />\r
             </UpgradeImage>\r

-        </Family> \r
+        </Family>\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
     <!-- 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


@@ -54,7 +55,7 @@
          PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed\r
       -->\r
 \r
          PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed\r
       -->\r
 \r

-        <PatchSequence PatchFamily="ShibbolethSPPatchFamily"\r
+        <PatchSequence PatchFamily="ShibbolethSP2.5.2PatchFamily"\r

             Sequence="1.0.0.0"\r
             Supersede="yes" />\r
  \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 46f8960..4350111 100644 (file)
--- a/msi/WiX/Patch-x86.wxs
+++ b/msi/WiX/Patch-x86.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
     <PatchCreation\r
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
     <PatchCreation\r

-        Id="{91DB241C-5491-4405-BFAD-E91F7E9BB948}"\r
+        Id="{55E9DC33-DE26-471F-846C-2C2A5C600A94}"\r

         CleanWorkingFolder="yes"\r
         OutputPath="patch.pcp"\r
         WholeFilesOnly="yes"\r
         CleanWorkingFolder="yes"\r
         OutputPath="patch.pcp"\r
         WholeFilesOnly="yes"\r


@@ -10,8 +10,8 @@
     <!-- Information put into the summary (Details) field -->\r
 \r
         <PatchInformation \r
     <!-- Information put into the summary (Details) field -->\r
 \r
         <PatchInformation \r

-            Description="Security Patch for Shibboleth SP 2.5.1 (x86)"\r
-            Comments="OpenSAML version to 2.5.2" \r
+            Description="Security Patch for Shibboleth SP 2.5.2 (x86)"\r
+            Comments="Provides curl 7.33.0"\r

             ShortNames="no" \r
             Languages="1033" \r
             Compressed="yes" \r
             ShortNames="no" \r
             Languages="1033" \r
             Compressed="yes" \r


@@ -25,12 +25,12 @@
 \r
         <PatchMetadata\r
             AllowRemoval="yes"\r
 \r
         <PatchMetadata\r
             AllowRemoval="yes"\r

-            Description="Security Patch for Shibboleth SP 2.5.1 (x86)"\r
+            Description="Security Patch for Shibboleth SP 2.5.2 (x86)"\r

             ManufacturerName="Shibboleth Consortium"\r
             TargetProductName="Shibboleth SP"\r
             MoreInfoURL="http://www.shibboleth.net/"\r
             ManufacturerName="Shibboleth Consortium"\r
             TargetProductName="Shibboleth SP"\r
             MoreInfoURL="http://www.shibboleth.net/"\r

-            Classification="Update"\r
-            DisplayName="Security Patch for Shibboleth SP 2.5.1 10-Jan-2013"/>\r
+            Classification="Security Rollup"\r
+            DisplayName="2013-11-15 Security Patch for Shibboleth SP 2.5.2"/>\r

  \r
     <!-- Note:\r
          That SequenceStart must be greater than the last\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
             MediaSrcProp="Sample" \r
             Name="Sample"\r
             SequenceStart="5000">\r

-            <UpgradeImage SourceFile="C:\foo\PatchSp\x86\new\new.msi" Id="Upgrade">\r
-                <TargetImage SourceFile="C:\foo\PatchSp\x86\old\old.msi" Order="2"      \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

                     Id="Target" IgnoreMissingFiles="no" />\r
             </UpgradeImage>\r
         </Family>\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
          PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed\r
       -->\r
 \r

-        <PatchSequence PatchFamily="ShibbolethSPPatchFamily"\r
+        <PatchSequence PatchFamily="ShibbolethSP2.5.2PatchFamily"\r

             Sequence="1.0.0.0"\r
             Supersede="yes" />\r
  \r
             Sequence="1.0.0.0"\r
             Supersede="yes" />\r
  \r