Merge branch '3459-patch-bzip2' into 'master'

Resolve "Patch bzip2 to fix CVE-2016-3189"

Closes #3459

See merge request gitlab-org/omnibus-gitlab!2475

CHANGELOG.md

@@ -20,6 +20,7 @@ omnibus-gitlab repository.
 - Add option to disable healthcheck for storagedriver in registry
 - Restart runsv when log directory is changed 0a784647b
 - Bump rsync to 3.1.3 f539aa946
+- Patch bzip2 against CVE-2016-3189 552730bfa
 10.7.0

config/patches/bzip2/CVE-2016-3189.patch

+diff --git a/bzip2recover.c b/bzip2recover.c
+index f9de049..252c1b7 100644
+--- a/bzip2recover.c
++++ b/bzip2recover.c
+@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
+             bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
+             bsPutUInt32 ( bsWr, blockCRC );
+             bsClose ( bsWr );
++            outFile = NULL;
+          }
+          if (wrBlock >= rbCtr) break;
+          wrBlock++;

config/software/bzip2.rb

@@ -44,6 +44,7 @@ build do
   patch source: 'makefile_take_env_vars.patch', env: env
   patch source: 'soname_install_dir.patch', env: env if mac_os_x?
+  patch source: 'CVE-2016-3189.patch', env: env
   make args.to_s, env: env
   make "#{args} -f Makefile-libbz2_so", env: env