I've hardcoded the package now against clang/llvm 3.6, the described problem 
should vanish
with that.

I can't push to the Dgit archive currently as DM, but I'm going to use Dgit in 
the future
so that individual changes could be watched closely.

Best,
DS

-- 
4096R/DF5182C8
46CB 1CA8 9EA3 B743 7676 1DB9 15E0 9AF4 DF51 82C8
LPI certified Linux admin (LPI000329859 64mz6f7kt4)
http://www.danielstender.com/blog/
diff -Nru afl-1.95b/debian/changelog afl-1.95b/debian/changelog
--- afl-1.95b/debian/changelog	2015-12-03 15:54:57.000000000 +0100
+++ afl-1.95b/debian/changelog	2016-01-07 00:33:15.000000000 +0100
@@ -1,3 +1,12 @@
+afl (1.95b-3) unstable; urgency=medium
+
+  * Hardcode current LLVM/clang version in debian/ files and in the
+    source (added hardcode-llvm-version.patch) to prevent crash of
+    afl-clang-fast because default build-time and runtime version
+    differs (Closes: #807578).
+
+ -- Daniel Stender <deb...@danielstender.com>  Thu, 07 Jan 2016 00:33:02 +0100
+
 afl (1.95b-2) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru afl-1.95b/debian/control afl-1.95b/debian/control
--- afl-1.95b/debian/control	2015-11-19 16:18:10.000000000 +0100
+++ afl-1.95b/debian/control	2016-01-07 00:32:47.000000000 +0100
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Daniel Stender <deb...@danielstender.com>
 Build-Depends:
- clang,
+ clang-3.6,
  debhelper (>= 9),
  dh-buildinfo,
- llvm-dev
+ llvm-3.6-dev
 Standards-Version: 3.9.6
 Homepage: http://lcamtuf.coredump.cx/afl/
 
@@ -36,7 +36,7 @@
 Package: afl-clang
 Depends:
  afl (= ${binary:Version}),
- clang,
+ clang-3.6,
  ${clang:Depends},
  ${misc:Depends},
  ${shlibs:Depends}
diff -Nru afl-1.95b/debian/patches/hardcode-clang-version.patch afl-1.95b/debian/patches/hardcode-clang-version.patch
--- afl-1.95b/debian/patches/hardcode-clang-version.patch	1970-01-01 01:00:00.000000000 +0100
+++ afl-1.95b/debian/patches/hardcode-clang-version.patch	2016-01-07 00:31:58.000000000 +0100
@@ -0,0 +1,63 @@
+Description: hardcode-clang-version.patch
+ hardcode clang version to prevent crash of afl-clang-fast
+ if build-time and runtime default version differs.
+ Bug: https://bugs.debian.org/807578
+ Forwarded: no
+ Last-Update: 2016-01-06
+Author: Daniel Stender <deb...@danielstender.com>
+X-Dgit-Generated: 1.95b-2 824b7cf540b215d5888162f1d18bd35c3038d87e
+
+---
+
+--- afl-1.95b.orig/afl-gcc.c
++++ afl-1.95b/afl-gcc.c
+@@ -129,10 +129,10 @@ static void edit_params(u32 argc, char**
+ 
+     if (!strcmp(name, "afl-clang++")) {
+       u8* alt_cxx = getenv("AFL_CXX");
+-      cc_params[0] = alt_cxx ? alt_cxx : (u8*)"clang++";
++      cc_params[0] = alt_cxx ? alt_cxx : (u8*)"clang++-3.6";
+     } else {
+       u8* alt_cc = getenv("AFL_CC");
+-      cc_params[0] = alt_cc ? alt_cc : (u8*)"clang";
++      cc_params[0] = alt_cc ? alt_cc : (u8*)"clang-3.6";
+     }
+ 
+   } else {
+--- afl-1.95b.orig/llvm_mode/Makefile
++++ afl-1.95b/llvm_mode/Makefile
+@@ -22,7 +22,7 @@ BIN_PATH     = $(PREFIX)/bin
+ 
+ VERSION      = $(shell grep ^VERSION ../Makefile | cut -d= -f2 | sed 's/ //')
+ 
+-LLVM_CONFIG ?= llvm-config
++LLVM_CONFIG ?= llvm-config-3.6
+ 
+ CFLAGS      ?= -O3 -funroll-loops
+ CFLAGS      += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign \
+@@ -50,8 +50,8 @@ endif
+ 
+ ifeq "$(origin CC)" "default"
+ 
+-CC           = clang
+-CXX          = clang++
++CC           = clang-3.6
++CXX          = clang++-3.6
+ 
+ endif
+ 
+--- afl-1.95b.orig/llvm_mode/afl-clang-fast.c
++++ afl-1.95b/llvm_mode/afl-clang-fast.c
+@@ -106,10 +106,10 @@ static void edit_params(u32 argc, char**
+ 
+   if (!strcmp(name, "afl-clang-fast++")) {
+     u8* alt_cxx = getenv("AFL_CXX");
+-    cc_params[0] = alt_cxx ? alt_cxx : (u8*)"clang++";
++    cc_params[0] = alt_cxx ? alt_cxx : (u8*)"clang++-3.6";
+   } else {
+     u8* alt_cc = getenv("AFL_CC");
+-    cc_params[0] = alt_cc ? alt_cc : (u8*)"clang";
++    cc_params[0] = alt_cc ? alt_cc : (u8*)"clang-3.6";
+   }
+ 
+   cc_params[cc_par_cnt++] = "-Xclang";
diff -Nru afl-1.95b/debian/patches/series afl-1.95b/debian/patches/series
--- afl-1.95b/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ afl-1.95b/debian/patches/series	2016-01-07 00:31:58.000000000 +0100
@@ -0,0 +1 @@
+hardcode-clang-version.patch
diff -Nru afl-1.95b/debian/rules afl-1.95b/debian/rules
--- afl-1.95b/debian/rules	2015-12-03 14:36:20.000000000 +0100
+++ afl-1.95b/debian/rules	2016-01-07 00:32:55.000000000 +0100
@@ -50,4 +50,4 @@
 
 override_dh_gencontrol:
 	dh_gencontrol
-	debian/dh_clang -p afl-clang
+#	debian/dh_clang -p afl-clang

Reply via email to