From 7ca94be59fa8004567d11a80689a959a7cf13d00 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Sat, 9 Nov 2013 21:14:20 +0000
Subject: [PATCH] Patch definitions for curl update

---
 msi/WiX/Patch-x64.wxs | 21 +++++++++++----------
 msi/WiX/Patch-x86.wxs | 18 +++++++++---------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/msi/WiX/Patch-x64.wxs b/msi/WiX/Patch-x64.wxs
index 02f17e2..3204b95 100644
--- a/msi/WiX/Patch-x64.wxs
+++ b/msi/WiX/Patch-x64.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <PatchCreation
-        Id="{B49B7607-87C9-4E2A-A3F2-13CED629B37A}"
+        Id="{688837CE-C1B0-438B-B540-FAD14CEC8E21}"
         CleanWorkingFolder="yes"
         OutputPath="patch.pcp"
         WholeFilesOnly="yes"
@@ -10,8 +10,8 @@
     <!-- Information oput into the summary (Details) field -->
  
         <PatchInformation 
-            Description="Security Patch for Shibboleth SP 2.5.1 (x64)"
-            Comments="Provides OpenSAML 2.5.2, curl 7.29.0, OpenSSL 1.0.1e"
+            Description="Security Patch for Shibboleth SP 2.5.2 (x64)"
+            Comments="Provides curl 7.33.0"
             ShortNames="no" 
             Languages="1033" 
             Compressed="yes" 
@@ -25,12 +25,12 @@
 
         <PatchMetadata
             AllowRemoval="yes"
-            Description="Security Patch for Shibboleth SP 2.5.1 (x64)"
+            Description="Security Patch for Shibboleth SP 2.5.2 (x64)"
             ManufacturerName="Shibboleth Consortium"
             TargetProductName="Shibboleth SP"
-            MoreInfoURL="http://www.shibboleth.net/"
+            MoreInfoURL="http://shibboleth.net/"
             Classification="Security Rollup"
-            DisplayName="Security Patch for Shibboleth SP 2.5.1 28-Feb-2013"/>
+            DisplayName="2013-11-15 Security Patch for Shibboleth SP 2.5.2"/>
  
     <!-- Note:
          That SequenceStart must be greater than the last
@@ -42,11 +42,12 @@
             MediaSrcProp="Sample" 
             Name="Sample"
             SequenceStart="5000">
-            <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Original-2.5.1-x64\shibboleth-sp-2.5.1-win64.msi" Id="Upgrade">
-                <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Patched-2.5.1-x64\shibboleth-sp-2.5.1-win64.msi" Order="2"      
+            <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Original-2.5.2-x64\shibboleth-sp-2.5.2-win64.msi" Id="Upgrade">
+                <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Patched-2.5.2-x64\shibboleth-sp-2.5.2-win64.msi" Order="2"      
                     Id="Target" IgnoreMissingFiles="no" />
             </UpgradeImage>
-        </Family> 
+        </Family>
+
     <!-- Supersede:  Set this value to 'yes' to indicate that this patch will
          supersede all previous patches in this patch family.  The
          default value is 'no'. 
@@ -54,7 +55,7 @@
          PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed
       -->
 
-        <PatchSequence PatchFamily="ShibbolethSPPatchFamily"
+        <PatchSequence PatchFamily="ShibbolethSP2.5.2PatchFamily"
             Sequence="1.0.0.0"
             Supersede="yes" />
  
diff --git a/msi/WiX/Patch-x86.wxs b/msi/WiX/Patch-x86.wxs
index 46f8960..4350111 100644
--- a/msi/WiX/Patch-x86.wxs
+++ b/msi/WiX/Patch-x86.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <PatchCreation
-        Id="{91DB241C-5491-4405-BFAD-E91F7E9BB948}"
+        Id="{55E9DC33-DE26-471F-846C-2C2A5C600A94}"
         CleanWorkingFolder="yes"
         OutputPath="patch.pcp"
         WholeFilesOnly="yes"
@@ -10,8 +10,8 @@
     <!-- Information put into the summary (Details) field -->
 
         <PatchInformation 
-            Description="Security Patch for Shibboleth SP 2.5.1 (x86)"
-            Comments="OpenSAML version to 2.5.2" 
+            Description="Security Patch for Shibboleth SP 2.5.2 (x86)"
+            Comments="Provides curl 7.33.0"
             ShortNames="no" 
             Languages="1033" 
             Compressed="yes" 
@@ -25,12 +25,12 @@
 
         <PatchMetadata
             AllowRemoval="yes"
-            Description="Security Patch for Shibboleth SP 2.5.1 (x86)"
+            Description="Security Patch for Shibboleth SP 2.5.2 (x86)"
             ManufacturerName="Shibboleth Consortium"
             TargetProductName="Shibboleth SP"
             MoreInfoURL="http://www.shibboleth.net/"
-            Classification="Update"
-            DisplayName="Security Patch for Shibboleth SP 2.5.1 10-Jan-2013"/>
+            Classification="Security Rollup"
+            DisplayName="2013-11-15 Security Patch for Shibboleth SP 2.5.2"/>
  
     <!-- Note:
          That SequenceStart must be greater than the last
@@ -41,8 +41,8 @@
             MediaSrcProp="Sample" 
             Name="Sample"
             SequenceStart="5000">
-            <UpgradeImage SourceFile="C:\foo\PatchSp\x86\new\new.msi" Id="Upgrade">
-                <TargetImage SourceFile="C:\foo\PatchSp\x86\old\old.msi" Order="2"      
+            <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Original-2.5.2-x86\shibboleth-sp-2.5.2-win32.msi" Id="Upgrade">
+                <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Patched-2.5.2-x86\shibboleth-sp-2.5.2-win32.msi" Order="2"      
                     Id="Target" IgnoreMissingFiles="no" />
             </UpgradeImage>
         </Family>
@@ -54,7 +54,7 @@
          PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed
       -->
 
-        <PatchSequence PatchFamily="ShibbolethSPPatchFamily"
+        <PatchSequence PatchFamily="ShibbolethSP2.5.2PatchFamily"
             Sequence="1.0.0.0"
             Supersede="yes" />
  
-- 
2.1.4