aircrack-ng: test commit for hardened fixes

net-wireless/aircrack-ng/Manifest

@@ -1,7 +1,9 @@
+AUX aircrack-ng-1.0_rc4-fix_build.patch 347 RMD160 54c747a9f46804f9380c62beb26e66d459934104 SHA1 12ec12e38d81817caf0c9abbe95e9c21e3cc2092 SHA256 f71f8b670335e352b2165128098e19646ae41a1848aa048aa9b58fbe65651b64
+AUX aircrack-ng-1.1-respect_LDFLAGS.patch 3144 RMD160 322ec5d7592236f30456226de5cf433dde00deef SHA1 b73ef91057609910782fdd1581c0f7f8e8e6d47f SHA256 543d8efee610cd32874abb0ebc7371619526613ed04fa70db35d1caf473efff8
 AUX diff-wpa-migration-mode-aircrack-ng.diff 25165 RMD160 0a4ec44ab6580596f3f076e7b4a50a88118a4010 SHA1 be4c01c5128dd9c60f2074f616e5992112cc5735 SHA256 d36f2380d83fbfcbc48698cfd6d08de5a82a5a624a5d9f9cc3dbaaf7b7731fd8
 DIST aircrack-ng-1.0.tar.gz 1506412 RMD160 e8360aabbec1e7e038f86579e1004234f0899409 SHA1 8a3c5b8e322ea11e5559109a9f9d668ad6aee5f0 SHA256 65c2ad69a5522282b2c3c51daeceff70ecaff2d9ef4ff9c915a018f1d87680cd
 DIST aircrack-ng-1.1.tar.gz 1453272 RMD160 7d70533b0397e801d4a85c1be3584699364f3d38 SHA1 16eed1a8cf06eb8274ae382150b56589b23adf77 SHA256 b136b549b7d2a2751c21793100075ea43b28de9af4c1969508bb95bcc92224ad
 EBUILD aircrack-ng-1.0-r1.ebuild 1036 RMD160 59f04ea637fef17a894402e111a83e8400309599 SHA1 f478461f19068df386a2cc00288c75aa9aeadee7 SHA256 b0293724ef712844120b165aac7f3d4448f70add05ec1eda9c94b88d0f950cc0
-EBUILD aircrack-ng-1.1-r1.ebuild 1118 RMD160 89a88b85ba6c823b7d84a5669b6e06fd2c0719fa SHA1 6b196a46ff3a4a8f60dbf4cb59524a70548b15cd SHA256 5198f918d5e14ee95751e8c71e4a24ab19d658cefb05a903a0262fa67000e5ea
+EBUILD aircrack-ng-1.1-r1.ebuild 1312 RMD160 677a76663ad23bc328fff27e86250a7099522190 SHA1 2db3fb8781e1c448477f8a2d03156ab666b82f07 SHA256 d99f56b41eb4dc1a80204744f83a63ddd2712c20dd52968b3c6ed4092f6887ff
 EBUILD aircrack-ng-1.1-r2.ebuild 1432 RMD160 96d403fffa34fa7417a9eaad33dad9b7359ee382 SHA1 59fca16068976f144ff76e2ad9170599476d178a SHA256 2dd9c8230684c41817a5d1c27bda8965a8e4a42300a6ffddde4268c052cae74d
 EBUILD aircrack-ng-1.1.ebuild 1036 RMD160 59f04ea637fef17a894402e111a83e8400309599 SHA1 f478461f19068df386a2cc00288c75aa9aeadee7 SHA256 b0293724ef712844120b165aac7f3d4448f70add05ec1eda9c94b88d0f950cc0

net-wireless/aircrack-ng/aircrack-ng-1.1-r1.ebuild

@@ -34,9 +34,16 @@ have_unstable() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-respect_LDFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-1.0_rc4-fix_build.patch"
 	epatch "${FILESDIR}"/diff-wpa-migration-mode-aircrack-ng.diff
 }
 
+pkg_setup() {
+        # aircrack-ng fails to build with -fPIE.
+        filter-flags -fPIE
+}
+
 src_compile() {
 	emake sqlite=$(have_sqlite) unstable=$(have_unstable) || die "emake failed"
 }

net-wireless/aircrack-ng/files/aircrack-ng-1.0_rc4-fix_build.patch

@@ -0,0 +1,11 @@
+--- src/osdep/radiotap/ieee80211_radiotap.h
++++ src/osdep/radiotap/ieee80211_radiotap.h
+@@ -38,6 +38,8 @@
+ #ifndef IEEE80211RADIOTAP_H
+ #define IEEE80211RADIOTAP_H
+ 
++#include <sys/types.h>
++
+ /* Radiotap header version (from official NetBSD feed) */
+ #define IEEE80211RADIOTAP_VERSION	"1.5"
+ /* Base version of the radiotap packet header data */

net-wireless/aircrack-ng/files/aircrack-ng-1.1-respect_LDFLAGS.patch

@@ -0,0 +1,91 @@
+--- src/Makefile
++++ src/Makefile
+@@ -90,13 +90,13 @@
+ 
+ 
+ OSD		= osdep
+-LIBS		= -L$(OSD) -l$(OSD) $(LIBPCAP) $(LDFLAGS)
++LIBS		= -L$(OSD) -l$(OSD) $(LIBPCAP)
+ ifeq ($(OSNAME), cygwin)
+ LIBS		+= -liphlpapi -lsetupapi -luuid
+ endif
+ LIBOSD		= $(OSD)/lib$(OSD).a
+ 
+-LIBSSL		= -lssl -lcrypto $(LDFLAGS)
++LIBSSL		= -lssl -lcrypto
+ LIBSQL		=
+ ifeq ($(SQLITE), true)
+ 	LIBSQL		= -L/usr/local/lib -lsqlite3
+@@ -140,55 +140,55 @@
+ 	aircrack-ng-opt-prof -lpthread $(LIBSQL)
+ 
+ aircrack-ng$(EXE): $(OBJS_AC)
+-	$(CC) $(CFLAGS) $(OBJS_AC) $(ASM_AC) -o $(@) -lpthread $(LIBSSL) $(LIBSQL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AC) $(ASM_AC) -o $(@) -lpthread $(LIBSSL) $(LIBSQL)
+ 
+ airdecap-ng$(EXE): $(OBJS_AD)
+-	$(CC) $(CFLAGS) $(OBJS_AD) -o $(@) $(LIBSSL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AD) -o $(@) $(LIBSSL)
+ 
+ packetforge-ng$(EXE): $(OBJS_PF)
+-	$(CC) $(CFLAGS) $(OBJS_PF) -o $(@) $(LIBSSL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_PF) -o $(@) $(LIBSSL)
+ 
+ aireplay-ng$(EXE): $(OBJS_AR) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_AR) -o $(@) $(LIBS) $(LIBSSL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AR) -o $(@) $(LIBS) $(LIBSSL)
+ 
+ airodump-ng$(EXE): $(OBJS_ADU) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_ADU) -o $(@) $(LIBS) $(LIBSSL) -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_ADU) -o $(@) $(LIBS) $(LIBSSL) -lpthread
+ 
+ airserv-ng$(EXE): $(OBJS_AS) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_AS) -o $(@) $(LIBS) $(LIBPCAP)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AS) -o $(@) $(LIBS) $(LIBPCAP)
+ 
+ airtun-ng$(EXE): $(OBJS_AT) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_AT) -o $(@) $(LIBS) $(LIBSSL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AT) -o $(@) $(LIBS) $(LIBSSL)
+ 
+ ivstools$(EXE): $(OBJS_IV)
+-	$(CC) $(CFLAGS) $(OBJS_IV) -o $(@) $(LIBSSL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_IV) -o $(@) $(LIBSSL)
+ 
+ kstats$(EXE): kstats.o
+-	$(CC) $(CFLAGS) kstats.o -o $(@)
++	$(CC) $(CFLAGS) $(LDFLAGS) kstats.o -o $(@)
+ 
+ wesside-ng$(EXE): $(OBJS_WS) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_WS) -o $(@) $(LIBS) $(LIBSSL) -lz
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_WS) -o $(@) $(LIBS) $(LIBSSL) -lz
+ 
+ easside-ng$(EXE): $(OBJS_ES) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_ES) -o $(@) $(LIBS) -lz
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_ES) -o $(@) $(LIBS) -lz
+ 
+ buddy-ng$(EXE): $(OBJS_BUDDY)
+-	$(CC) $(CFLAGS) $(OBJS_BUDDY) -o $(@)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_BUDDY) -o $(@)
+ 
+ makeivs-ng$(EXE): $(OBJS_MI)
+-	$(CC) $(CFLAGS) $(OBJS_MI) -o $(@)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_MI) -o $(@)
+ 
+ airolib-ng$(EXE): $(OBJS_AL)
+-	$(CC) $(CFLAGS) $(OBJS_AL) -o $(@) $(LIBSSL) -DHAVE_REGEXP $(LIBSQL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AL) -o $(@) $(LIBSSL) -DHAVE_REGEXP $(LIBSQL)
+ 
+ airbase-ng$(EXE): $(OBJS_AB) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_AB) -o $(@) $(LIBS) $(LIBSSL) -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AB) -o $(@) $(LIBS) $(LIBSSL) -lpthread
+ 
+ airdecloak-ng$(EXE): $(OBJS_AU)
+-	$(CC) $(CFLAGS) $(OBJS_AU) -o $(@)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AU) -o $(@)
+ 
+ tkiptun-ng$(EXE): $(OBJS_TT) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_TT) -o $(@) $(LIBS) $(LIBSSL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_TT) -o $(@) $(LIBS) $(LIBSSL)
+ 
+ strip: $(BINFILES) $(SBINFILES)
+ 	strip $(BINFILES) $(SBINFILES)