Skip to contentSkip to conversation

aircrack-ng: bump to version 1.4

PATCH New Laurent Cans 3 participants 3 messages Oct 2, 2018 – Oct 3, 2018

lore
Share & tools
lore

Laurent Cans

author
#0 lore raw

PATCH 1/1 aircrack-ng: bump to version 1.4

- Remove patch (already in version)
- align LICENSE hash to minor modifications in file

Signed-off-by Laurent Cans <[email protected]>
---
 package/aircrack-ng/0001-Fix-build-with-mmx.patch  | 71 ----------------------
 ...1-autotools-Fix-optional-SIMD-on-PPC-arch.patch | 69 ---------------------
 package/aircrack-ng/aircrack-ng.hash               |  6 +-
 package/aircrack-ng/aircrack-ng.mk                 |  2 +-
 4 files changed, 4 insertions(+), 144 deletions(-)
 delete mode 100644 package/aircrack-ng/0001-Fix-build-with-mmx.patch
 delete mode 100644 package/aircrack-ng/0001-autotools-Fix-optional-SIMD-on-PPC-arch.patch
package/aircrack-ng/0001-Fix-build-with-mmx.patch deleted +0 -71
deleted file mode 100644
index 620d806d88..0000000000
@@ -1,71 +0,0 @@
-From 37078a46346f01141cc13026bb5ad426bb98f3a0 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Wed, 22 Aug 2018 20:01:07 +0200
-Subject: [PATCH] Fix build with mmx
-
-Commit 39387fc80f90f3a9ac9ef9f3aa32da5776a0721e removed mmx support
-however aircrack-ng fails to build on platforms with mmx because an
-error is raised if __MMX__ is defined.
-
-Fixes:
- - http://autobuild.buildroot.net/results/b7362b69435e9ef6fb2aedc50743e88dbd7a5c72
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: merged (https://github.com/aircrack-ng/aircrack-ng/pull/1943)]
----
- src/aircrack-crypto/arch.h              | 3 ---
- src/aircrack-crypto/memory.h            | 3 ---
- src/aircrack-crypto/pseudo_intrinsics.h | 9 ---------
- 3 files changed, 15 deletions(-)
-
-diff --git a/src/aircrack-crypto/arch.h b/src/aircrack-crypto/arch.h
-index 1a19ddd6..78b9e619 100644
---- a/src/aircrack-crypto/arch.h
-+++ b/src/aircrack-crypto/arch.h
-@@ -357,9 +357,6 @@
- #elif __SSE2__
- #define SIMD_COEF_32 4
- #define SIMD_COEF_64 2
--#elif __MMX__
--#define SIMD_COEF_32 2
--#define SIMD_COEF_64 1
- #endif
- 
- /*
-diff --git a/src/aircrack-crypto/memory.h b/src/aircrack-crypto/memory.h
-index 83b048f0..24b1c95b 100644
---- a/src/aircrack-crypto/memory.h
-+++ b/src/aircrack-crypto/memory.h
-@@ -70,9 +70,6 @@
- #elif __SSE2__
- #define SIMD_COEF_32 4
- #define SIMD_COEF_64 2
--#elif __MMX__
--#define SIMD_COEF_32 2
--#define SIMD_COEF_64 1
- #endif
- 
- /*
-diff --git a/src/aircrack-crypto/pseudo_intrinsics.h b/src/aircrack-crypto/pseudo_intrinsics.h
-index dd0ca379..f5527bdd 100644
---- a/src/aircrack-crypto/pseudo_intrinsics.h
-+++ b/src/aircrack-crypto/pseudo_intrinsics.h
-@@ -658,15 +658,6 @@ _inline __m128i _mm_set1_epi64(long long a)
- 	(vtype)(vtype64) { x0, x1 }
- #endif
- 
--/******************************** MMX *********************************/
--
--#elif __MMX__
--#include <mmintrin.h>
--
--typedef __m64i vtype;
--
--#error MMX intrinsics not implemented (contributions are welcome!)
--
- #endif /* __SIMD__ elif __SIMD__ elif __SIMD__ */
- 
- /************************* COMMON STUFF BELOW *************************/
--- 
-2.14.1
-
package/aircrack-ng/0001-autotools-Fix-optional-SIMD-on-PPC-arch.patch deleted +0 -69

69 lines not on this page · raw message

package/aircrack-ng/aircrack-ng.hash +3 -3
index 7c5fe9f0de..031e803eee 100644
@@ -1,6 +1,6 @@
 # From http://www.aircrack-ng.org/downloads.html
-sha1 245464585dfd24622807a8f868d62d9d00f6a22c aircrack-ng-1.3.tar.gz
-md5 c7c5b076dee0c25ee580b0f56f455623 aircrack-ng-1.3.tar.gz
+sha1 22bae2c6f21e463df62b4c06c9c3c45c42a9b4ea aircrack-ng-1.4.tar.gz
+md5 24e22f6f6eca1e7dc0d203e5719d3e8d aircrack-ng-1.3.tar.gz
 
 # Hash for license file:
-sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE
+sha256 fc51fd3a97223f2fd47b057202d4a6b0daaedf23b5a1f5ff8723c192fc1e021d LICENSE
package/aircrack-ng/aircrack-ng.mk +1 -1
index f338121a48..350e251bfe 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AIRCRACK_NG_VERSION = 1.3
+AIRCRACK_NG_VERSION = 1.4
 AIRCRACK_NG_SITE = http://download.aircrack-ng.org
 AIRCRACK_NG_LICENSE = GPL-2.0+
 AIRCRACK_NG_LICENSE_FILES = LICENSE
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 aircrack-ng: bump to version 1.4

Laurent,

Quoted 2 lines · Laurent Cans

- Remove patch (already in version)

I'm confirmed the dropped patch changes are in 1.4

[snip]

package/aircrack-ng/aircrack-ng.mk line 7

Quoted 2 lines
package/aircrack-ng/aircrack-ng.mk +1 -1
-AIRCRACK_NG_VERSION = 1.3
+AIRCRACK_NG_VERSION = 1.4

I've ran a few test-pkg builds with the updates and looks good enough to merge and let the autobuilders see what they find.

Tested-by Matt Weber <[email protected]>