From 1464ea8f80dd0cb7e7c81cd2556b398a20b4dc64 Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Tue, 26 Feb 2019 08:38:39 -0700 Subject: [PATCH 1/5] autotools: Remove old TODO note. --- configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac index ee8067ef3f..24a1fbdf69 100644 --- a/configure.ac +++ b/configure.ac @@ -37,8 +37,6 @@ # If you delete this exception statement from all source files in the # program, then also delete it here. -# FIXME: MULTIBIN implementation in here and src/Makefile.am - AC_PREREQ(2.52) AC_INIT([aircrack-ng], [m4_translit(m4_esyscmd([$(pwd)/evalrev || cat $(pwd)/VERSION]),m4_newline)], From 10a31bbdbbb35f3ec19b6abf961bd4b382dc1901 Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Tue, 26 Feb 2019 10:42:05 -0700 Subject: [PATCH 2/5] Refactor the versioning info to a single location. Coalesce all versioning information to a single location controlled by Autotools, the `configure.ac` file. --- .gitignore | 64 +++++++++++++------ VERSION | 1 - VERSION.in | 1 + build/m4/aircrack_ng_revision.m4 | 45 ------------- configure.ac | 56 +++++++++++++++- evalrev | 9 ++- manpages/Makefile.am | 30 ++++----- manpages/{airbase-ng.8 => airbase-ng.8.in} | 2 +- manpages/{aircrack-ng.1 => aircrack-ng.1.in} | 2 +- manpages/{airdecap-ng.1 => airdecap-ng.1.in} | 2 +- .../{airdecloak-ng.1 => airdecloak-ng.1.in} | 2 +- manpages/{aireplay-ng.8 => aireplay-ng.8.in} | 2 +- manpages/{airmon-ng.8 => airmon-ng.8.in} | 2 +- ...i-update.8 => airodump-ng-oui-update.8.in} | 2 +- manpages/{airodump-ng.8 => airodump-ng.8.in} | 2 +- manpages/{airolib-ng.1 => airolib-ng.1.in} | 2 +- manpages/{airserv-ng.8 => airserv-ng.8.in} | 2 +- manpages/{airtun-ng.8 => airtun-ng.8.in} | 2 +- ...iloquist-ng.8 => airventriloquist-ng.8.in} | 2 +- ...e-ng-crawler.1 => besside-ng-crawler.1.in} | 2 +- manpages/{besside-ng.8 => besside-ng.8.in} | 2 +- manpages/{buddy-ng.1 => buddy-ng.1.in} | 2 +- manpages/{easside-ng.8 => easside-ng.8.in} | 2 +- manpages/{ivstools.1 => ivstools.1.in} | 2 +- manpages/{kstats.1 => kstats.1.in} | 2 +- manpages/{makeivs-ng.1 => makeivs-ng.1.in} | 2 +- .../{packetforge-ng.1 => packetforge-ng.1.in} | 2 +- manpages/{tkiptun-ng.8 => tkiptun-ng.8.in} | 2 +- manpages/{wesside-ng.8 => wesside-ng.8.in} | 2 +- manpages/{wpaclean.1 => wpaclean.1.in} | 2 +- src/aircrack-crypto/Makefile.inc | 16 ++--- src/aircrack-osdep/Makefile.inc | 2 +- src/aircrack-util/crypto_engine_loader.c | 2 +- src/{version.h => version.h.in} | 12 ++-- 34 files changed, 163 insertions(+), 121 deletions(-) delete mode 100644 VERSION create mode 100644 VERSION.in delete mode 100644 build/m4/aircrack_ng_revision.m4 rename manpages/{airbase-ng.8 => airbase-ng.8.in} (99%) rename manpages/{aircrack-ng.1 => aircrack-ng.1.in} (99%) rename manpages/{airdecap-ng.1 => airdecap-ng.1.in} (96%) rename manpages/{airdecloak-ng.1 => airdecloak-ng.1.in} (98%) rename manpages/{aireplay-ng.8 => aireplay-ng.8.in} (99%) rename manpages/{airmon-ng.8 => airmon-ng.8.in} (97%) rename manpages/{airodump-ng-oui-update.8 => airodump-ng-oui-update.8.in} (93%) rename manpages/{airodump-ng.8 => airodump-ng.8.in} (99%) rename manpages/{airolib-ng.1 => airolib-ng.1.in} (97%) rename manpages/{airserv-ng.8 => airserv-ng.8.in} (96%) rename manpages/{airtun-ng.8 => airtun-ng.8.in} (97%) rename manpages/{airventriloquist-ng.8 => airventriloquist-ng.8.in} (95%) rename manpages/{besside-ng-crawler.1 => besside-ng-crawler.1.in} (94%) rename manpages/{besside-ng.8 => besside-ng.8.in} (96%) rename manpages/{buddy-ng.1 => buddy-ng.1.in} (95%) rename manpages/{easside-ng.8 => easside-ng.8.in} (97%) rename manpages/{ivstools.1 => ivstools.1.in} (96%) rename manpages/{kstats.1 => kstats.1.in} (95%) rename manpages/{makeivs-ng.1 => makeivs-ng.1.in} (97%) rename manpages/{packetforge-ng.1 => packetforge-ng.1.in} (97%) rename manpages/{tkiptun-ng.8 => tkiptun-ng.8.in} (97%) rename manpages/{wesside-ng.8 => wesside-ng.8.in} (97%) rename manpages/{wpaclean.1 => wpaclean.1.in} (94%) rename src/{version.h => version.h.in} (92%) diff --git a/.gitignore b/.gitignore index bcff9cfe91..377aa4819f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,21 @@ -src/*-ng -src/besside-ng-crawler -src/ivstools -src/kstats -src/wpaclean +/*-ng +/besside-ng-crawler +/ivstools +/kstats +/wpaclean src/osdep/.os.Linux src/osdep/libosdep.a src/tags tags +*.a +*.so +*.dll *.o *.exe +*.log +*.trs +*.zip +*.tar.* common.cfg Makefile.in aclocal.m4 @@ -23,6 +30,7 @@ install-sh libtool ltmain.sh missing +/stamp-* reautogen.sh src/Makefile.in *.lo @@ -41,14 +49,14 @@ src/Makefile.in /test/**/*.trs /scripts/airdrop-ng/build /scripts/airgraph-ng/build -test/cryptounittest/test-calc-4pmk -test/cryptounittest/test-calc-mic -test/cryptounittest/test-calc-pmk -test/cryptounittest/test-calc-ptk -test/cryptounittest/test-decrypt-ccmp -test/cryptounittest/test-encrypt-ccmp -test/cryptounittest/test-encrypt-wep -test/test-hex_string_to_array +/test-calc-4pmk +/test-calc-mic +/test-calc-pmk +/test-calc-ptk +/test-decrypt-ccmp +/test-encrypt-ccmp +/test-encrypt-wep +/test-hex_string_to_array /build/m4/stubs/* !/build/m4/stubs/.gitkeep /test/test-env.sh @@ -65,19 +73,35 @@ Makefile !/contrib/peek/Makefile !/scripts/airgraph-ng/lib/Makefile /scripts/airmon-ng -/src/aircrack-ng--* /benchmark.csv /.cccc /cccc.opt /.scannerwork +/.bash_history +/.cproject +/.lesshst +/.project +/.rpmdb +/.settings benchmark*.csv /bw-output compile_commands.json coverage*.info /test/cryptounittest/default.profraw -/test/unit/test-calc-one-pmk -/test/unit/test-string-has-suffix -/test/unit/test-wpapsk -/test/unit/test-wpapsk-cmac -/test/unit/test-circular-buffer -/test/unit/test-circular-queue +/test-calc-one-pmk +/test-string-has-suffix +/test-wpapsk +/test-wpapsk-cmac +/test-circular-buffer +/test-circular-queue +/GPATH +/GRTAGS +/GSYMS +/GTAGS +/VERSION +/aminclude_static.am +/config.h +/config.h.in +/src/version.h +/manpages/*.1 +/manpages/*.8 diff --git a/VERSION b/VERSION deleted file mode 100644 index 4cda8f19ed..0000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.5.2 diff --git a/VERSION.in b/VERSION.in new file mode 100644 index 0000000000..304412970e --- /dev/null +++ b/VERSION.in @@ -0,0 +1 @@ +@_MAJ@.@_MIN@.@_SUB_MIN@ diff --git a/build/m4/aircrack_ng_revision.m4 b/build/m4/aircrack_ng_revision.m4 deleted file mode 100644 index cba0209bd0..0000000000 --- a/build/m4/aircrack_ng_revision.m4 +++ /dev/null @@ -1,45 +0,0 @@ -dnl Aircrack-ng -dnl -dnl Copyright (C) 2017 Joseph Benden -dnl -dnl Autotool support was written by: Joseph Benden -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_REVISION], [ -AC_ARG_VAR([_REVISION], [specifies the Aircrack-ng revision number]) -AC_DEFINE([_REVISION], - m4_translit(m4_esyscmd([$(pwd)/evalrev . quoted || echo]),m4_newline), - [specifies the Aircrack-ng revision number, [default auto-detects]]) -]) diff --git a/configure.ac b/configure.ac index 24a1fbdf69..2dc27ccb56 100644 --- a/configure.ac +++ b/configure.ac @@ -37,9 +37,19 @@ # If you delete this exception statement from all source files in the # program, then also delete it here. +m4_define([version_date], "December 2018") +m4_define([version_major], 1) +m4_define([version_minor], 5) +m4_define([version_micro], 2) +m4_define([version_beta], 0) +m4_define([version_rc], 0) +m4_define([version_scm],[m4_translit(m4_esyscmd([$(pwd)/evalrev . scm || echo]),m4_newline)]) +m4_define([version_triplet],version_major.version_minor.version_micro) +m4_append([version_triplet],version_scm) + AC_PREREQ(2.52) AC_INIT([aircrack-ng], - [m4_translit(m4_esyscmd([$(pwd)/evalrev || cat $(pwd)/VERSION]),m4_newline)], + [version_triplet], [https://forum.aircrack-ng.org]) # @@ -79,6 +89,24 @@ AM_PROG_AS PKG_PROG_PKG_CONFIG AM_PROG_CC_C_O +# +# Set versioning detail +# +AC_SUBST([_MAJ], [version_major]) +AC_SUBST([_MIN], [version_minor]) +AC_SUBST([_SUB_MIN], [version_micro]) +AC_SUBST([_BETA], [version_beta]) +AC_SUBST([_RC], [version_rc]) +AC_SUBST([_SCM], [version_scm]) +AC_SUBST([LT_VER], [version_major.version_minor.version_micro]) +AC_SUBST([MAN_RELEASE_DATE], [version_date]) +AC_SUBST([MAN_RELEASE_VERSION], ["Version version_triplet"]) +AC_DEFINE([_REVISION], ["version_triplet"], [The version information of the project]) +AC_DEFINE([LT_CYGWIN_VER], ["-version_major-version_minor-version_micro.dll"], [The Cygwin DLL version string suffix]) + +# +# Initialize libtool +# LT_INIT([win32-dll disable-static shared]) # @@ -194,9 +222,35 @@ LIBS="$opt_libs $LIBS" # Generate all build files # AC_OUTPUT([ +VERSION +src/version.h + Makefile +manpages/airbase-ng.8 +manpages/aircrack-ng.1 +manpages/airdecap-ng.1 +manpages/airdecloak-ng.1 +manpages/aireplay-ng.8 +manpages/airmon-ng.8 +manpages/airodump-ng.8 +manpages/airodump-ng-oui-update.8 +manpages/airolib-ng.1 +manpages/airserv-ng.8 +manpages/airtun-ng.8 +manpages/airventriloquist-ng.8 +manpages/besside-ng.8 +manpages/besside-ng-crawler.1 +manpages/buddy-ng.1 +manpages/easside-ng.8 +manpages/ivstools.1 +manpages/kstats.1 manpages/Makefile +manpages/makeivs-ng.1 +manpages/packetforge-ng.1 +manpages/tkiptun-ng.8 +manpages/wesside-ng.8 +manpages/wpaclean.1 scripts/Makefile scripts/airdrop-ng/Makefile diff --git a/evalrev b/evalrev index 43df085786..6dbb565c4e 100755 --- a/evalrev +++ b/evalrev @@ -5,6 +5,8 @@ set -euf DIR=${1:-} CMD=${2:-} +SCM="" + if [ x$DIR = "x" ] then DIR="." @@ -24,6 +26,7 @@ if test -d "${DIR}/.git"; then if test -z "$EXACTLY"; then REVISION="${REVISION}_rev-$(git rev-parse --verify --short HEAD)" + SCM="_rev-$(git rev-parse --verify --short HEAD)" fi elif test -d "${DIR}/.svn"; then REVISION="_r$(svnversion $DIR 2> /dev/null | sed 's/[^0-9]*//g')" @@ -35,17 +38,21 @@ elif test -d "${DIR}/.svn"; then if test x$REVISION = "x"; then if test -f "${DIR}/.svn/entries"; then REVISION="_r$(cat ${DIR}/.svn/entries | grep -i revision | head -n 1 | sed 's/[^0-9]*//g')" + SCM="_r$(cat ${DIR}/.svn/entries | grep -i revision | head -n 1 | sed 's/[^0-9]*//g')" fi fi if test x$REVISION = "x"; then REVISION="_r1" + SCM="_r1" fi else REVISION="$(cat ${DIR}/VERSION)" fi -if test "x$CMD" = "xquoted"; then +if test "x$CMD" = "xscm"; then + echo $SCM +elif test "x$CMD" = "xquoted"; then echo \"$REVISION\" else echo $REVISION diff --git a/manpages/Makefile.am b/manpages/Makefile.am index 65d4c42fa6..92e3475f66 100644 --- a/manpages/Makefile.am +++ b/manpages/Makefile.am @@ -86,18 +86,18 @@ dist_man8_MANS += airventriloquist-ng.8 \ endif endif -EXTRA_DIST = airmon-ng.8 \ - airolib-ng.1 \ - besside-ng-crawler.1 \ - buddy-ng.1 \ - airventriloquist-ng.8 \ - besside-ng.8 \ - easside-ng.8 \ - tkiptun-ng.8 \ - wesside-ng.8 \ - wpaclean.1 \ - airbase-ng.8 \ - aireplay-ng.8 \ - airodump-ng.8 \ - airserv-ng.8 \ - airtun-ng.8 +EXTRA_DIST = airmon-ng.8.in \ + airolib-ng.1.in \ + besside-ng-crawler.1.in \ + buddy-ng.1.in \ + airventriloquist-ng.8.in \ + besside-ng.8.in \ + easside-ng.8.in \ + tkiptun-ng.8.in \ + wesside-ng.8.in \ + wpaclean.1.in \ + airbase-ng.8.in \ + aireplay-ng.8.in \ + airodump-ng.8.in \ + airserv-ng.8.in \ + airtun-ng.8.in diff --git a/manpages/airbase-ng.8 b/manpages/airbase-ng.8.in similarity index 99% rename from manpages/airbase-ng.8 rename to manpages/airbase-ng.8.in index f4b2808f9c..27246f698c 100644 --- a/manpages/airbase-ng.8 +++ b/manpages/airbase-ng.8.in @@ -1,4 +1,4 @@ -.TH AIRBASE-NG 8 "December 2018" "Version 1.5.2" +.TH AIRBASE-NG 8 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME airbase-ng - multi-purpose tool aimed at attacking clients as opposed to the Access Point (AP) itself diff --git a/manpages/aircrack-ng.1 b/manpages/aircrack-ng.1.in similarity index 99% rename from manpages/aircrack-ng.1 rename to manpages/aircrack-ng.1.in index 3201aa616b..55b211cd44 100644 --- a/manpages/aircrack-ng.1 +++ b/manpages/aircrack-ng.1.in @@ -1,4 +1,4 @@ -.TH AIRCRACK-NG 1 "December 2018" "Version 1.5.2" +.TH AIRCRACK-NG 1 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME aircrack-ng - a 802.11 WEP / WPA-PSK key cracker diff --git a/manpages/airdecap-ng.1 b/manpages/airdecap-ng.1.in similarity index 96% rename from manpages/airdecap-ng.1 rename to manpages/airdecap-ng.1.in index 4d5e91c736..e56a382785 100644 --- a/manpages/airdecap-ng.1 +++ b/manpages/airdecap-ng.1.in @@ -1,4 +1,4 @@ -.TH AIRDECAP-NG 1 "December 2018" "Version 1.5.2" +.TH AIRDECAP-NG 1 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME airdecap-ng - decrypt a WEP/WPA crypted pcap file diff --git a/manpages/airdecloak-ng.1 b/manpages/airdecloak-ng.1.in similarity index 98% rename from manpages/airdecloak-ng.1 rename to manpages/airdecloak-ng.1.in index 599056f084..63ab53b14b 100644 --- a/manpages/airdecloak-ng.1 +++ b/manpages/airdecloak-ng.1.in @@ -1,4 +1,4 @@ -.TH AIRDECLOAK-NG 1 "December 2018" "Version 1.5.2" +.TH AIRDECLOAK-NG 1 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME airuncloak-ng - Removes wep cloaked framed from a pcap file. diff --git a/manpages/aireplay-ng.8 b/manpages/aireplay-ng.8.in similarity index 99% rename from manpages/aireplay-ng.8 rename to manpages/aireplay-ng.8.in index 211d5ae8f5..4524faef86 100644 --- a/manpages/aireplay-ng.8 +++ b/manpages/aireplay-ng.8.in @@ -1,4 +1,4 @@ -.TH AIREPLAY-NG 8 "December 2018" "Version 1.5.2" +.TH AIREPLAY-NG 8 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME aireplay-ng - inject packets into a wireless network to generate traffic diff --git a/manpages/airmon-ng.8 b/manpages/airmon-ng.8.in similarity index 97% rename from manpages/airmon-ng.8 rename to manpages/airmon-ng.8.in index c5340a0267..546fb02a92 100644 --- a/manpages/airmon-ng.8 +++ b/manpages/airmon-ng.8.in @@ -1,4 +1,4 @@ -.TH AIRMON-NG 8 "December 2018" "Version 1.5.2" +.TH AIRMON-NG 8 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME airmon-ng - POSIX sh script designed to turn wireless cards into monitor mode. diff --git a/manpages/airodump-ng-oui-update.8 b/manpages/airodump-ng-oui-update.8.in similarity index 93% rename from manpages/airodump-ng-oui-update.8 rename to manpages/airodump-ng-oui-update.8.in index 5b120bef1a..926a86584a 100644 --- a/manpages/airodump-ng-oui-update.8 +++ b/manpages/airodump-ng-oui-update.8.in @@ -1,4 +1,4 @@ -.TH AIRODUMP-NG-OUI-UPDATE 8 "December 2018" "Version 1.5.2" +.TH AIRODUMP-NG-OUI-UPDATE 8 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME airodump-ng-oui-updater - IEEE oui list updater for airodump-ng diff --git a/manpages/airodump-ng.8 b/manpages/airodump-ng.8.in similarity index 99% rename from manpages/airodump-ng.8 rename to manpages/airodump-ng.8.in index 568c6fc58e..f67faa95fb 100644 --- a/manpages/airodump-ng.8 +++ b/manpages/airodump-ng.8.in @@ -1,4 +1,4 @@ -.TH AIRODUMP-NG 8 "December 2018" "Version 1.5.2" +.TH AIRODUMP-NG 8 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME airodump-ng - a wireless packet capture tool for aircrack-ng diff --git a/manpages/airolib-ng.1 b/manpages/airolib-ng.1.in similarity index 97% rename from manpages/airolib-ng.1 rename to manpages/airolib-ng.1.in index 04676850cd..6cdb1a9db5 100644 --- a/manpages/airolib-ng.1 +++ b/manpages/airolib-ng.1.in @@ -1,4 +1,4 @@ -.TH AIROLIB-NG 1 "December 2018" "Version 1.5.2" +.TH AIROLIB-NG 1 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME airolib-ng - manage and create a WPA/WPA2 pre-computed hashes tables diff --git a/manpages/airserv-ng.8 b/manpages/airserv-ng.8.in similarity index 96% rename from manpages/airserv-ng.8 rename to manpages/airserv-ng.8.in index 78e22f6558..a8fb0ea38d 100644 --- a/manpages/airserv-ng.8 +++ b/manpages/airserv-ng.8.in @@ -1,4 +1,4 @@ -.TH AIRSERV-NG 8 "December 2018" "Version 1.5.2" +.TH AIRSERV-NG 8 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME airserv-ng - a wireless card server diff --git a/manpages/airtun-ng.8 b/manpages/airtun-ng.8.in similarity index 97% rename from manpages/airtun-ng.8 rename to manpages/airtun-ng.8.in index a1eab2f6fb..8301470275 100644 --- a/manpages/airtun-ng.8 +++ b/manpages/airtun-ng.8.in @@ -1,4 +1,4 @@ -.TH AIRTUN-NG 8 "December 2018" "Version 1.5.2" +.TH AIRTUN-NG 8 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME airtun-ng - a virtual tunnel interface creator for aircrack-ng diff --git a/manpages/airventriloquist-ng.8 b/manpages/airventriloquist-ng.8.in similarity index 95% rename from manpages/airventriloquist-ng.8 rename to manpages/airventriloquist-ng.8.in index 6886d23a18..95266ba3cc 100644 --- a/manpages/airventriloquist-ng.8 +++ b/manpages/airventriloquist-ng.8.in @@ -1,4 +1,4 @@ -.TH AIRVENTRILOQUIST-NG 8 "December 2018" "Version 1.5.2" +.TH AIRVENTRILOQUIST-NG 8 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME airventriloquist-ng - encrypted WiFi packet injection diff --git a/manpages/besside-ng-crawler.1 b/manpages/besside-ng-crawler.1.in similarity index 94% rename from manpages/besside-ng-crawler.1 rename to manpages/besside-ng-crawler.1.in index 3ade7dcd0f..f9fe9fbb02 100644 --- a/manpages/besside-ng-crawler.1 +++ b/manpages/besside-ng-crawler.1.in @@ -1,4 +1,4 @@ -.TH BESSIDE-NG-CRAWLER 1 "December 2018" "Version 1.5.2" +.TH BESSIDE-NG-CRAWLER 1 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME diff --git a/manpages/besside-ng.8 b/manpages/besside-ng.8.in similarity index 96% rename from manpages/besside-ng.8 rename to manpages/besside-ng.8.in index 7ca469db94..4ca5f32dec 100644 --- a/manpages/besside-ng.8 +++ b/manpages/besside-ng.8.in @@ -1,4 +1,4 @@ -.TH BESSIDE-NG 8 "December 2018" "Version 1.5.2" +.TH BESSIDE-NG 8 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME besside-ng - crack a WEP or WPA key without user intervention and collaborate with WPA cracking statistics diff --git a/manpages/buddy-ng.1 b/manpages/buddy-ng.1.in similarity index 95% rename from manpages/buddy-ng.1 rename to manpages/buddy-ng.1.in index 9d17756712..d71f58e6c5 100644 --- a/manpages/buddy-ng.1 +++ b/manpages/buddy-ng.1.in @@ -1,4 +1,4 @@ -.TH BUDDY-NG 1 "December 2018" "Version 1.5.2" +.TH BUDDY-NG 1 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME buddy-ng - a tool to work with easside-ng diff --git a/manpages/easside-ng.8 b/manpages/easside-ng.8.in similarity index 97% rename from manpages/easside-ng.8 rename to manpages/easside-ng.8.in index dbb1b83983..5d819038ab 100644 --- a/manpages/easside-ng.8 +++ b/manpages/easside-ng.8.in @@ -1,4 +1,4 @@ -.TH EASSIDE-NG 8 "December 2018" "Version 1.5.2" +.TH EASSIDE-NG 8 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME easside-ng - an auto-magic tool which allows you to communicate via an WEP-encrypted AP without knowing the key diff --git a/manpages/ivstools.1 b/manpages/ivstools.1.in similarity index 96% rename from manpages/ivstools.1 rename to manpages/ivstools.1.in index 11397c5a3d..996ec11162 100644 --- a/manpages/ivstools.1 +++ b/manpages/ivstools.1.in @@ -1,4 +1,4 @@ -.TH IVSTOOLS 1 "December 2018" "Version 1.5.2" +.TH IVSTOOLS 1 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME ivstools - extract IVs from a pcap file or merges several .ivs files into one diff --git a/manpages/kstats.1 b/manpages/kstats.1.in similarity index 95% rename from manpages/kstats.1 rename to manpages/kstats.1.in index bcc4e1d342..f7ea6613f0 100644 --- a/manpages/kstats.1 +++ b/manpages/kstats.1.in @@ -1,4 +1,4 @@ -.TH KSTATS 1 "December 2018" "Version 1.5.2" +.TH KSTATS 1 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME kstats - show statistical FMS algorithm votes for an ivs dump and a specified WEP key diff --git a/manpages/makeivs-ng.1 b/manpages/makeivs-ng.1.in similarity index 97% rename from manpages/makeivs-ng.1 rename to manpages/makeivs-ng.1.in index 2226533301..f4c63c6eb9 100644 --- a/manpages/makeivs-ng.1 +++ b/manpages/makeivs-ng.1.in @@ -1,4 +1,4 @@ -.TH MAKEIVS-NG 1 "December 2018" "Version 1.5.2" +.TH MAKEIVS-NG 1 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME makeivs - generate a dummy IVS dump file with a specific WEP key diff --git a/manpages/packetforge-ng.1 b/manpages/packetforge-ng.1.in similarity index 97% rename from manpages/packetforge-ng.1 rename to manpages/packetforge-ng.1.in index 679fa5b464..78d259a1eb 100644 --- a/manpages/packetforge-ng.1 +++ b/manpages/packetforge-ng.1.in @@ -1,4 +1,4 @@ -.TH PACKETFORGE-NG 1 "December 2018" "Version 1.5.2" +.TH PACKETFORGE-NG 1 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME packetforge-ng - forge packets: ARP, UDP, ICMP or custom packets. diff --git a/manpages/tkiptun-ng.8 b/manpages/tkiptun-ng.8.in similarity index 97% rename from manpages/tkiptun-ng.8 rename to manpages/tkiptun-ng.8.in index 73be5d9407..81bf0291a3 100644 --- a/manpages/tkiptun-ng.8 +++ b/manpages/tkiptun-ng.8.in @@ -1,4 +1,4 @@ -.TH TKIPTUN-NG 8 "December 2018" "Version 1.5.2" +.TH TKIPTUN-NG 8 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME tkiptun-ng - inject a few frames into a WPA TKIP network with QoS diff --git a/manpages/wesside-ng.8 b/manpages/wesside-ng.8.in similarity index 97% rename from manpages/wesside-ng.8 rename to manpages/wesside-ng.8.in index 8397c28193..8f02d408df 100644 --- a/manpages/wesside-ng.8 +++ b/manpages/wesside-ng.8.in @@ -1,4 +1,4 @@ -.TH WESSIDE-NG 8 "December 2018" "Version 1.5.2" +.TH WESSIDE-NG 8 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME wesside-ng - crack a WEP key of an open network without user intervention diff --git a/manpages/wpaclean.1 b/manpages/wpaclean.1.in similarity index 94% rename from manpages/wpaclean.1 rename to manpages/wpaclean.1.in index 0297527464..3c46db8f00 100644 --- a/manpages/wpaclean.1 +++ b/manpages/wpaclean.1.in @@ -1,4 +1,4 @@ -.TH WPACLEAN 1 "December 2018" "Version 1.5.2" +.TH WPACLEAN 1 "@MAN_RELEASE_DATE@" "@MAN_RELEASE_VERSION@" .SH NAME wpaclean - clean wpa capture files diff --git a/src/aircrack-crypto/Makefile.inc b/src/aircrack-crypto/Makefile.inc index a5f9843115..e89d5557ef 100644 --- a/src/aircrack-crypto/Makefile.inc +++ b/src/aircrack-crypto/Makefile.inc @@ -48,28 +48,28 @@ LIBAIRCRACK_CRYPTO_SRCS = %D%/memory.c %D%/sha1-git.c $(COMMON_ARCH_FILES) %D%/s # libaircrack_crypto_x86_avx512_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS) libaircrack_crypto_x86_avx512_la_CFLAGS = $(x86_avx512_cflags) -DSIMD_CORE -DJOHN_AVX512F $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS) -libaircrack_crypto_x86_avx512_la_LDFLAGS = -release 1.3.0 -no-undefined +libaircrack_crypto_x86_avx512_la_LDFLAGS = -release $(LT_VER) -no-undefined if !STATIC_CRYPTO libaircrack_crypto_x86_avx512_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS) endif libaircrack_crypto_x86_avx2_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS) libaircrack_crypto_x86_avx2_la_CFLAGS = $(x86_avx2_cflags) -DSIMD_CORE -DJOHN_AVX2 $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS) -libaircrack_crypto_x86_avx2_la_LDFLAGS = -release 1.3.0 -no-undefined +libaircrack_crypto_x86_avx2_la_LDFLAGS = -release $(LT_VER) -no-undefined if !STATIC_CRYPTO libaircrack_crypto_x86_avx2_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS) endif libaircrack_crypto_x86_avx_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS) libaircrack_crypto_x86_avx_la_CFLAGS = $(x86_avx_cflags) -DSIMD_CORE -DJOHN_AVX $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS) -libaircrack_crypto_x86_avx_la_LDFLAGS = -release 1.3.0 -no-undefined +libaircrack_crypto_x86_avx_la_LDFLAGS = -release $(LT_VER) -no-undefined if !STATIC_CRYPTO libaircrack_crypto_x86_avx_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS) endif libaircrack_crypto_x86_sse2_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS) libaircrack_crypto_x86_sse2_la_CFLAGS = $(x86_sse2_cflags) -DSIMD_CORE -DJOHN_SSE2 $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS) -libaircrack_crypto_x86_sse2_la_LDFLAGS = -release 1.3.0 -no-undefined +libaircrack_crypto_x86_sse2_la_LDFLAGS = -release $(LT_VER) -no-undefined if !STATIC_CRYPTO libaircrack_crypto_x86_sse2_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS) endif @@ -79,7 +79,7 @@ endif ## libaircrack_crypto_arm_neon_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS) libaircrack_crypto_arm_neon_la_CFLAGS = $(arm_neon_cflags) -DSIMD_CORE -DHAS_NEON $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS) -libaircrack_crypto_arm_neon_la_LDFLAGS = -release 1.3.0 -no-undefined +libaircrack_crypto_arm_neon_la_LDFLAGS = -release $(LT_VER) -no-undefined if !STATIC_CRYPTO libaircrack_crypto_arm_neon_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS) endif @@ -89,14 +89,14 @@ endif ## libaircrack_crypto_ppc_altivec_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS) libaircrack_crypto_ppc_altivec_la_CFLAGS = $(ppc_altivec_cflags) -DSIMD_CORE -DHAS_ALTIVEC=1 -DJOHN_ALTIVEC $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS) -libaircrack_crypto_ppc_altivec_la_LDFLAGS = -release 1.3.0 -no-undefined +libaircrack_crypto_ppc_altivec_la_LDFLAGS = -release $(LT_VER) -no-undefined if !STATIC_CRYPTO libaircrack_crypto_ppc_altivec_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS) endif libaircrack_crypto_ppc_power8_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS) libaircrack_crypto_ppc_power8_la_CFLAGS = $(ppc_altivec_cflags) -DSIMD_CORE -DHAS_ALTIVEC=1 -DJOHN_ALTIVEC -DJOHN_POWER8 $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS) -libaircrack_crypto_ppc_power8_la_LDFLAGS = -release 1.3.0 -no-undefined +libaircrack_crypto_ppc_power8_la_LDFLAGS = -release $(LT_VER) -no-undefined if !STATIC_CRYPTO libaircrack_crypto_ppc_power8_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS) endif @@ -109,7 +109,7 @@ ARCH_FILES += %D%/sha1-sse2.S endif libaircrack_crypto_la_CFLAGS = $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS) libaircrack_crypto_la_SOURCES = %D%/memory.c %D%/sha1-git.c %D%/wpapsk.c %D%/crypto_engine.c $(ARCH_FILES) -libaircrack_crypto_la_LDFLAGS = -release 1.3.0 -no-undefined +libaircrack_crypto_la_LDFLAGS = -release $(LT_VER) -no-undefined if !STATIC_CRYPTO libaircrack_crypto_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS) endif diff --git a/src/aircrack-osdep/Makefile.inc b/src/aircrack-osdep/Makefile.inc index 640eab752e..44fa1e6d01 100644 --- a/src/aircrack-osdep/Makefile.inc +++ b/src/aircrack-osdep/Makefile.inc @@ -98,7 +98,7 @@ endif endif lib_LTLIBRARIES += libaircrack-osdep.la -libaircrack_osdep_la_LDFLAGS = -release 1.3.0 -no-undefined +libaircrack_osdep_la_LDFLAGS = -release $(LT_VER) -no-undefined EXTRA_DIST += %D%/openbsd.c \ %D%/darwin.c \ diff --git a/src/aircrack-util/crypto_engine_loader.c b/src/aircrack-util/crypto_engine_loader.c index 60a57df5d2..0a33eac191 100644 --- a/src/aircrack-util/crypto_engine_loader.c +++ b/src/aircrack-util/crypto_engine_loader.c @@ -393,7 +393,7 @@ EXPORT char * ac_crypto_engine_loader_best_library_for(int simd_features) #endif buffer, #if defined(WIN32) || defined(_WIN32) || defined(CYGWIN) - "-1-3-0.dll" + LT_CYGWIN_VER #elif defined(__APPLE__) ".dylib" #else diff --git a/src/version.h b/src/version.h.in similarity index 92% rename from src/version.h rename to src/version.h.in index 9de8e883d5..d8c8686766 100644 --- a/src/version.h +++ b/src/version.h.in @@ -30,11 +30,13 @@ * files in the program, then also delete it here. */ -#define _MAJ 1 -#define _MIN 5 -#define _SUB_MIN 2 -#define _BETA 0 -#define _RC 0 +#define _MAJ @_MAJ@ +#define _MIN @_MIN@ +#define _SUB_MIN @_SUB_MIN@ +#define _BETA @_BETA@ +#define _RC @_RC@ +#define _SCM "@_SCM@" +#define LT_VER @LT_VER@ #define WEBSITE "https://aircrack-ng.org" extern char * getVersion(const char * progname, From 783adc9ff5c7a05252c2419f3b10bd4064a018da Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Tue, 26 Feb 2019 11:02:06 -0700 Subject: [PATCH 3/5] ci: Do not depend upon git tags. --- build/dist_check.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/dist_check.sh b/build/dist_check.sh index 836e961fdf..0a1ede4bfc 100755 --- a/build/dist_check.sh +++ b/build/dist_check.sh @@ -18,8 +18,7 @@ fi make make dist -V=$(./evalrev) -BN="aircrack-ng-$V" +BN=$(find . -name '*.tar.gz' | tail -n1 | sed -e 's/\.tar\.gz//g;s/^\.\///g') [ -d dist_build ] && rm -fr dist_build mkdir dist_build From 921ad3c8d6efa85a4a1dc4de4c19ee69cdb1c4fc Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Tue, 26 Feb 2019 12:18:48 -0700 Subject: [PATCH 4/5] autotools: Ensure the builddir src path is included. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2dc27ccb56..cc4bf8b8dd 100644 --- a/configure.ac +++ b/configure.ac @@ -214,7 +214,7 @@ summary_libs="$LIBS" # Set final flags for build # CFLAGS="$opt_cflags $CFLAGS" -CPPFLAGS="$opt_cppflags $CPPFLAGS" +CPPFLAGS="$opt_cppflags -I./src $CPPFLAGS" CXXFLAGS="$opt_cxxflags $CXXFLAGS" LIBS="$opt_libs $LIBS" From 5b13b979d915864aa696b3b9af02495226fbe3b2 Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Wed, 27 Feb 2019 13:40:22 -0700 Subject: [PATCH 5/5] autotools: Ensure VERSION is packaged. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 04e70db691..10731df59d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,7 +58,7 @@ bin_PROGRAMS = sbin_PROGRAMS = noinst_LTLIBRARIES = lib_LTLIBRARIES = -EXTRA_DIST = +EXTRA_DIST = VERSION check_PROGRAMS = TESTS =