diff -Nru masscan-1.0.3-90-g2441f18~ds0/debian/changelog masscan-1.0.3-90-g2441f18~ds0/debian/changelog --- masscan-1.0.3-90-g2441f18~ds0/debian/changelog 2014-10-15 21:06:33.000000000 +0800 +++ masscan-1.0.3-90-g2441f18~ds0/debian/changelog 2015-03-31 11:08:06.000000000 +0800 @@ -1,3 +1,11 @@ +masscan (1.0.3-90-g2441f18~ds0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS on most architectures (Non-ARM, Non-x86, and kFreeBSD). + (Closes: 773786) + + -- YunQiang Su Tue, 31 Mar 2015 11:06:17 +0800 + masscan (1.0.3-90-g2441f18~ds0-1) unstable; urgency=medium * Import new upstream snapshot. diff -Nru masscan-1.0.3-90-g2441f18~ds0/debian/patches/fix-nonx86-build.patch masscan-1.0.3-90-g2441f18~ds0/debian/patches/fix-nonx86-build.patch --- masscan-1.0.3-90-g2441f18~ds0/debian/patches/fix-nonx86-build.patch 1970-01-01 08:00:00.000000000 +0800 +++ masscan-1.0.3-90-g2441f18~ds0/debian/patches/fix-nonx86-build.patch 2015-03-31 11:05:41.000000000 +0800 @@ -0,0 +1,26 @@ +Index: masscan-1.0.3-90-g2441f18~ds0/src/pixie-threads.h +=================================================================== +--- masscan-1.0.3-90-g2441f18~ds0.orig/src/pixie-threads.h 2014-10-15 21:05:50.000000000 +0800 ++++ masscan-1.0.3-90-g2441f18~ds0/src/pixie-threads.h 2015-03-31 11:03:49.282962083 +0800 +@@ -40,7 +40,7 @@ + #define pixie_locked_CAS32(dst, src, expected) __sync_bool_compare_and_swap((volatile int*)(dst),(int)expected,(int)src); + #define pixie_locked_CAS64(dst, src, expected) __sync_bool_compare_and_swap((volatile long long int*)(dst),(long long int)expected,(long long int)src); + +-#if defined(__arm__) ++#if !defined(__x86_64__) && !defined(__i386__) + #define rte_wmb() __sync_synchronize() + #define rte_rmb() __sync_synchronize() + #define rte_pause() +Index: masscan-1.0.3-90-g2441f18~ds0/src/pixie-threads.c +=================================================================== +--- masscan-1.0.3-90-g2441f18~ds0.orig/src/pixie-threads.c 2014-10-15 21:05:50.000000000 +0800 ++++ masscan-1.0.3-90-g2441f18~ds0/src/pixie-threads.c 2015-03-31 11:05:38.346964277 +0800 +@@ -180,7 +180,7 @@ + #if defined(WIN32) + UNUSEDPARM(flags); + return _beginthread(worker_thread, 0, worker_data); +-#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) ++#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__kFreeBSD__) || defined(__OpenBSD__) + + typedef void *(*PTHREADFUNC)(void*); + pthread_t thread_id; diff -Nru masscan-1.0.3-90-g2441f18~ds0/debian/patches/series masscan-1.0.3-90-g2441f18~ds0/debian/patches/series --- masscan-1.0.3-90-g2441f18~ds0/debian/patches/series 2014-10-15 21:05:17.000000000 +0800 +++ masscan-1.0.3-90-g2441f18~ds0/debian/patches/series 2015-03-31 11:01:53.000000000 +0800 @@ -1 +1,2 @@ 0001-buildsystem.patch +fix-nonx86-build.patch