From ef695ce3afa52409101c827e279c0e6e4b23492b Mon Sep 17 00:00:00 2001
From: Baptiste Courtois <b.courtois@criteo.com>
Date: Mon, 18 Jul 2016 15:53:38 +0200
Subject: [PATCH] Declare a single package for KB2919355

---
 libraries/package_helper.rb | 15 +++++----------
 libraries/v4_helper.rb      |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/libraries/package_helper.rb b/libraries/package_helper.rb
index 98e8f4d..5d24a4c 100644
--- a/libraries/package_helper.rb
+++ b/libraries/package_helper.rb
@@ -105,17 +105,12 @@ def packages
           checksum: x64? ? 'bf850afc7e7987d513fd2c19c9398d014bcbaaeb1691357fa0400529975edace' : '41e675937d023828d648c7a245e19695ed12f890c349d8b6f2b620e6e58e038e',
           not_if:   'reg query "HKLM\SOFTWARE\Microsoft\Updates\Microsoft .NET Framework 4.6\KB3083186" | FindStr /Ec:"ThisVersionInstalled +REG_SZ +Y"',
         },
-        'KB2919355-x64' => {
+        'KB2919355' => {
           name:     'Update for Microsoft Windows (KB2919355)',
-          url:      'https://download.microsoft.com/download/2/5/6/256CCCFB-5341-4A8D-A277-8A81B21A1E35/Windows8.1-KB2919355-x64.msu',
+          url:      x64? ? 'https://download.microsoft.com/download/2/5/6/256CCCFB-5341-4A8D-A277-8A81B21A1E35/Windows8.1-KB2919355-x64.msu'
+                      : 'https://download.microsoft.com/download/4/E/C/4EC66C83-1E15-43FD-B591-63FB7A1A5C04/Windows8.1-KB2919355-x86.msu',
           options:  '/norestart /quiet',
-          checksum: 'b0c9ada530f5ee90bb962afa9ed26218c582362315e13b1ba97e59767cb7825d',
-        },
-        'KB2919355-x86' => {
-          name:     'Update for Microsoft Windows (KB2919355)',
-          url:      'https://download.microsoft.com/download/4/E/C/4EC66C83-1E15-43FD-B591-63FB7A1A5C04/Windows8.1-KB2919355-x86.msu',
-          options:  '/norestart /quiet',
-          checksum: 'f8beca5b463a36e1fef45ad0dca6a0de7606930380514ac1852df5ca6e3f6c1d',
+          checksum: x64? ? 'b0c9ada530f5ee90bb962afa9ed26218c582362315e13b1ba97e59767cb7825d' : 'f8beca5b463a36e1fef45ad0dca6a0de7606930380514ac1852df5ca6e3f6c1d',
         },
       ).tap do |packages|
         # Some packages are installed as QFE updates on 2012, 2012R2 & 10
@@ -123,7 +118,7 @@ def packages
           when 6.2
             { '4.5.2' => 'KB2901982', '4.6' => 'KB3045562', '4.6.1' => 'KB3102439' }
           when 6.3
-            { '4.5.2' => 'KB2934520', '4.6' => 'KB3045563', '4.6.1' => 'KB3102467', "KB2919355-#{arch}" => 'KB2919355' }
+            { '4.5.2' => 'KB2934520', '4.6' => 'KB3045563', '4.6.1' => 'KB3102467', 'KB2919355' => 'KB2919355' }
           when 10
             { '4.6.1' => 'KB3102495' }
           else
diff --git a/libraries/v4_helper.rb b/libraries/v4_helper.rb
index 64daab3..1af0f75 100644
--- a/libraries/v4_helper.rb
+++ b/libraries/v4_helper.rb
@@ -102,7 +102,7 @@ def package_setup
     def prerequisite_names
       @patch_names ||= case nt_version
         when 6.3
-          prerequisites_46 = ["KB2919355-#{arch}"]
+          prerequisites_46 = %w(KB2919355)
           { '4.6' => prerequisites_46, '4.6.1' => prerequisites_46 }
         else
           {}