Skip to content

Commit

Permalink
fix argon2 packaging (references #32 #44)
Browse files Browse the repository at this point in the history
  • Loading branch information
davidcoutadeur committed May 2, 2020
1 parent 1c95d31 commit 07817de
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 23 deletions.
18 changes: 11 additions & 7 deletions debian/paquet-openldap-debian/openldap-ltb-2.4.50/debian/postbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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 ../..

Expand Down Expand Up @@ -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 ../..

Expand Down
17 changes: 1 addition & 16 deletions debian/paquet-openldap-debian/packaging_debian.README
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 07817de

Please sign in to comment.