From 62d1cfe16c2aa7ab3c9925762b016c891672eefc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Fri, 7 Oct 2016 01:25:05 +0300 Subject: Deb: always build mariadb-cracklib-password-check, even on Travis-CI Previously Travis-CI stated that cracklib is forbidden, but it does not longer seem to be the case. --- debian/autobake-deb.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 60ba21fa279..5259a4fe152 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -40,8 +40,7 @@ CODENAME="$(lsb_release -sc)" # Add libcrack2 (>= 2.9.0) as a build dependency if available in the distribution # This matches Debian Jessie, Stretch and Ubuntu Trusty, Wily, Xenial, Yakkety # Update check when version 2.10 or newer is available. -# On Travis-CI never build cracklib, as it is forbidden on Travis-CI.org -if [[ ! $TRAVIS ]] && apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1 +if apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1 then sed 's/Standards-Version/,libcrack2-dev (>= 2.9.0)\nStandards-Version/' debian/control cat <> debian/control -- cgit v1.2.1