[packages_8.09] aircrack-ng: Merge r14483 and r14936 (#5263)

SVN-Revision: 16621

diff --git a/net/aircrack-ng/Makefile b/net/aircrack-ng/Makefile
index 1222bd366a3dd852ac39d77c4688553a43fa26ab..df728fe71dd5c35b22a737f90b3c299a543724da 100644 (file)
--- a/net/aircrack-ng/Makefile
+++ b/net/aircrack-ng/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aircrack-ng
-PKG_REV:=1142
+PKG_REV:=1396
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 
@@ -46,6 +46,7 @@ define Build/Compile
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
                prefix="/usr" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
+               OSNAME=Linux \
                all install
 endef
 

diff --git a/net/aircrack-ng/patches/001-no_abusive_malloc.patch b/net/aircrack-ng/patches/001-no_abusive_malloc.patch
deleted file mode 100644 (file)
index d68df0d..0000000
--- a/net/aircrack-ng/patches/001-no_abusive_malloc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN aircrack-ng-r1142/src/aircrack-ng.c aircrack-ng-r1142.new/src/aircrack-ng.c
---- aircrack-ng-r1142/src/aircrack-ng.c        2008-08-17 03:04:57.000000000 +0200
-+++ aircrack-ng-r1142.new/src/aircrack-ng.c    2008-11-09 23:29:20.000000000 +0100
-@@ -4450,8 +4450,8 @@
-       opt.bssidmerge = NULL;
-       opt.oneshot = 0;
- 
--      all_ivs = malloc( (256*256*256) * sizeof(used_iv));
--      bzero(all_ivs, (256*256*256)*sizeof(used_iv));
-+      //all_ivs = malloc( (256*256*256) * sizeof(used_iv));
-+      //bzero(all_ivs, (256*256*256)*sizeof(used_iv));
- 
-       forceptw = 0;
-