Merge remote-tracking branch 'origin/versioning' into fs-layout

.gitignore

@@ -1,12 +1,21 @@
 /*-ng
-besside-ng-crawler
-ivstools
-kstats
-wpaclean
+/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
@@ -67,11 +76,16 @@ Makefile
 !/contrib/peek/Makefile
 !/scripts/airgraph-ng/lib/Makefile
 /scripts/airmon-ng
-/aircrack-ng--*
 /benchmark.csv
 /.cccc
 /cccc.opt
 /.scannerwork
+/.bash_history
+/.cproject
+/.lesshst
+/.project
+/.rpmdb
+/.settings
 benchmark*.csv
 /bw-output
 compile_commands.json
@@ -83,3 +97,14 @@ coverage*.info
 /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

Makefile.am

@@ -59,7 +59,7 @@ bin_PROGRAMS =
 sbin_PROGRAMS =
 noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
-EXTRA_DIST =
+EXTRA_DIST = VERSION
 check_PROGRAMS =
 TESTS =
 

VERSION.in

@@ -0,0 +1 @@
+@_MAJ@.@_MIN@.@_SUB_MIN@

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

configure.ac

@@ -37,11 +37,19 @@
 # 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
+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])
 
 #
@@ -81,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])
 
 #
@@ -197,8 +223,34 @@ LIBS="$opt_libs $LIBS"
 #
 AC_CONFIG_FILES([
 Makefile
-
+VERSION
+
+include/aircrack-ng/version.h
+
+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

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

include/aircrack-ng/version.h → include/aircrack-ng/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,

lib/Makefile.inc

@@ -156,59 +156,59 @@ libaircrack_ce_wep_la_LIBADD	= $(CRYPTO_LIBS)
 # Intel/AMD
 libaircrack_ce_wpa_x86_avx512_la_SOURCES = $(SRC_CE_WPA)
 libaircrack_ce_wpa_x86_avx512_la_CFLAGS = $(x86_avx512_cflags) -DSIMD_CORE -DJOHN_AVX512F $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
-libaircrack_ce_wpa_x86_avx512_la_LDFLAGS = -release 1.3.0 -no-undefined
+libaircrack_ce_wpa_x86_avx512_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
 libaircrack_ce_wpa_x86_avx512_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 libaircrack_ce_wpa_x86_avx2_la_SOURCES = $(SRC_CE_WPA)
 libaircrack_ce_wpa_x86_avx2_la_CFLAGS = $(x86_avx2_cflags) -DSIMD_CORE -DJOHN_AVX2 $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
-libaircrack_ce_wpa_x86_avx2_la_LDFLAGS = -release 1.3.0 -no-undefined
+libaircrack_ce_wpa_x86_avx2_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
 libaircrack_ce_wpa_x86_avx2_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 libaircrack_ce_wpa_x86_avx_la_SOURCES = $(SRC_CE_WPA)
 libaircrack_ce_wpa_x86_avx_la_CFLAGS = $(x86_avx_cflags) -DSIMD_CORE -DJOHN_AVX $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
-libaircrack_ce_wpa_x86_avx_la_LDFLAGS = -release 1.3.0 -no-undefined
+libaircrack_ce_wpa_x86_avx_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
 libaircrack_ce_wpa_x86_avx_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 libaircrack_ce_wpa_x86_sse2_la_SOURCES = $(SRC_CE_WPA)
 libaircrack_ce_wpa_x86_sse2_la_CFLAGS = $(x86_sse2_cflags) -DSIMD_CORE -DJOHN_SSE2 $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
-libaircrack_ce_wpa_x86_sse2_la_LDFLAGS = -release 1.3.0 -no-undefined
+libaircrack_ce_wpa_x86_sse2_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
 libaircrack_ce_wpa_x86_sse2_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 # ARM/AARCH64
 libaircrack_ce_wpa_arm_neon_la_SOURCES = $(SRC_CE_WPA)
 libaircrack_ce_wpa_arm_neon_la_CFLAGS = $(arm_neon_cflags) -DSIMD_CORE -DHAS_NEON $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
-libaircrack_ce_wpa_arm_neon_la_LDFLAGS = -release 1.3.0 -no-undefined
+libaircrack_ce_wpa_arm_neon_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
 libaircrack_ce_wpa_arm_neon_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 # PowerPC
 libaircrack_ce_wpa_ppc_altivec_la_SOURCES = $(SRC_CE_WPA)
 libaircrack_ce_wpa_ppc_altivec_la_CFLAGS = $(ppc_altivec_cflags) -DSIMD_CORE -DHAS_ALTIVEC=1 -DJOHN_ALTIVEC $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
-libaircrack_ce_wpa_ppc_altivec_la_LDFLAGS = -release 1.3.0 -no-undefined
+libaircrack_ce_wpa_ppc_altivec_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
 libaircrack_ce_wpa_ppc_altivec_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 libaircrack_ce_wpa_ppc_power8_la_SOURCES = $(SRC_CE_WPA)
 libaircrack_ce_wpa_ppc_power8_la_CFLAGS = $(ppc_altivec_cflags) -DSIMD_CORE -DHAS_ALTIVEC=1 -DJOHN_ALTIVEC -DJOHN_POWER8 $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
-libaircrack_ce_wpa_ppc_power8_la_LDFLAGS = -release 1.3.0 -no-undefined
+libaircrack_ce_wpa_ppc_power8_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
 libaircrack_ce_wpa_ppc_power8_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 # Generic library
 libaircrack_ce_wpa_la_CFLAGS = $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
 libaircrack_ce_wpa_la_SOURCES = $(SRC_CE_WPA)
-libaircrack_ce_wpa_la_LDFLAGS = -release 1.3.0 -no-undefined
+libaircrack_ce_wpa_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
 libaircrack_ce_wpa_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif

lib/libac/support/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

lib/osdep/Makefile.inc

@@ -96,7 +96,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
 libaircrack_osdep_la_CPPFLAGS = -I$(top_srcdir)/include/aircrack-ng/osdep $(AM_CPPFLAGS)
 
 EXTRA_DIST +=     %D%/openbsd.c \

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

manpages/airbase-ng.8 → 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