From bc521cb7fb1889e2a1bbeb24d4212f15c41d08a6 Mon Sep 17 00:00:00 2001
From: mnhauke <>
Date: Dec 28 2022 10:04:36 +0000
Subject: Update aircrack-ng to version 1.7 / rev 3 via SR 1045554
https://build.opensuse.org/request/show/1045554
by user mnhauke + dimstar_suse
---
diff --git a/.files b/.files
index e089622..33df47e 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index fe2fd1b..9461c97 100644
--- a/.rev
+++ b/.rev
@@ -19,4 +19,12 @@ https://www.bundesverfassungsgericht.de/entscheidungen/rk20090518_2bvr223307.htm
976366
+
+ d49d1931020603f26553b2bcc50b1ef1
+ 1.7
+
+ dimstar_suse
+
+ 1045554
+
diff --git a/aircrack-ng.changes b/aircrack-ng.changes
index 3712c41..43c8ad4 100644
--- a/aircrack-ng.changes
+++ b/aircrack-ng.changes
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Tue Dec 27 18:02:52 UTC 2022 - Holger B. A. Rauch
+
+- "Fixed" patch
+ (originally coming from "https://github.com/aircrack-ng/aircrack-ng/pull/2335")
+ * s390x-enablement-cpustats.patch
+- Excluded .keepthisfolder file from being taken into account for RPM packaging
+
+-------------------------------------------------------------------
Wed May 11 08:06:23 UTC 2022 - Martin Hauke
- Update to version 1.7
diff --git a/aircrack-ng.spec b/aircrack-ng.spec
index 535d70d..5b6a487 100644
--- a/aircrack-ng.spec
+++ b/aircrack-ng.spec
@@ -28,6 +28,7 @@ Group: Productivity/Networking/Security
URL: https://www.aircrack-ng.org/
Source0: https://download.aircrack-ng.org/%{name}-%{version}.tar.gz
Source1: README.SUSE
+Patch1: s390x-enablement-cpustats.patch
BuildRequires: autoconf
BuildRequires: ethtool
BuildRequires: expect
@@ -60,12 +61,14 @@ for auditing purposes.
Summary: Development files for %{name}
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
+BuildArch: noarch
%description devel
Development files for %{name}.
%prep
%setup -q
+%patch1 -p1
find patches/ -type f -exec sed -i 's|\r||g' {} +
cp "%{SOURCE1}" .
# Force python3 interpreter
@@ -96,6 +99,7 @@ rm patches/old/ieee80211_inject.patch
find %{buildroot} -type f \( -name "*.la" -o -name "*.a" \) -delete -print
%if %{with unstable}
rm %{buildroot}%{_prefix}/local/lib/python3*/site-packages/aircrack-ng/air*-install_files.txt
+rm %{buildroot}%{_datadir}/airgraph-ng/.keepthisfolder
%endif
%check
diff --git a/s390x-enablement-cpustats.patch b/s390x-enablement-cpustats.patch
new file mode 100644
index 0000000..d799470
--- /dev/null
+++ b/s390x-enablement-cpustats.patch
@@ -0,0 +1,59 @@
+diff -ur aircrack-ng-1.7/lib/libac/support/common.c aircrack-ng-1.7-patched/lib/libac/support/common.c
+--- aircrack-ng-1.7/lib/libac/support/common.c 2022-05-11 01:01:46.000000000 +0200
++++ aircrack-ng-1.7-patched/lib/libac/support/common.c 2022-12-20 20:26:54.727450707 +0100
+@@ -331,9 +331,7 @@
+ #elif defined(__linux__)
+ char *s, *pos;
+ FILE * f;
+- // Reading /proc/cpuinfo is more reliable on current CPUs,
+- // so put it first and try the old method if this one fails
+- f = fopen("/proc/cpuinfo", "r");
++ f = fopen("/proc/stat", "r");
+
+ if (f != NULL)
+ {
+@@ -344,26 +342,17 @@
+ // Get the latest value of "processor" element
+ // and increment it by 1 and it that value
+ // will be the number of CPU.
+- number = -2;
++ number = 0;
+
+ while (fgets(s, 80, f) != NULL)
+ {
+- pos = strstr(s, "processor");
+-
+- if (pos == s)
++ pos = strstr(s, "cpu");
++ if (pos != NULL && pos + 3 <= s + 81)
+ {
+- pos = strchr(s, ':');
+-
+- if (pos != NULL)
+- {
+- int tmp_number = atoi(pos + 1);
+- if (tmp_number > 0 && tmp_number <= 1024)
+- number = tmp_number;
+- }
++ if (isdigit(*(pos + 3)) != 0) ++number;
+ }
+ }
+
+- ++number;
+ free(s);
+ }
+
+Only in aircrack-ng-1.7-patched/lib/libac/support: common.c.orig
+diff -ur aircrack-ng-1.7/src/aircrack-ng/aircrack-ng.c aircrack-ng-1.7-patched/src/aircrack-ng/aircrack-ng.c
+--- aircrack-ng-1.7/src/aircrack-ng/aircrack-ng.c 2022-05-11 01:01:46.000000000 +0200
++++ aircrack-ng-1.7-patched/src/aircrack-ng/aircrack-ng.c 2022-12-20 20:29:28.537450707 +0100
+@@ -2236,6 +2236,8 @@
+ {
+ pkh.caplen = ___my_swab32(pkh.caplen);
+ pkh.len = ___my_swab32(pkh.len);
++ pkh.tv_sec = ___my_swab32(pkh.tv_sec);
++ pkh.tv_usec = ___my_swab32(pkh.tv_usec);
+ }
+
+ if (pkh.caplen <= 0 || pkh.caplen > 65535)
+Only in aircrack-ng-1.7-patched/src/aircrack-ng: aircrack-ng.c.orig