Skip to content

Commit

Permalink
Merge pull request #2010 from aircrack-ng/dedup-functions
Browse files Browse the repository at this point in the history
De-duplicate functions; with other minor tweaks
  • Loading branch information
jbenden committed Mar 7, 2019
2 parents d00f1a9 + 933b5d0 commit ec884f1
Show file tree
Hide file tree
Showing 96 changed files with 8,790 additions and 9,484 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
[![Kali Linux Build Status](https://buildbot.aircrack-ng.org/badges/aircrack-ng-kali.png?left_text=Kali%20Linux%20Build)](https://buildbot.aircrack-ng.org/)
[![Armel Kali Linux Build Status](https://buildbot.aircrack-ng.org/badges/aircrack-ng-armel.png?left_text=Armel%20Kali%20Linux%20Build)](https://buildbot.aircrack-ng.org/)
[![Armhf Kali Linux Build Status](https://buildbot.aircrack-ng.org/badges/aircrack-ng-armhf.png?left_text=Armhf%20Kali%20Linux%20Build)](https://buildbot.aircrack-ng.org/)
[![FreeBSD Build Status](https://buildbot.aircrack-ng.org/badges/aircrack-ng-bsd.png?left_text=FreeBSD%20Build)](https://buildbot.aircrack-ng.org/)
[![DragonFly BSD Build Status](https://buildbot.aircrack-ng.org/badges/aircrack-ng-dfly.png?left_text=DragonFly%20Build)](https://buildbot.aircrack-ng.org/)
[![FreeBSD 11 Build Status](https://buildbot.aircrack-ng.org/badges/aircrack-ng-fbsd-11.png?left_text=FreeBSD%2011%20Build)](https://buildbot.aircrack-ng.org/)
[![FreeBSD 12 Build Status](https://buildbot.aircrack-ng.org/badges/aircrack-ng-fbsd-12.png?left_text=FreeBSD%2012%20Build)](https://buildbot.aircrack-ng.org/)
[![OpenBSD 6 Build Status](https://buildbot.aircrack-ng.org/badges/aircrack-ng-obsd.png?left_text=OpenBSD%20Build)](https://buildbot.aircrack-ng.org/)
[![Coverity Scan Build Status](https://scan.coverity.com/projects/aircrack-ng/badge.svg)](https://scan.coverity.com/projects/aircrack-ng)
[![PackageCloud DEB](https://img.shields.io/badge/deb-packagecloud.io-844fec.svg)](https://packagecloud.io/aircrack-ng/git/install#bash-deb)
[![PackageCloud RPM](https://img.shields.io/badge/rpm-packagecloud.io-844fec.svg)](https://packagecloud.io/aircrack-ng/git/install#bash-rpm)
Expand Down Expand Up @@ -68,7 +71,7 @@ Below are instructions for installing the basic requirements to build

#### Fedora/CentOS/RHEL

sudo yum install libtool pkgconfig sqlite-devel autoconf automake openssl-devel libpcap-devel pcre-devel rfkill libnl3-devel gcc gcc-c++ ethtool hwloc-devel libcmocka-devel make hostapd iw usbutils tcpdump screen
sudo yum install libtool pkgconfig sqlite-devel autoconf automake openssl-devel libpcap-devel pcre-devel rfkill libnl3-devel gcc gcc-c++ ethtool hwloc-devel libcmocka-devel git make file expect hostapd iw usbutils tcpdump screen

**Note**: on CentOS and RedHat, HostAPd requires 'epel' repository to be enabled: sudo yum install epel-release

Expand Down
35 changes: 17 additions & 18 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ version: 1.0.{build}
pull_requests:
do_not_increment_build_number: true

# Do not build feature branch with open Pull Requests
skip_branch_with_pr: true

image: Visual Studio 2017

configuration: Release

platform: x64

clone_depth: 100
clone_depth: 500

environment:
global:
Expand Down Expand Up @@ -43,6 +46,13 @@ matrix:
cache:
- '%AIRCRACK_CI_CACHE%'

# Uncomment to enable debugging on AppVeyor equipment
#
init:
- git config --global core.autocrlf input
- git config --global core.eol lf
#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

install:
- ps: |
function Exec-External {
Expand All @@ -66,7 +76,7 @@ install:
- ps: |
function updateCygwin($cygwinexe, $installFolder, $cacheFolder) {
Write-Host "Update Cygwin: $cygwinexe"
Exec-External {& cmd /c $cygwinexe -gqnNdO -R $installFolder -s http://mirrors.kernel.org/sourceware/cygwin/ -l $cacheFolder -P autoconf -P automake -P bison -P clang -P gcc-core -P gcc-g++ -P mingw-runtime -P mingw-binutils -P mingw-gcc-core -P mingw-gcc-g++ -P mingw-pthreads -P mingw-w32api -P libtool -P make -P python -P gettext-devel -P gettext -P intltool -P libiconv -P libiconv-devel -P pkg-config -P git -P wget -P curl -P libcurl4 -P libpcre-devel -P openssl-devel -P libsqlite3-devel -P zlib-devel -P cmocka -P unzip -P zip -P rsync}
Exec-External {& cmd /c $cygwinexe -gqnNdO -R $installFolder -s http://mirrors.kernel.org/sourceware/cygwin/ -l $cacheFolder -P autoconf -P automake -P bison -P clang -P gcc-core -P gcc-g++ -P mingw-runtime -P mingw-binutils -P mingw-gcc-core -P mingw-gcc-g++ -P mingw-pthreads -P mingw-w32api -P libtool -P make -P python -P gettext-devel -P gettext -P intltool -P libiconv -P libiconv-devel -P pkg-config -P git -P wget -P curl -P libcurl4 -P libpcre-devel -P openssl-devel -P libsqlite3-devel -P zlib-devel -P cmocka -P unzip -P zip -P rsync -P expect}
Write-Host "Update Cygwin: $cygwinexe " -NoNewLine
Write-Host "[ OK ]" -ForegroundColor Green
}
Expand Down Expand Up @@ -121,10 +131,7 @@ build_script:
C:\cygwin\bin\bash -e -l -c "7z -y x AirPcap_Devpack_4_1_1_1838.zip"
- ps: |
if ($env:TARGET -eq "cygwin") {
Exec-External {& C:\cygwin\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x86/airpcap.dll src"}
Exec-External {& C:\cygwin\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x86/airpcap.dll src/aircrack-osdep"}
Exec-External {& C:\cygwin\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x86/airpcap.dll src/aircrack-crypto"}
Exec-External {& C:\cygwin\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x86/airpcap.dll src/aircrack-util"}
Exec-External {& C:\cygwin\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x86/airpcap.dll /cygdrive/c/Windows/System32"}
Exec-External {& C:\cygwin\bin\bash -e -l -c "dlltool -D Airpcap_Devpack/bin/x86/airpcap.dll -d build/airpcap.dll.def -l Airpcap_Devpack/bin/x86/libairpcap.dll.a"}
if ($env:COMPILER -eq "gcc") {
Exec-External {& C:\cygwin\bin\bash -e -l -c "./build/cygwin.sh gcc --with-experimental --with-airpcap=/cygdrive/c/projects/aircrack-ng"}
Expand All @@ -135,10 +142,7 @@ build_script:
}
- ps: |
if ($env:TARGET -eq "cygwin64") {
Exec-External {& C:\cygwin64\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll src"}
Exec-External {& C:\cygwin64\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll src/aircrack-osdep"}
Exec-External {& C:\cygwin64\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll src/aircrack-crypto"}
Exec-External {& C:\cygwin64\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll src/aircrack-util"}
Exec-External {& C:\cygwin64\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll /cygdrive/c/Windows/System"}
Exec-External {& C:\cygwin64\bin\bash -e -l -c "dlltool -D Airpcap_Devpack/bin/x64/airpcap.dll -d build/airpcap.dll.def -l Airpcap_Devpack/bin/x64/libairpcap.dll.a"}
if ($env:COMPILER -eq "gcc") {
Exec-External {& C:\cygwin64\bin\bash -e -l -c "./build/cygwin.sh gcc --with-experimental --with-airpcap=/cygdrive/c/projects/aircrack-ng"}
Expand All @@ -149,20 +153,15 @@ build_script:
}
- ps: |
if ($env:TARGET -eq "msys64") {
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll src"}
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll src/aircrack-osdep"}
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll src/aircrack-crypto"}
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll src/aircrack-util"}
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll /c/Windows/System"}
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "dlltool -D Airpcap_Devpack/bin/x64/airpcap.dll -d build/airpcap.dll.def -l Airpcap_Devpack/bin/x64/libairpcap.dll.a"}
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "./build/cygwin.sh gcc --with-experimental --with-airpcap=/c/projects/aircrack-ng"}
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "./build/cygwin.sh gcc --with-experimental"}
}
- ps: |
if ($env:TARGET -eq "pkg") {
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll src"}
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll src/aircrack-osdep"}
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll src/aircrack-crypto"}
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll src/aircrack-util"}
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x64/airpcap.dll /c/Windows/System"}
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "cp -vfp Airpcap_Devpack/bin/x86/airpcap.dll /c/Windows/System32"}
Exec-External {& C:\msys64\usr\bin\bash -e -l -c "dlltool -D Airpcap_Devpack/bin/x64/airpcap.dll -d build/airpcap.dll.def -l Airpcap_Devpack/bin/x64/libairpcap.dll.a"}
Exec-External {& C:\cygwin\bin\bash -e -l -c "dlltool -D Airpcap_Devpack/bin/x86/airpcap.dll -d build/airpcap.dll.def -l Airpcap_Devpack/bin/x86/libairpcap.dll.a"}
.\build\package-win32.ps1 2>&1 | %{ "$_" }
Expand Down
10 changes: 6 additions & 4 deletions build/cygwin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,17 @@ then
export CC CXX LIBS
fi

CFLAGS="-O3 -DNDEBUG"
CXXFLAGS="-O3 -DNDEBUG"
CPUS=$((`grep processor /proc/cpuinfo | wc -l` * 3 / 2))
CFLAGS="-O2 -DNDEBUG"
CXXFLAGS="-O2 -DNDEBUG"
export CFLAGS CXXFLAGS

RETRY=0

while [ $RETRY -lt 3 ];
do
./autogen.sh "$@" && break
# ./autogen.sh "$@" && break
autoreconf -vi && ./configure "$@" && break

echo "W: failed to run autogen.sh, will retry..."
RETRY=$(($RETRY + 1))
Expand All @@ -42,7 +44,7 @@ then
exit 1
fi

make
make -j ${CPUS:-1}
make check || { find test -name 'test-suite.log' -exec cat {} ';' && exit 1; }
make clean

Expand Down
4 changes: 2 additions & 2 deletions build/dist_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fi

find . -name .deps -o -name '*.la' -o -name .libs -o -name Makefile -print0 | xargs -0 rm -vfr
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
./autogen.sh --with-openssl=/usr/local/Cellar/openssl/1.0.2l --with-experimental --with-ext-scripts
./autogen.sh --with-experimental --with-ext-scripts
else
./autogen.sh
fi
Expand All @@ -27,7 +27,7 @@ cd dist_build

tar xzf ../$BN.tar.gz
cd "$BN"
if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./configure --with-openssl=/usr/local/Cellar/openssl/1.0.2l --with-experimental --with-ext-scripts; else ./configure --with-experimental --with-ext-scripts; fi
if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./configure --with-experimental --with-ext-scripts; else ./configure --with-experimental --with-ext-scripts; fi
make
make check || { find test -name 'test-suite.log' -exec cat {} ';' && exit 1; }
make DESTDIR=/tmp/ac install
Expand Down
14 changes: 1 addition & 13 deletions build/m4/aircrack_ng_crypto.m4
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,7 @@ if test "x$static_crypto" != "xno"; then
AX_EXT_HAVE_STATIC_LIB(ZLIB, ${DEFAULT_STATIC_LIB_SEARCH_PATHS}, z libz, compress)
AX_EXT_HAVE_STATIC_LIB(OPENSSL, ${DEFAULT_STATIC_LIB_SEARCH_PATHS}, crypto libcrypto, HMAC, -lz -ldl)
else
AC_CHECK_LIB([crypto], [OPENSSL_init], [
OPENSSL_LIBS="-lcrypto"
OPENSSL_LDFLAGS=""
AC_CHECK_HEADERS([openssl/crypto.h], [
OPENSSL_FOUND=yes
OPENSSL_INCLUDES=""
], [
AX_CHECK_OPENSSL([OPENSSL_FOUND=yes],[OPENSSL_FOUND=no])
])
], [
AX_CHECK_OPENSSL([OPENSSL_FOUND=yes],[OPENSSL_FOUND=no])
])
AX_CHECK_OPENSSL([OPENSSL_FOUND=yes],[OPENSSL_FOUND=no])
AX_LIB_GCRYPT
fi
Expand Down
51 changes: 51 additions & 0 deletions build/m4/aircrack_ng_expect.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
dnl Aircrack-ng
dnl
dnl Copyright (C) 2019 Joseph Benden <joe@benden.us>
dnl
dnl Autotool support was written by: Joseph Benden <joe@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_EXPECT],[
AC_ARG_VAR([EXPECT],[Use this expect tool for tests.])
dnl Allow env override but do not be fooled by 'EXPECT=t'.
test t = "$EXPECT" && unset EXPECT
AC_CHECK_PROG([EXPECT], [expect], [$as_dir/$ac_word$ac_exec_ext], [])
AS_IF([test "x$EXPECT" = "x"],[
AC_MSG_WARN([expect not found; cannot run some tests])
EXPECT_FOUND="not found"
], [
EXPECT_FOUND="yes"
])
])
2 changes: 1 addition & 1 deletion build/m4/aircrack_ng_revision.m4
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ 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([./evalrev . quoted]),m4_newline),
m4_translit(m4_esyscmd([$(pwd)/evalrev . quoted || echo]),m4_newline),
[specifies the Aircrack-ng revision number, [default auto-detects]])
])
34 changes: 24 additions & 10 deletions build/m4/aircrack_ng_simd.m4
Original file line number Diff line number Diff line change
Expand Up @@ -132,24 +132,36 @@ then
AX_CHECK_COMPILE_FLAG([-maltivec], [
AX_APPEND_FLAG(-maltivec, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
ALTIVEC_FOUND=1
])
AX_CHECK_COMPILE_FLAG([-mabi=altivec], [
AX_APPEND_FLAG(-mabi=altivec, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
])
AX_CHECK_COMPILE_FLAG([-mvsx], [
AX_APPEND_FLAG(-mvsx, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
])
AX_CHECK_COMPILE_FLAG([-mpower8-vector], [
AX_APPEND_FLAG(-mpower8-vector, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
POWER8_FOUND=1
AS_VAR_PUSHDEF([CACHEVAR], [ax_cv_altivec_[]_AC_LANG_ABBREV[]flags])
AC_CACHE_CHECK([whether _AC_LANG compiler supports VSX instructions], CACHEVAR, [
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
_AC_LANG_PREFIX[]FLAGS="$ppc_altivec_[]_AC_LANG_ABBREV[]flags -mvsx -mpower8-vector $[]_AC_LANG_PREFIX[]FLAGS"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#if !defined(__VSX__) && !defined(__POWER8_VECTOR__)
#error macro not defined
#endif
]])], [AS_VAR_SET(CACHEVAR,[yes])], [AS_VAR_SET(CACHEVAR,[no])])
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags
])
AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
[
ALTIVEC_FOUND=1
POWER8_FOUND=1
AX_APPEND_FLAG(-mvsx, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
AX_APPEND_FLAG(-mpower8-vector, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
], [
ALTIVEC_FOUND=0
POWER8_FOUND=0
])
AS_VAR_POPDEF([CACHEVAR])
fi
if test $IS_X86 -eq 0
Expand Down Expand Up @@ -214,6 +226,8 @@ then
])
;;
esac
AC_DEFINE_UNQUOTED([AVX512F_FOUND], [$AVX512F_FOUND], [Define to enable AVX-512F buffers.])
;;
esac
Expand Down
28 changes: 20 additions & 8 deletions build/m4/ax_check_openssl.m4
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,27 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
;;
esac
], [
# if pkg-config is installed and openssl has installed a .pc file,
# then use that information and don't search ssldirs
AC_CHECK_TOOL([PKG_CONFIG], [pkg-config])
if test x"$PKG_CONFIG" != x""; then
OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
if test $? = 0; then
OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
AC_CHECK_LIB([crypto], [OPENSSL_init], [
OPENSSL_LIBS="-lcrypto -lssl"
OPENSSL_LDFLAGS=""
AC_CHECK_HEADERS([openssl/crypto.h], [
OPENSSL_INCLUDES=""
found=true
])
])
if ! $found; then
# if pkg-config is installed and openssl has installed a .pc file,
# then use that information and don't search ssldirs
AC_CHECK_TOOL([PKG_CONFIG], [pkg-config])
if test x"$PKG_CONFIG" != x""; then
OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
if test $? = 0; then
OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
found=true
fi
fi
fi
Expand Down
2 changes: 1 addition & 1 deletion build/m4/ax_pthread.m4
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ for ax_pthread_try_flag in $ax_pthread_flags; do
# if $ax_pthread_check_cond
# error "$ax_pthread_check_macro must be defined"
# endif
static void routine(void *a) { a = 0; }
static void routine(void *a) { a = 0; (void)a; }
static void *start_routine(void *a) { return a; }],
[pthread_t th; pthread_attr_t attr;
pthread_create(&th, 0, start_routine, 0);
Expand Down
2 changes: 1 addition & 1 deletion build/openssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ case "${CC:=}" in
*) export CFLAGS="-Werror -Wno-unused-result"; export CXXFLAGS="-Werror -Wno-unused-result";;
esac

if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./autogen.sh --with-experimental --with-openssl=/usr/local/Cellar/openssl/1.0.2l ${EXTRA}; else ./autogen.sh --with-experimental ${EXTRA}; fi || { cat config.log; exit 1; }
if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./autogen.sh --with-experimental ${EXTRA}; else ./autogen.sh --with-experimental ${EXTRA}; fi || { cat config.log; exit 1; }
make
make check || { find test -name 'test-suite.log' -exec cat {} ';' && exit 1; }
make clean
Expand Down
11 changes: 11 additions & 0 deletions build/pipelines/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@
- name: Staging Installation
command: "make install-strip DESTDIR={{ destdir }}"

- name: Produce dist artifacts
command: make dist

- name: Packaging
shell:
script: "{{ fpm }}"
Expand Down Expand Up @@ -191,6 +194,11 @@
chmod 664 "{{ path }}/{{ item.pkg }}"
with_items: "{{ pkg }}"

- shell:
script: |
{% set path = "{{ www }}/{{ artifacts }}/development/{{ commit_id }}" %}
cp -p "aircrack-ng*.zip" "aircrack-ng*.tar.*" "{{ path }}"
- name: Deploying development package manifest
tags:
- www
Expand Down Expand Up @@ -252,6 +260,7 @@
- elementaryos/loki
- linuxmint/sylvia
- linuxmint/tara
- linuxmint/tessa
- raspbian/buster
- ubuntu/xenial
- ubuntu/bionic
Expand All @@ -271,13 +280,15 @@
- el/7
- fedora/27
- fedora/28
- fedora/29
- opensuse/42.1
- opensuse/42.2
- opensuse/42.3
- sles/12.0
- sles/12.1
- sles/12.2
- sles/12.3
- sles/15.0
tasks:
- command: "package_cloud push --yes aircrack-ng/git/{{ matrix_tag }} {{ item.pkg }}"
with_items: "{{ pkg | selectattr('pkg_type', 'equalto', 'rpm') | list }}"
Expand Down
Loading

0 comments on commit ec884f1

Please sign in to comment.