[shibboleth-sp2] 09/82: wixcop
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
edm-guest pushed a commit to branch master
in repository shibboleth-sp2.
commit de1f024b270382bdfd40c29d0d974720bf75afab
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date: Thu Dec 29 10:33:36 2016 +0000
wixcop
---
msi/WiX/Patch-x64.wxs | 48 ++++---------
msi/WiX/Patch-x86.wxs | 48 ++++---------
msi/WiX/ShibbolethSP-defs-x86.wxi | 146 +++++++++++++++++++-------------------
3 files changed, 97 insertions(+), 145 deletions(-)
diff --git a/msi/WiX/Patch-x64.wxs b/msi/WiX/Patch-x64.wxs
index 20be688..e556537 100644
--- a/msi/WiX/Patch-x64.wxs
+++ b/msi/WiX/Patch-x64.wxs
@@ -1,21 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <PatchCreation
- Id="{17B36DC5-D54C-4484-9735-0E57B2866153}"
- CleanWorkingFolder="yes"
- OutputPath="openssl-101h-on-2.5.3-patch-win64.pcp"
- WholeFilesOnly="yes"
- >
-
+ <PatchCreation Id="{17B36DC5-D54C-4484-9735-0E57B2866153}" CleanWorkingFolder="yes" OutputPath="openssl-101h-on-2.5.3-patch-win64.pcp" WholeFilesOnly="yes">
+
<!-- Information put into the summary (Details) field -->
- <PatchInformation
- Description="Security Patch for Shibboleth SP 2.5.3 (x64)"
- Comments="Provides OpenSSL 1.0.1h"
- ShortNames="no"
- Languages="1033"
- Compressed="yes"
- Manufacturer="Shibboleth Consortium"/>
+ <PatchInformation Description="Security Patch for Shibboleth SP 2.5.3 (x64)" Comments="Provides OpenSSL 1.0.1h" ShortNames="no" Languages="1033" Compressed="yes" Manufacturer="Shibboleth Consortium" />
<!-- Recommended values for 'Classification' are
Critical Update, Hotfix, Security Rollup, Security Update, Service Pack, Update, Update Rollup.
@@ -23,29 +12,18 @@
DisplayName goes into the Name Column for "View installed updates" in control panel's "Porgram and Feature".
-->
- <PatchMetadata
- AllowRemoval="yes"
- Description="Security Patch for Shibboleth SP 2.5.3 (x64)"
- ManufacturerName="Shibboleth Consortium"
- TargetProductName="Shibboleth SP"
- MoreInfoURL="http://shibboleth.net/"
- Classification="Security Rollup"
- DisplayName="2014-06-08 Security Patch for Shibboleth SP 2.5.3"/>
+ <PatchMetadata AllowRemoval="yes" Description="Security Patch for Shibboleth SP 2.5.3 (x64)" ManufacturerName="Shibboleth Consortium" TargetProductName="Shibboleth SP" MoreInfoURL="http://shibboleth.net/" Classification="Security Rollup" DisplayName="2014-06-08 Security Patch for Shibboleth SP 2.5.3" />
<!-- Note:
That SequenceStart must be greater than the last
sequence in the File table in the target package or the patch
will not install. -->
- <Family DiskId="5000"
- MediaSrcProp="Sample"
- Name="Sample"
- SequenceStart="5000">
- <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-patched-win64\shibboleth-sp-2.5.3-win64.msi" Id="Upgrade">
- <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-orig-win64\shibboleth-sp-2.5.3-orig-win64.msi" Order="2"
- Id="Target" IgnoreMissingFiles="no" />
- </UpgradeImage>
- </Family>
+ <Family DiskId="5000" MediaSrcProp="Sample" Name="Sample" SequenceStart="5000">
+ <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-patched-win64\shibboleth-sp-2.5.3-win64.msi" Id="Upgrade">
+ <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-orig-win64\shibboleth-sp-2.5.3-orig-win64.msi" Order="2" Id="Target" IgnoreMissingFiles="no" />
+ </UpgradeImage>
+ </Family>
<!-- Supersede: Set this value to 'yes' to indicate that this patch will
supersede all previous patches in this patch family. The
@@ -54,9 +32,7 @@
PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed
-->
- <PatchSequence PatchFamily="ShibbolethSP2.5.3PatchFamily"
- Sequence="2.0.0.0"
- Supersede="yes" />
-
- </PatchCreation>
+ <PatchSequence PatchFamily="ShibbolethSP2.5.3PatchFamily" Sequence="2.0.0.0" Supersede="yes" />
+
+ </PatchCreation>
</Wix>
diff --git a/msi/WiX/Patch-x86.wxs b/msi/WiX/Patch-x86.wxs
index e33ac36..de3b385 100644
--- a/msi/WiX/Patch-x86.wxs
+++ b/msi/WiX/Patch-x86.wxs
@@ -1,21 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <PatchCreation
- Id="{875E0FB8-5238-4487-912A-04B043CEB5FB}"
- CleanWorkingFolder="yes"
- OutputPath="openssl-101h-on-2.5.3-patch-win32.pcp"
- WholeFilesOnly="yes"
- >
-
+ <PatchCreation Id="{875E0FB8-5238-4487-912A-04B043CEB5FB}" CleanWorkingFolder="yes" OutputPath="openssl-101h-on-2.5.3-patch-win32.pcp" WholeFilesOnly="yes">
+
<!-- Information put into the summary (Details) field -->
- <PatchInformation
- Description="Security Patch for Shibboleth SP 2.5.3 (x86)"
- Comments="Provides OpenSSL 1.0.1h"
- ShortNames="no"
- Languages="1033"
- Compressed="yes"
- Manufacturer="Shibboleth Consortium"/>
+ <PatchInformation Description="Security Patch for Shibboleth SP 2.5.3 (x86)" Comments="Provides OpenSSL 1.0.1h" ShortNames="no" Languages="1033" Compressed="yes" Manufacturer="Shibboleth Consortium" />
<!-- Recommended values for 'Classification' are
Critical Update, Hotfix, Security Rollup, Security Update, Service Pack, Update, Update Rollup.
@@ -23,29 +12,18 @@
DisplayName goes into the Name Column for "View installed updates" in control panel's "Porgram and Feature".
-->
- <PatchMetadata
- AllowRemoval="yes"
- Description="Security Patch for Shibboleth SP 2.5.3 (x86)"
- ManufacturerName="Shibboleth Consortium"
- TargetProductName="Shibboleth SP"
- MoreInfoURL="http://shibboleth.net/"
- Classification="Security Rollup"
- DisplayName="2014-06-08 Security Patch for Shibboleth SP 2.5.3"/>
+ <PatchMetadata AllowRemoval="yes" Description="Security Patch for Shibboleth SP 2.5.3 (x86)" ManufacturerName="Shibboleth Consortium" TargetProductName="Shibboleth SP" MoreInfoURL="http://shibboleth.net/" Classification="Security Rollup" DisplayName="2014-06-08 Security Patch for Shibboleth SP 2.5.3" />
<!-- Note:
That SequenceStart must be greater than the last
sequence in the File table in the target package or the patch
will not install. -->
- <Family DiskId="5000"
- MediaSrcProp="Sample"
- Name="Sample"
- SequenceStart="5000">
- <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-patched-win32\shibboleth-sp-2.5.3-win32.msi" Id="Upgrade">
- <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-orig-win32\shibboleth-sp-2.5.3-orig-win32.msi" Order="2"
- Id="Target" IgnoreMissingFiles="no" />
- </UpgradeImage>
- </Family>
+ <Family DiskId="5000" MediaSrcProp="Sample" Name="Sample" SequenceStart="5000">
+ <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-patched-win32\shibboleth-sp-2.5.3-win32.msi" Id="Upgrade">
+ <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\2.5.3-orig-win32\shibboleth-sp-2.5.3-orig-win32.msi" Order="2" Id="Target" IgnoreMissingFiles="no" />
+ </UpgradeImage>
+ </Family>
<!-- Supersede: Set this value to 'yes' to indicate that this patch will
supersede all previous patches in this patch family. The
@@ -54,9 +32,7 @@
PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed
-->
- <PatchSequence PatchFamily="ShibbolethSP2.5.3PatchFamily"
- Sequence="2.0.0.0"
- Supersede="yes" />
-
- </PatchCreation>
+ <PatchSequence PatchFamily="ShibbolethSP2.5.3PatchFamily" Sequence="2.0.0.0" Supersede="yes" />
+
+ </PatchCreation>
</Wix>
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index bdd513c..0d6d076 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -1,85 +1,85 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<?xml version="1.0" encoding="UTF-8"?>
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<!-- ShibbolethSP-noarch -->
- <ComponentRef Id='main.css'/>
- <ComponentRef Id='CREDITS.txt'/>
- <ComponentRef Id='LICENSE.txt'/>
- <ComponentRef Id='NOTICE.txt'/>
- <ComponentRef Id='README.txt'/>
- <ComponentRef Id='RELEASE.txt'/>
+ <ComponentRef Id="main.css" />
+ <ComponentRef Id="CREDITS.txt" />
+ <ComponentRef Id="LICENSE.txt" />
+ <ComponentRef Id="NOTICE.txt" />
+ <ComponentRef Id="README.txt" />
+ <ComponentRef Id="RELEASE.txt" />
- <ComponentRef Id='example_metadata.xml'/>
- <ComponentRef Id='example_shibboleth2.xml'/>
- <ComponentRef Id='keygen.bat'/>
- <ComponentRef Id='attrChecker.html'/>
- <ComponentRef Id='sslError.html'/>
- <ComponentRef Id='bindingTemplate.html'/>
- <ComponentRef Id='globalLogout.html'/>
- <ComponentRef Id='localLogout.html'/>
- <ComponentRef Id='attribute_map.xml'/>
- <ComponentRef Id='attribute_policy.xml'/>
- <ComponentRef Id='shibboleth2.xml'/>
- <ComponentRef Id='console.logger'/>
- <ComponentRef Id='discoveryTemplate.html'/>
- <ComponentRef Id='postTemplate.html'/>
- <ComponentRef Id='partialLogout.html'/>
- <ComponentRef Id='protocols.xml'/>
- <ComponentRef Id='security_policy.xml'/>
- <ComponentRef Id='accessError.html'/>
- <ComponentRef Id='apache.config.in'/>
- <ComponentRef Id='apache2.config.in'/>
- <ComponentRef Id='apache22.config.in'/>
- <ComponentRef Id='apache24.config.in'/>
- <ComponentRef Id='metadataError.html'/>
- <ComponentRef Id='native.logger.in'/>
- <ComponentRef Id='sessionError.html'/>
- <ComponentRef Id='shibd.logger.in'/>
- <ComponentRef Id='var_cache_shibboleth_folder'/>
- <ComponentRef Id='var_log_shibboleth_folder'/>
- <ComponentRef Id='var_run_shibboleth_folder'/>
+ <ComponentRef Id="example_metadata.xml" />
+ <ComponentRef Id="example_shibboleth2.xml" />
+ <ComponentRef Id="keygen.bat" />
+ <ComponentRef Id="attrChecker.html" />
+ <ComponentRef Id="sslError.html" />
+ <ComponentRef Id="bindingTemplate.html" />
+ <ComponentRef Id="globalLogout.html" />
+ <ComponentRef Id="localLogout.html" />
+ <ComponentRef Id="attribute_map.xml" />
+ <ComponentRef Id="attribute_policy.xml" />
+ <ComponentRef Id="shibboleth2.xml" />
+ <ComponentRef Id="console.logger" />
+ <ComponentRef Id="discoveryTemplate.html" />
+ <ComponentRef Id="postTemplate.html" />
+ <ComponentRef Id="partialLogout.html" />
+ <ComponentRef Id="protocols.xml" />
+ <ComponentRef Id="security_policy.xml" />
+ <ComponentRef Id="accessError.html" />
+ <ComponentRef Id="apache.config.in" />
+ <ComponentRef Id="apache2.config.in" />
+ <ComponentRef Id="apache22.config.in" />
+ <ComponentRef Id="apache24.config.in" />
+ <ComponentRef Id="metadataError.html" />
+ <ComponentRef Id="native.logger.in" />
+ <ComponentRef Id="sessionError.html" />
+ <ComponentRef Id="shibd.logger.in" />
+ <ComponentRef Id="var_cache_shibboleth_folder" />
+ <ComponentRef Id="var_log_shibboleth_folder" />
+ <ComponentRef Id="var_run_shibboleth_folder" />
<!-- ShibbolethSP-exe-x86-->
- <ComponentRef Id='resolvertest.exe'/>
- <ComponentRef Id='mdquery.exe'/>
- <ComponentRef Id='resolvertest.exe_debug'/>
- <ComponentRef Id='mdquery.exe_debug'/>
+ <ComponentRef Id="resolvertest.exe" />
+ <ComponentRef Id="mdquery.exe" />
+ <ComponentRef Id="resolvertest.exe_debug" />
+ <ComponentRef Id="mdquery.exe_debug" />
- <ComponentRef Id='adfs.so'/>
- <ComponentRef Id='adfs_lite.so'/>
- <ComponentRef Id='isapi_shib.dll'/>
- <ComponentRef Id='mod_shib_13.so'/>
- <ComponentRef Id='mod_shib_20.so'/>
- <ComponentRef Id='mod_shib_22.so'/>
- <ComponentRef Id='mod_shib_24.so'/>
- <ComponentRef Id='nsapi_shib.dll'/>
- <ComponentRef Id='odbc_store.so'/>
- <ComponentRef Id='plugins.so'/>
- <ComponentRef Id='plugins_lite.so'/>
- <ComponentRef Id='shibauthorizer.exe'/>
- <ComponentRef Id='shibresponder.exe'/>
+ <ComponentRef Id="adfs.so" />
+ <ComponentRef Id="adfs_lite.so" />
+ <ComponentRef Id="isapi_shib.dll" />
+ <ComponentRef Id="mod_shib_13.so" />
+ <ComponentRef Id="mod_shib_20.so" />
+ <ComponentRef Id="mod_shib_22.so" />
+ <ComponentRef Id="mod_shib_24.so" />
+ <ComponentRef Id="nsapi_shib.dll" />
+ <ComponentRef Id="odbc_store.so" />
+ <ComponentRef Id="plugins.so" />
+ <ComponentRef Id="plugins_lite.so" />
+ <ComponentRef Id="shibauthorizer.exe" />
+ <ComponentRef Id="shibresponder.exe" />
- <ComponentRef Id='adfs.so_debug'/>
- <ComponentRef Id='adfs_lite.so_debug'/>
- <ComponentRef Id='isapi_shib.dll_debug'/>
- <ComponentRef Id='mod_shib_13.so_debug'/>
- <ComponentRef Id='mod_shib_20.so_debug'/>
- <ComponentRef Id='mod_shib_22.so_debug'/>
- <ComponentRef Id='mod_shib_24.so_debug'/>
- <ComponentRef Id='nsapi_shib.dll_debug'/>
- <ComponentRef Id='odbc_store.so_debug'/>
- <ComponentRef Id='plugins.so_debug'/>
- <ComponentRef Id='plugins_lite.so_debug'/>
- <ComponentRef Id='shibauthorizer.exe_debug'/>
- <ComponentRef Id='shibresponder.exe_debug'/>
+ <ComponentRef Id="adfs.so_debug" />
+ <ComponentRef Id="adfs_lite.so_debug" />
+ <ComponentRef Id="isapi_shib.dll_debug" />
+ <ComponentRef Id="mod_shib_13.so_debug" />
+ <ComponentRef Id="mod_shib_20.so_debug" />
+ <ComponentRef Id="mod_shib_22.so_debug" />
+ <ComponentRef Id="mod_shib_24.so_debug" />
+ <ComponentRef Id="nsapi_shib.dll_debug" />
+ <ComponentRef Id="odbc_store.so_debug" />
+ <ComponentRef Id="plugins.so_debug" />
+ <ComponentRef Id="plugins_lite.so_debug" />
+ <ComponentRef Id="shibauthorizer.exe_debug" />
+ <ComponentRef Id="shibresponder.exe_debug" />
- <ComponentRef Id='shibd.exe'/>
- <ComponentRef Id='shibd.exe_debug'/>
+ <ComponentRef Id="shibd.exe" />
+ <ComponentRef Id="shibd.exe_debug" />
<!-- ShibbolethSP-registry-x32 -->
- <ComponentRef Id='TargetDir'/>
- <ComponentRef Id='InstallIsapi'/>
- <ComponentRef Id='file_extension'/>
- <ComponentRef Id='shib.ico' />
+ <ComponentRef Id="TargetDir" />
+ <ComponentRef Id="InstallIsapi" />
+ <ComponentRef Id="file_extension" />
+ <ComponentRef Id="shib.ico" />
</Include>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list