diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-11-26 19:52:37 +0200 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-11-26 19:52:37 +0200 |
commit | 427eedd0126de0d9562e843eac911380daa9853c (patch) | |
tree | c47d90c4df949745081ffdd474ddf0491e0b0810 | |
parent | ed2379f98399ee3ecd6147c6acddfa33e35a9879 (diff) | |
download | mariadb-git-427eedd0126de0d9562e843eac911380daa9853c.tar.gz |
MDEV-13288: Proper fix for cracklib-runtime
The required dependencies should be added through the autobake script,
to also cover distributions that do not support libcrack2.
-rwxr-xr-x | debian/autobake-deb.sh | 2 | ||||
-rw-r--r-- | debian/control | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 98071ba6d03..a617995724c 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -41,7 +41,7 @@ then MARIADB_OPTIONAL_DEBS="${MARIADB_OPTIONAL_DEBS} cracklib-password-check-10.1" sed -i -e "/\\\${MAYBE_LIBCRACK}/d" debian/control else - MAYBE_LIBCRACK='libcrack2-dev (>= 2.9.0),' + MAYBE_LIBCRACK='libcrack2-dev (>= 2.9.0), cracklib-runtime' sed -i -e "s/\\\${MAYBE_LIBCRACK}/${MAYBE_LIBCRACK}/g" debian/control fi diff --git a/debian/control b/debian/control index fc63c308f75..71329a870c9 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net> Build-Depends: bison, chrpath, cmake (>= 2.7), - cracklib-runtime, debhelper, dh-apparmor, dpatch, |