Fixes CVE-2014-2893 (Closes: #744817)

debian/changelog

@@ -2,13 +2,13 @@ llvm-toolchain-3.4 (1:3.4.2-1) unstable; urgency=medium
 
   * New upstream release
   * Add build conflict on libllvm-3.5-ocaml-dev
-  * Remove the override of dh_shlibdeps
   * Also disable lldb tests under armel (like armhf). Timeout
   * Update of the repack script
   * Use llvm-3.4-dev.links.in to manage the symlinks
   * Fix the soname of liblldb.so to see it treated as a real library
     (Closes: #750868)
   * Switch to the default gcc/g++ compiler. Currently 4.9 (Closes: #751322)
+  * Fixes CVE-2014-2893 (Closes: #744817)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 06 Jun 2014 15:55:57 +0200
 

debian/patches/CVE-2014-2893.diff

@@ -0,0 +1,16 @@
+Index: llvm-toolchain-3.3-3.3/clang/tools/scan-build/scan-build
+===================================================================
+--- llvm-toolchain-3.3-3.3.orig/clang/tools/scan-build/scan-build
++++ llvm-toolchain-3.3-3.3/clang/tools/scan-build/scan-build
+@@ -195,6 +195,11 @@ sub GetHTMLRunDir {
+   else {
+     $NewDir = "$Dir/$DateString-$RunNumber";
+   }
++
++  if (-d $NewDir) {
++      DieDiag("Directory '$NewDir' already existing");
++  }
++
+   system 'mkdir','-p',$NewDir;
+   return $NewDir;
+ }

debian/patches/series

@@ -39,3 +39,4 @@ fix-llvm-config-obj-src-root.patch
 scan-build-fix-clang-detection.diff
 compiler-rt-path.diff
 lldb-soname.diff
+CVE-2014-2893.diff

debian/rules

@@ -304,6 +304,11 @@ override_dh_auto_install:
 # Managed in lldb-X.Y.links.in
 	rm -f $(CURDIR)/$(TARGET_BUILD)/Release/lib/python*/site-packages/lldb/_lldb.so
 
+
+override_dh_shlibdeps:
+	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ dh_shlibdeps
+
+
 override_dh_install:
 	dh_install --fail-missing