Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package aircrack-ng for openSUSE:Factory checked in at 2022-12-28 10:54:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aircrack-ng (Old)
and /work/SRC/openSUSE:Factory/.aircrack-ng.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aircrack-ng"
Wed Dec 28 10:54:55 2022 rev:3 rq:1045554 version:1.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/aircrack-ng/aircrack-ng.changes 2022-05-12 23:00:12.580784664 +0200
+++ /work/SRC/openSUSE:Factory/.aircrack-ng.new.1563/aircrack-ng.changes 2022-12-28 10:55:01.240279488 +0100
@@ -1,0 +2,8 @@
+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
+
+-------------------------------------------------------------------
New:
----
s390x-enablement-cpustats.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aircrack-ng.spec ++++++
--- /var/tmp/diff_new_pack.9uFGxO/_old 2022-12-28 10:55:01.820283743 +0100
+++ /var/tmp/diff_new_pack.9uFGxO/_new 2022-12-28 10:55:01.824283771 +0100
@@ -28,6 +28,7 @@
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 @@
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 @@
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
++++++ s390x-enablement-cpustats.patch ++++++
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
