Bug#818230: Fwd: aircrack-ng: please make the build reproducible

[Samuel Henrique]

Hi Reiner,

Could you please follow up the discussion at[1]?

I added you as a collaborator on my fork, so what you push there will
update on the PR (check your email for a github collab. invite)

[1]https://github.com/aircrack-ng/aircrack-ng/pull/91

Samuel Henrique 

2016-12-25 18:13 GMT-02:00 Reiner Herrmann :

> Control: tags -1 + patch
>
> On Sun, Dec 25, 2016 at 11:05:56AM -0200, Samuel Henrique wrote:
> > Could you please update the patch to rc4? I would be infinitely grateful
> :)
>
> Updated patch attached. :)
>
> > Also, i believe you can also send this upstream, but if you don't, i can
> do
> > that for you.
>
> Please send it upstream, thanks!
>
> Regards,
>   Reiner
>
>
>
>

Bug#818230: Fwd: aircrack-ng: please make the build reproducible

[Reiner Herrmann]

Control: tags -1 + patch

On Sun, Dec 25, 2016 at 11:05:56AM -0200, Samuel Henrique wrote:
> Could you please update the patch to rc4? I would be infinitely grateful :)

Updated patch attached. :)

> Also, i believe you can also send this upstream, but if you don't, i can do
> that for you.

Please send it upstream, thanks!

Regards,
  Reiner
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
new file mode 100644
index 000..8ef2eae
--- /dev/null
+++ b/debian/patches/reproducible-build.patch
@@ -0,0 +1,28 @@
+--- a/src/Makefile
 b/src/Makefile
+@@ -4,6 +4,7 @@
+ TEST_DIR	= $(AC_ROOT)/test
+ 
+ CFLAGS		+= -Iinclude
++ASFLAGS		+= $(CFLAGS)
+ 
+ iCC		= /opt/intel/bin/icc
+ iCFLAGS		= -w -xHOST $(COMMON_CFLAGS)
+@@ -75,7 +76,7 @@
+ SRC_PTW		= aircrack-ptw-lib.c
+ SRC_AC		= aircrack-ng.c crypto.c common.c $(SSEC_INT) $(SRC_PTW)
+ OBJS_PTW	= aircrack-ptw-lib.o
+-OBJS_AC		= aircrack-ng.o cpuid.o crypto.o common.o $(SSEO_INT) uniqueiv.o $(OBJS_PTW) $(LIBLINECOUNT)
++OBJS_AC		= aircrack-ng.o cpuid.o crypto.o common.o $(SSEO_INT) uniqueiv.o sha1-sse2.o $(OBJS_PTW) $(LIBLINECOUNT)
+ OBJS_AC_MULTI	= crypto.o common.o uniqueiv.o $(OBJS_PTW)
+ ASM_AC		= sha1-sse2.S
+ 
+@@ -170,7 +171,7 @@
+ 	aircrack-ng-opt-prof -lpthread $(LIBSQL)
+ 
+ aircrack-ng$(EXE): $(OBJS_AC)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AC) $(ASM_AC) -o $(@) -lpthread $(LIBSSL) $(LIBSQL) $(LIBSTDCXX)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AC) -o $(@) -lpthread $(LIBSSL) $(LIBSQL) $(LIBSTDCXX)
+ 
+ ifeq ($(subst TRUE,true,$(filter TRUE true,$(multibin) $(MULTIBIN))),true)
+ wpapsk-simd.o: wpapsk.c
diff --git a/debian/patches/series b/debian/patches/series
index f47153b..57f333a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 01_remove_check.patch
 02_bashisms.patch
 03_fix_trap_usage_dash.patch
+reproducible-build.patch