From 36d4edcbe857831d90bab6dd334ad8a3beba9f33 Mon Sep 17 00:00:00 2001 From: Steven Morgan Date: Fri, 18 Sep 2015 17:43:06 -0400 Subject: [PATCH] Change windows install directory, change windows Sourcefire artifacts to Cisco. --- win32/Setup-x64/Setup-x64.vdproj | 104 ++++++++++++++++------ win32/Setup-x86/Setup-x86.vdproj | 144 +++++++++++++------------------ win32/res/common.rc | 4 +- 3 files changed, 137 insertions(+), 115 deletions(-) diff --git a/win32/Setup-x64/Setup-x64.vdproj b/win32/Setup-x64/Setup-x64.vdproj index add01f768..7791c925b 100755 --- a/win32/Setup-x64/Setup-x64.vdproj +++ b/win32/Setup-x64/Setup-x64.vdproj @@ -27,6 +27,66 @@ } "Entry" { + "MsmKey" = "8:_31A9BB7D7AC44E50902256927B1FAAA5" + "OwnerKey" = "8:_335D34A6BB624E7190CFE4E63CD398E8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_31A9BB7D7AC44E50902256927B1FAAA5" + "OwnerKey" = "8:_FEDD087CC8B64ED3A476664BC5FCAF59" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_31A9BB7D7AC44E50902256927B1FAAA5" + "OwnerKey" = "8:_F047B3505FC74D809FB8251423DF4095" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_31A9BB7D7AC44E50902256927B1FAAA5" + "OwnerKey" = "8:_EB8D0E3AFBC24F9B9845F08708803C2B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_31A9BB7D7AC44E50902256927B1FAAA5" + "OwnerKey" = "8:_DF09DF52E5014B378FBA8B4CD6C11C3B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_31A9BB7D7AC44E50902256927B1FAAA5" + "OwnerKey" = "8:_C0DFAFFC11514B9190D3A585C3E58832" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_31A9BB7D7AC44E50902256927B1FAAA5" + "OwnerKey" = "8:_804379F8A48A4F7DBB50D72302559297" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_31A9BB7D7AC44E50902256927B1FAAA5" + "OwnerKey" = "8:_71984994A7494BE2965C585DB3EBED1F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_31A9BB7D7AC44E50902256927B1FAAA5" + "OwnerKey" = "8:_65C31C39B3E443C4B6EBE65247933F5E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_31A9BB7D7AC44E50902256927B1FAAA5" + "OwnerKey" = "8:_5CED7DA1BD104DA5AF2882D6CBA6E313" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_31D6EE7D636A445AA1F07038549BEE42" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -159,12 +219,6 @@ } "Entry" { - "MsmKey" = "8:_EEF0F6F377940D110B3A88E2CD6A0276" - "OwnerKey" = "8:_71984994A7494BE2965C585DB3EBED1F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F047B3505FC74D809FB8251423DF4095" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -666,26 +720,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EEF0F6F377940D110B3A88E2CD6A0276" - { - "SourcePath" = "8:PSAPI.DLL" - "TargetName" = "8:PSAPI.DLL" - "Tag" = "8:" - "Folder" = "8:_CEC880DBF61041CCA0B367A8647B2589" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FD5044813135497E957CD988624A985F" { "SourcePath" = "8:C:\\clamdeps\\win64\\openssl\\lib\\ssleay32.dll" @@ -714,7 +748,7 @@ { "{3C67513D-01DD-4637-8A68-80971EB9504F}:_CEC880DBF61041CCA0B367A8647B2589" { - "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]" + "DefaultLocation" = "8:[ProgramFiles64Folder]\\[ProductName]" "Name" = "8:#1925" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" @@ -771,7 +805,7 @@ "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" "ProductVersion" = "8:0.99.0" - "Manufacturer" = "8:Sourcefire Inc" + "Manufacturer" = "8:Cisco Systems, Inc." "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" "Title" = "8:ClamAV-x64" @@ -1279,6 +1313,20 @@ } "MergeModule" { + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_31A9BB7D7AC44E50902256927B1FAAA5" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:Microsoft_VC100_CRT_x86.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } } "ProjectOutput" { diff --git a/win32/Setup-x86/Setup-x86.vdproj b/win32/Setup-x86/Setup-x86.vdproj index 8ac45e45d..c3c509f09 100755 --- a/win32/Setup-x86/Setup-x86.vdproj +++ b/win32/Setup-x86/Setup-x86.vdproj @@ -75,158 +75,152 @@ } "Entry" { - "MsmKey" = "8:_572E52797C0A4873ACFC45E53ED1FB78" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_5023780807D9476D885C8ACDB89C8645" + "OwnerKey" = "8:_129947045FE24C5AAEE6467547A6FBBB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5C115FFB3D1542998DEB88C97B348F59" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_5023780807D9476D885C8ACDB89C8645" + "OwnerKey" = "8:_E6AAF8DB843A4CDCBD12F62B44F0D947" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_64B5C4E9452F43349FB4D53DEE15C87D" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_5023780807D9476D885C8ACDB89C8645" + "OwnerKey" = "8:_C3F868E2F86F4F22914EBB33174331CF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6D1F45F66466453998A8B163691BAD84" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_5023780807D9476D885C8ACDB89C8645" + "OwnerKey" = "8:_AA48472048A74261A786515933650C63" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_6E6776606E994FD99CC36CB5C62935CF" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_5023780807D9476D885C8ACDB89C8645" + "OwnerKey" = "8:_86FBE3D4BB5F42609082FB54D8079705" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_70FC345C7A6C47D799FD1EC7CD5F20D9" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_5023780807D9476D885C8ACDB89C8645" + "OwnerKey" = "8:_64B5C4E9452F43349FB4D53DEE15C87D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_86FBE3D4BB5F42609082FB54D8079705" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_5023780807D9476D885C8ACDB89C8645" + "OwnerKey" = "8:_42222ACB125B4398B7BF9C030F7DF8FB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_893ED45A96044D8B94FDF0BF5DD2476B" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_5023780807D9476D885C8ACDB89C8645" + "OwnerKey" = "8:_4053CC7DC75C48E98893BCEA2D692E55" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9365183139E941EA8C13A61D5EA82D2C" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_5023780807D9476D885C8ACDB89C8645" + "OwnerKey" = "8:_32F4158C158142089DB13F5F29F91589" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9BE9403CD5C049DF8EA2E499B2F794CB" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_5023780807D9476D885C8ACDB89C8645" + "OwnerKey" = "8:_29583B2B37A44A71864FFD88DFED2C8F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AA48472048A74261A786515933650C63" + "MsmKey" = "8:_572E52797C0A4873ACFC45E53ED1FB78" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B15174FB733CFDB87929A99EF031FE60" - "OwnerKey" = "8:_29583B2B37A44A71864FFD88DFED2C8F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C3F868E2F86F4F22914EBB33174331CF" + "MsmKey" = "8:_5C115FFB3D1542998DEB88C97B348F59" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C53272351C914F09989E6CB992D9BE44" + "MsmKey" = "8:_64B5C4E9452F43349FB4D53DEE15C87D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D499C5FBBF9849CD9637C43FE8F44F63" + "MsmKey" = "8:_6D1F45F66466453998A8B163691BAD84" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E6AAF8DB843A4CDCBD12F62B44F0D947" + "MsmKey" = "8:_6E6776606E994FD99CC36CB5C62935CF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EEA6229EA3514598AF3B3659BB85AB7A" - "OwnerKey" = "8:_129947045FE24C5AAEE6467547A6FBBB" + "MsmKey" = "8:_70FC345C7A6C47D799FD1EC7CD5F20D9" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EEA6229EA3514598AF3B3659BB85AB7A" - "OwnerKey" = "8:_E6AAF8DB843A4CDCBD12F62B44F0D947" + "MsmKey" = "8:_86FBE3D4BB5F42609082FB54D8079705" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EEA6229EA3514598AF3B3659BB85AB7A" - "OwnerKey" = "8:_C3F868E2F86F4F22914EBB33174331CF" + "MsmKey" = "8:_893ED45A96044D8B94FDF0BF5DD2476B" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EEA6229EA3514598AF3B3659BB85AB7A" - "OwnerKey" = "8:_AA48472048A74261A786515933650C63" + "MsmKey" = "8:_9365183139E941EA8C13A61D5EA82D2C" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EEA6229EA3514598AF3B3659BB85AB7A" - "OwnerKey" = "8:_86FBE3D4BB5F42609082FB54D8079705" + "MsmKey" = "8:_9BE9403CD5C049DF8EA2E499B2F794CB" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EEA6229EA3514598AF3B3659BB85AB7A" - "OwnerKey" = "8:_64B5C4E9452F43349FB4D53DEE15C87D" + "MsmKey" = "8:_AA48472048A74261A786515933650C63" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EEA6229EA3514598AF3B3659BB85AB7A" - "OwnerKey" = "8:_42222ACB125B4398B7BF9C030F7DF8FB" + "MsmKey" = "8:_C3F868E2F86F4F22914EBB33174331CF" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EEA6229EA3514598AF3B3659BB85AB7A" - "OwnerKey" = "8:_4053CC7DC75C48E98893BCEA2D692E55" + "MsmKey" = "8:_C53272351C914F09989E6CB992D9BE44" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EEA6229EA3514598AF3B3659BB85AB7A" - "OwnerKey" = "8:_32F4158C158142089DB13F5F29F91589" + "MsmKey" = "8:_D499C5FBBF9849CD9637C43FE8F44F63" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EEA6229EA3514598AF3B3659BB85AB7A" - "OwnerKey" = "8:_29583B2B37A44A71864FFD88DFED2C8F" + "MsmKey" = "8:_E6AAF8DB843A4CDCBD12F62B44F0D947" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -666,26 +660,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B15174FB733CFDB87929A99EF031FE60" - { - "SourcePath" = "8:PSAPI.DLL" - "TargetName" = "8:PSAPI.DLL" - "Tag" = "8:" - "Folder" = "8:_C751D6577C584B05A32BF01390F14B9F" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C53272351C914F09989E6CB992D9BE44" { "SourcePath" = "8:..\\..\\COPYING.zlib" @@ -774,7 +748,7 @@ { "{3C67513D-01DD-4637-8A68-80971EB9504F}:_C751D6577C584B05A32BF01390F14B9F" { - "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" + "DefaultLocation" = "8:[ProgramFilesFolder]\\[ProductName]" "Name" = "8:#1925" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" @@ -831,7 +805,7 @@ "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" "ProductVersion" = "8:0.99.0" - "Manufacturer" = "8:Sourcefire Inc" + "Manufacturer" = "8:Cisco Systems, Inc" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.clamav.net" "Title" = "8:ClamAV" @@ -1339,11 +1313,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EEA6229EA3514598AF3B3659BB85AB7A" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_5023780807D9476D885C8ACDB89C8645" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC100_DebugCRT_x86.msm" + "SourcePath" = "8:Microsoft_VC100_CRT_x86.msm" "Properties" { } @@ -1358,7 +1332,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_129947045FE24C5AAEE6467547A6FBBB" { - "SourcePath" = "8:..\\Win32\\Debug\\sigtool.exe" + "SourcePath" = "8:..\\Win32\\Release\\sigtool.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C751D6577C584B05A32BF01390F14B9F" @@ -1386,7 +1360,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_29583B2B37A44A71864FFD88DFED2C8F" { - "SourcePath" = "8:..\\Win32\\Debug\\libclamav.dll" + "SourcePath" = "8:..\\Win32\\Release\\libclamav.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C751D6577C584B05A32BF01390F14B9F" @@ -1414,7 +1388,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_32F4158C158142089DB13F5F29F91589" { - "SourcePath" = "8:..\\Win32\\Debug\\clamscan.exe" + "SourcePath" = "8:..\\Win32\\Release\\clamscan.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C751D6577C584B05A32BF01390F14B9F" @@ -1442,7 +1416,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4053CC7DC75C48E98893BCEA2D692E55" { - "SourcePath" = "8:..\\Win32\\Debug\\libclamunrar_iface.dll" + "SourcePath" = "8:..\\Win32\\Release\\libclamunrar_iface.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C751D6577C584B05A32BF01390F14B9F" @@ -1470,7 +1444,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_42222ACB125B4398B7BF9C030F7DF8FB" { - "SourcePath" = "8:..\\Win32\\Debug\\freshclam.exe" + "SourcePath" = "8:..\\Win32\\Release\\freshclam.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C751D6577C584B05A32BF01390F14B9F" @@ -1498,7 +1472,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_64B5C4E9452F43349FB4D53DEE15C87D" { - "SourcePath" = "8:..\\Win32\\Debug\\clambc.exe" + "SourcePath" = "8:..\\Win32\\Release\\clambc.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C751D6577C584B05A32BF01390F14B9F" @@ -1526,7 +1500,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_86FBE3D4BB5F42609082FB54D8079705" { - "SourcePath" = "8:..\\Win32\\Debug\\clamdscan.exe" + "SourcePath" = "8:..\\Win32\\Release\\clamdscan.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C751D6577C584B05A32BF01390F14B9F" @@ -1554,7 +1528,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_AA48472048A74261A786515933650C63" { - "SourcePath" = "8:..\\Win32\\Debug\\clamconf.exe" + "SourcePath" = "8:..\\Win32\\Release\\clamconf.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C751D6577C584B05A32BF01390F14B9F" @@ -1582,7 +1556,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C3F868E2F86F4F22914EBB33174331CF" { - "SourcePath" = "8:..\\Win32\\Debug\\clamd.exe" + "SourcePath" = "8:..\\Win32\\Release\\clamd.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C751D6577C584B05A32BF01390F14B9F" @@ -1610,7 +1584,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E6AAF8DB843A4CDCBD12F62B44F0D947" { - "SourcePath" = "8:..\\Win32\\Debug\\libclamunrar.dll" + "SourcePath" = "8:..\\Win32\\Release\\libclamunrar.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C751D6577C584B05A32BF01390F14B9F" diff --git a/win32/res/common.rc b/win32/res/common.rc index 153fc49df..bfa9500d4 100644 --- a/win32/res/common.rc +++ b/win32/res/common.rc @@ -28,14 +28,14 @@ VS_VERSION_INFO VERSIONINFO BEGIN BLOCK "StringFileInfo" { BLOCK "040904B0" { - VALUE "CompanyName", "SourceFire, Inc." + VALUE "CompanyName", "Cisco Systems, Inc." VALUE "FileDescription", RES_FDESC VALUE "FileVersion", REPO_VERSION VALUE "InternalName", RES_NAME VALUE "OriginalFilename", RES_FNAME VALUE "ProductName", "ClamAV" VALUE "ProductVersion", RES_VER_S " (" REPO_VERSION ")" - VALUE "LegalCopyright", "(C) 2009 Sourcefire, Inc." + VALUE "LegalCopyright", "(C) 2015 Cisco Systems, Inc." VALUE "LegalTrademarks", "License: GNU GPL, Version 2" VALUE "Comments", REPO_VERSION }