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 2025-03-24 13:29:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aircrack-ng (Old) and /work/SRC/openSUSE:Factory/.aircrack-ng.new.2696 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aircrack-ng" Mon Mar 24 13:29:56 2025 rev:5 rq:1255221 version:1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/aircrack-ng/aircrack-ng.changes 2024-02-21 17:55:49.102005404 +0100 +++ /work/SRC/openSUSE:Factory/.aircrack-ng.new.2696/aircrack-ng.changes 2025-03-24 13:30:05.718429195 +0100 @@ -1,0 +2,8 @@ +Wed Mar 19 22:55:49 UTC 2025 - Andreas Stieger <andreas.stie...@gmx.de> + +- build with pcre2, adding partial upstream patches + aircrack-ng-1.7-pcre2-1-2385.patch + aircrack-ng-1.7-pcre2-1-2391.patch + aircrack-ng-1.7-pcre2-1-2397.patch + +------------------------------------------------------------------- New: ---- aircrack-ng-1.7-pcre2-1-2385.patch aircrack-ng-1.7-pcre2-1-2391.patch aircrack-ng-1.7-pcre2-1-2397.patch BETA DEBUG BEGIN: New:- build with pcre2, adding partial upstream patches aircrack-ng-1.7-pcre2-1-2385.patch aircrack-ng-1.7-pcre2-1-2391.patch New: aircrack-ng-1.7-pcre2-1-2385.patch aircrack-ng-1.7-pcre2-1-2391.patch aircrack-ng-1.7-pcre2-1-2397.patch New: aircrack-ng-1.7-pcre2-1-2391.patch aircrack-ng-1.7-pcre2-1-2397.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aircrack-ng.spec ++++++ --- /var/tmp/diff_new_pack.erQ6bM/_old 2025-03-24 13:30:06.830475878 +0100 +++ /var/tmp/diff_new_pack.erQ6bM/_new 2025-03-24 13:30:06.834476047 +0100 @@ -29,6 +29,9 @@ Source0: https://download.aircrack-ng.org/%{name}-%{version}.tar.gz Source1: README.SUSE Patch1: s390x-enablement-cpustats.patch +Patch2: aircrack-ng-1.7-pcre2-1-2385.patch +Patch3: aircrack-ng-1.7-pcre2-1-2391.patch +Patch4: aircrack-ng-1.7-pcre2-1-2397.patch BuildRequires: autoconf BuildRequires: ethtool BuildRequires: expect @@ -44,7 +47,7 @@ BuildRequires: zlib-devel BuildRequires: pkgconfig(cmocka) BuildRequires: pkgconfig(hwloc) -BuildRequires: pkgconfig(libpcre) >= 3.0.0 +BuildRequires: pkgconfig(libpcre2-8) %if 0%{?with sqlite} BuildRequires: sqlite3-devel %endif ++++++ aircrack-ng-1.7-pcre2-1-2385.patch ++++++ ++++ 887 lines (skipped) ++++++ aircrack-ng-1.7-pcre2-1-2391.patch ++++++ >From 8c6a4f171b7d97a294590fab9dc2069b149b9b36 Mon Sep 17 00:00:00 2001 From: Andras Gemes <andrasge...@outlook.com> Date: Mon, 23 Jan 2023 10:42:39 +0100 Subject: [PATCH 2/6] src/makefile: add PCRE2_CFLAGS to airodump and besside --- src/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.inc b/src/Makefile.inc index 181aeda670..fdbc98ed0e 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -128,7 +128,7 @@ aireplay_ng_CFLAGS = $(COMMON_CFLAGS) $(LIBNL_CFLAGS) aireplay_ng_LDADD = $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBACCRYPTO_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_LIBS) $(CRYPTO_LIBS) airodump_ng_SOURCES = $(SRC_ADU) $(SRC_DWRITE) -airodump_ng_CFLAGS = $(COMMON_CFLAGS) $(PCRE_CFLAGS) $(LIBNL_CFLAGS) +airodump_ng_CFLAGS = $(COMMON_CFLAGS) $(PCRE_CFLAGS) $(PCRE2_CFLAGS) $(LIBNL_CFLAGS) airodump_ng_CPPFLAGS = $(AM_CPPFLAGS) -I$(abs_srcdir)/src/airodump-ng airodump_ng_LDADD = $(COMMON_LDADD) $(PCRE_LIBS) $(PCRE2_LIBS) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBACCRYPTO_LIBS) $(LIBAIRCRACK_CE_WEP_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_LIBS) $(CRYPTO_LIBS) @@ -163,7 +163,7 @@ buddy_ng_CPPFLAGS = $(AM_CPPFLAGS) -I$(abs_srcdir)/src/easside-ng buddy_ng_LDADD = $(COMMON_LDADD) $(LIBAIRCRACK_LIBS) $(CRYPTO_LIBS) besside_ng_SOURCES = $(SRC_BS) -besside_ng_CFLAGS = $(COMMON_CFLAGS) $(PCRE_CFLAGS) $(LIBNL_CFLAGS) +besside_ng_CFLAGS = $(COMMON_CFLAGS) $(PCRE_CFLAGS) $(PCRE2_CFLAGS) $(LIBNL_CFLAGS) besside_ng_LDADD = $(COMMON_LDADD) $(PCRE_LIBS) $(PCRE2_LIBS) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBACCRYPTO_LIBS) $(LIBPTW_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_LIBS) $(CRYPTO_LIBS) besside_ng_crawler_SOURCES = $(SRC_BC) >From 0be8f0d7d8e4a09ea5687bcec6690876b4161a0e Mon Sep 17 00:00:00 2001 From: Andras Gemes <andrasge...@outlook.com> Date: Mon, 23 Jan 2023 10:46:26 +0100 Subject: [PATCH 3/6] lib/makefile: add PCRE2 to libaccrypto and libaircrack --- lib/Makefile.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Makefile.inc b/lib/Makefile.inc index 4e32ef6e5d..8ec30dd39f 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -150,8 +150,8 @@ endif endif libaccrypto_la_SOURCES = $(SRC_CRYPTO) -libaccrypto_la_CFLAGS = $(COMMON_CFLAGS) $(PCRE_CFLAGS) -libaccrypto_la_LIBADD = $(PCRE_LIBS) $(LIBAIRCRACK_OSDEP_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) +libaccrypto_la_CFLAGS = $(COMMON_CFLAGS) $(PCRE_CFLAGS) $(PCRE2_CFLAGS) +libaccrypto_la_LIBADD = $(PCRE_LIBS) $(PCRE2_LIBS) $(LIBAIRCRACK_OSDEP_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) libcowpatty_la_SOURCES = $(SRC_COW) libcowpatty_la_CFLAGS = $(COMMON_CFLAGS) $(LIBCOW_CFLAGS) @@ -206,12 +206,12 @@ SRC_LIBAC += %D%/libac/support/strlcpy.c endif libaircrack_la_SOURCES = $(SRC_LIBAC) $(TRAMPOLINE) $(CPUSET) -libaircrack_la_CFLAGS = $(COMMON_CFLAGS) $(PCRE_CFLAGS) \ +libaircrack_la_CFLAGS = $(COMMON_CFLAGS) $(PCRE_CFLAGS) $(PCRE2_CFLAGS) \ "-DLIBAIRCRACK_CE_WPA_PATH=\"$(LIBAIRCRACK_CE_WPA_PATH)\"" \ "-DABS_TOP_SRCDIR=\"$(abs_top_srcdir)\"" \ "-DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\"" \ "-DLIBDIR=\"$(libdir)\"" -libaircrack_la_LIBADD = $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(PCRE_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) +libaircrack_la_LIBADD = $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(PCRE_LIBS) $(PCRE2_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) if CYGWIN libaircrack_la_LIBADD += -lshlwapi ++++++ aircrack-ng-1.7-pcre2-1-2397.patch ++++++ >From b381ef3f6b6cc83a4aa016f4c0aebb58fcffcf3f Mon Sep 17 00:00:00 2001 From: Andras Gemes <andrasge...@outlook.com> Date: Mon, 23 Jan 2023 16:58:38 +0100 Subject: [PATCH] autotools: indicate if PCRE or PCRE2 is being used --- build/m4/aircrack_ng_pcre.m4 | 28 ++++++++++++++-- build/m4/aircrack_ng_pcre2.m4 | 61 ----------------------------------- configure.ac | 3 +- 3 files changed, 26 insertions(+), 66 deletions(-) delete mode 100644 build/m4/aircrack_ng_pcre2.m4 diff --git a/build/m4/aircrack_ng_pcre.m4 b/build/m4/aircrack_ng_pcre.m4 index 72f09b98ff..af3e24b4bc 100644 --- a/build/m4/aircrack_ng_pcre.m4 +++ b/build/m4/aircrack_ng_pcre.m4 @@ -55,7 +55,29 @@ else PKG_CHECK_MODULES(PCRE, libpcre, HAVE_PCRE=yes, HAVE_PCRE=no) fi -AS_IF([test "x$HAVE_PCRE" = "xyes"], [ +AC_ARG_ENABLE(static-pcre2, + AS_HELP_STRING([--enable-static-pcre2], + [Enable statically linked PCRE2 libpcre2-8.]), + [static_pcre2=$enableval], [static_pcre2=no]) + +if test "x$static_pcre2" != "xno"; then + AC_REQUIRE([AX_EXT_HAVE_STATIC_LIB_DETECT]) + AX_EXT_HAVE_STATIC_LIB(PCRE2, ${DEFAULT_STATIC_LIB_SEARCH_PATHS}, pcre2 libpcre2-8, pcre2_version) + if test "x$PCRE2_FOUND" = xyes; then + HAVE_PCRE2=yes + else + HAVE_PCRE2=no + fi +else + PKG_CHECK_MODULES(PCRE2, libpcre2-8, HAVE_PCRE2=yes, HAVE_PCRE2=no) +fi + +if test "x$HAVE_PCRE" = "xyes" && test "x$HAVE_PCRE2" = "xyes"; then + AC_DEFINE([HAVE_PCRE2], [1], [Define this if you have libpcre2-8 on your system]) + PCRE2_NOTE="(Pcre and Pcre2 found, using Pcre2)" +elif test "x$HAVE_PCRE" = "xyes"; then AC_DEFINE([HAVE_PCRE], [1], [Define this if you have libpcre on your system]) -]) -]) +elif test "x$HAVE_PCRE2" = "xyes"; then + AC_DEFINE([HAVE_PCRE2], [1], [Define this if you have libpcre2-8 on your system]) +fi +]) \ No newline at end of file diff --git a/build/m4/aircrack_ng_pcre2.m4 b/build/m4/aircrack_ng_pcre2.m4 deleted file mode 100644 index f61c0f656d..0000000000 --- a/build/m4/aircrack_ng_pcre2.m4 +++ /dev/null @@ -1,61 +0,0 @@ -dnl Aircrack-ng -dnl -dnl Copyright (C) 2023 Andras Gemes <andrasge...@outlook.com> -dnl -dnl Autotool support was written by: Joseph Benden <j...@benden.us> -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -dnl -dnl In addition, as a special exception, the copyright holders give -dnl permission to link the code of portions of this program with the -dnl OpenSSL library under certain conditions as described in each -dnl individual source file, and distribute linked combinations -dnl including the two. -dnl -dnl You must obey the GNU General Public License in all respects -dnl for all of the code used other than OpenSSL. -dnl -dnl If you modify file(s) with this exception, you may extend this -dnl exception to your dnl version of the file(s), but you are not obligated -dnl to do so. -dnl -dnl If you dnl do not wish to do so, delete this exception statement from your -dnl version. -dnl -dnl If you delete this exception statement from all source files in the -dnl program, then also delete it here. - -AC_DEFUN([AIRCRACK_NG_PCRE2], [ -AC_ARG_ENABLE(static-pcre2, - AS_HELP_STRING([--enable-static-pcre2], - [Enable statically linked PCRE2 libpcre2-8.]), - [static_pcre2=$enableval], [static_pcre2=no]) - -if test "x$static_pcre2" != "xno"; then - AC_REQUIRE([AX_EXT_HAVE_STATIC_LIB_DETECT]) - AX_EXT_HAVE_STATIC_LIB(PCRE2, ${DEFAULT_STATIC_LIB_SEARCH_PATHS}, pcre2 libpcre2-8, pcre2_version) - if test "x$PCRE2_FOUND" = xyes; then - HAVE_PCRE2=yes - else - HAVE_PCRE2=no - fi -else - PKG_CHECK_MODULES(PCRE2, libpcre2-8, HAVE_PCRE2=yes, HAVE_PCRE2=no) -fi - -AS_IF([test "x$HAVE_PCRE2" = "xyes"], [ - AC_DEFINE([HAVE_PCRE2], [1], [Define this if you have libpcre2-8 on your system]) -]) -]) \ No newline at end of file diff --git a/configure.ac b/configure.ac index 6d8e0e5677..9d1d148cfd 100644 --- a/configure.ac +++ b/configure.ac @@ -143,7 +143,6 @@ AIRCRACK_NG_EXT_SCRIPTS AIRCRACK_NG_HWLOC AIRCRACK_NG_PCAP AIRCRACK_NG_PCRE -AIRCRACK_NG_PCRE2 AIRCRACK_NG_RFKILL AIRCRACK_NG_SQLITE AIRCRACK_NG_ZLIB @@ -320,7 +319,7 @@ ${PACKAGE} ${VERSION} Jemalloc: ${JEMALLOC} Pcap: ${PCAP_FOUND} Pcre: ${HAVE_PCRE} - Pcre2: ${HAVE_PCRE2} + Pcre2: ${HAVE_PCRE2} ${PCRE2_NOTE} Sqlite: ${HAVE_SQLITE3} Tcmalloc: ${TCMALLOC} Zlib: ${HAVE_ZLIB}
