From 07817de28c7a106e7608d8d1998ce5c390b78c84 Mon Sep 17 00:00:00 2001 From: David Coutadeur Date: Sat, 2 May 2020 17:41:34 +0200 Subject: [PATCH] fix argon2 packaging (references #32 #44) --- .../openldap-ltb-2.4.50/debian/postbuild | 18 +++++++++++------- .../packaging_debian.README | 17 +---------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/debian/paquet-openldap-debian/openldap-ltb-2.4.50/debian/postbuild b/debian/paquet-openldap-debian/openldap-ltb-2.4.50/debian/postbuild index d4f3054..e3719ca 100755 --- a/debian/paquet-openldap-debian/openldap-ltb-2.4.50/debian/postbuild +++ b/debian/paquet-openldap-debian/openldap-ltb-2.4.50/debian/postbuild @@ -119,10 +119,12 @@ make clean make "prefix=${LDAPSERVERDIR}" cd .. ## argon2 -cd passwd/argon2 -make clean -make "prefix=${LDAPSERVERDIR}" -cd ../.. +if [ "${DEBIAN_VERSION}" -gt "9" ]; then + cd passwd/argon2 + make clean + make "prefix=${LDAPSERVERDIR}" + cd ../.. +fi cd ../.. @@ -186,9 +188,11 @@ cd .. cd noopsrch make install "prefix=${INSTALL_DIR}${LDAPSERVERDIR}" cd .. -cd passwd/argon2 -make install "prefix=${INSTALL_DIR}${LDAPSERVERDIR}" -cd ../.. +if [ "${DEBIAN_VERSION}" -gt "9" ]; then + cd passwd/argon2 + make install "prefix=${INSTALL_DIR}${LDAPSERVERDIR}" + cd ../.. +fi cd ../.. diff --git a/debian/paquet-openldap-debian/packaging_debian.README b/debian/paquet-openldap-debian/packaging_debian.README index 9d8e07a..f35df7e 100644 --- a/debian/paquet-openldap-debian/packaging_debian.README +++ b/debian/paquet-openldap-debian/packaging_debian.README @@ -9,11 +9,6 @@ Instructions to build berkeleydb-ltb and openldap-ltb > Update : heimdal is not used any more because conflicting with debian wheezy hdb version. > # apt-get install libkrb5-26-heimdal libhdb9-heimdal heimdal-dev -For Debian 8 : - apt-get install libsodium13 libsodium-dev - -For Debian 9 : - apt-get install libsodium18 libsodium-dev For Debian 10 : apt-get install libsodium23 libsodium-dev @@ -91,19 +86,9 @@ Get the new archive, and extract it into the directory: Adapt control files for libsodium: -For Debian 7 : +For Debian 7, 8 and 9: In "control" file, delete any reference to libsodium in Depends and Build-depends lines -For Debian 8 : -In "control" file, replace any reference to libsodiumXX in Depends lines by libsodium13 - -For Debian 9 : -In "control" file, replace any reference to libsodiumXX in Depends lines by libsodium18 - -For Debian 10 : -In "control" file, replace any reference to libsodiumXX in Depends lines by libsodium23 - - Regenerate the package thanks to the usual procedure