packages for OpenLDAP 2.4.50 + argon2 contrib overlay (references #44 #…

…32)

debian/paquet-openldap-debian/openldap-ltb-2.4.49/debian/changelog → debian/paquet-openldap-debian/openldap-ltb-2.4.50/debian/changelog

@@ -1,3 +1,34 @@
+
+openldap-ltb (2.4.50.1) UNRELEASED; urgency=medium
+
+    - OpenLDAP 2.4.50 Release (2020/04/28)
+    - Fixed client benign typos (ITS#8890)
+    -  Fixed libldap type cast (ITS#9175)
+    -  Fixed libldap retry loop in ldap_int_tls_connect (ITS#8650)
+    -  Fixed libldap_r race on Windows mutex initialization (ITS#9181)
+    -  Fixed liblunicode memory leak (ITS#9198)
+    -  Fixed slapd benign typos (ITS#8890)
+    -  Fixed slapd to limit depth of nested filters (ITS#9202)
+    -  Fixed slapd-mdb memory leak in dnSuperiorMatch (ITS#9214)
+    -  Fixed slapo-pcache database initialization (ITS#9182)
+    -  Fixed slapo-ppolicy callback (ITS#9171)
+    - Build
+    -  Fix olcDatabaseDummy initialization for windows (ITS#7074)
+    -  Fix detection for ws2tcpip.h for windows (ITS#8383)
+    -  Fix back-mdb types for windows (ITS#7878)
+    - Contrib
+    -  Update ldapc++ config.guess and config.sub to support newer architectures (ITS#7855)
+    -  Added pw-argon2 module (ITS#9233, ITS#8575, ITS#9203, ITS#9206)
+    - Documentation
+    -  slapd-ldap(5) - Clarify idassert-authzfrom behavior (ITS#9003)
+    -  slapd-meta(5) - Remove client-pr option (ITS#8683)
+    -  slapdinex(8) - Fix truncate option information for back-mdb (ITS#9230)
+    - LTB changes
+    -  packaging of argon2 in contrib-overlays (issue #32)
+
+ -- David Coutadeur <[email protected]>  Sat, 02 May 2020 15:51:13 +0200
+
+
 openldap-ltb (2.4.49.1) UNRELEASED; urgency=medium
 
     - OpenLDAP 2.4.49 (2020/01/30)
@@ -35,7 +66,7 @@ openldap-ltb (2.4.49.1) UNRELEASED; urgency=medium
     - LTB changes
     -  nothing
 
- -- David Coutadeur <[email protected]>  Thu, 06 Feb 2020 15:00:00 +0100
+ -- David Coutadeur <[email protected]>  Thu, 06 Feb 2020 12:00:00 +0200
 
 openldap-ltb (2.4.48.1) UNRELEASED; urgency=medium
 

debian/paquet-openldap-debian/openldap-ltb-2.4.49/debian/control → debian/paquet-openldap-debian/openldap-ltb-2.4.50/debian/control

@@ -2,7 +2,7 @@ Source: openldap-ltb
 Section: net
 Priority: optional
 Maintainer: dcoutadeur <[email protected]>
-Build-Depends: debhelper (>= 7.0.15), autotools-dev, libltdl7, libltdl-dev, libsasl2-2, libsasl2-dev, zlib1g, zlib1g-dev, openssl, libssl-dev, mime-support, mawk, libcrack2-dev, berkeleydb-ltb (>= 4.6.21)
+Build-Depends: debhelper (>= 7.0.15), autotools-dev, libltdl7, libltdl-dev, libsasl2-2, libsasl2-dev, zlib1g, zlib1g-dev, openssl, libssl-dev, mime-support, mawk, libcrack2-dev, berkeleydb-ltb (>= 4.6.21), libsodium23, libsodium-dev
 Standards-Version: 3.8.4
 Homepage: http://ltb-project.org
 
@@ -76,7 +76,7 @@ Description: OpenLDAP exponential time password lockout overlay
 
 Package: openldap-ltb-contrib-overlays
 Architecture: any
-Depends: openldap-ltb, libc6 (>= 2.4)
+Depends: openldap-ltb, libc6 (>= 2.4), libsodium23
 Description: Overlays contributed to OpenLDAP
  Some overlays are not included in the OpenLDAP main package but provided
  as contributions. This package provide some of them.

debian/paquet-openldap-debian/openldap-ltb-2.4.49/debian/openldap-ltb-contrib-overlays.install → debian/paquet-openldap-debian/openldap-ltb-2.4.50/debian/openldap-ltb-contrib-overlays.install

@@ -5,3 +5,4 @@ usr/local/openldap/libexec/openldap/nssov.*
 usr/local/openldap/libexec/openldap/pw-pbkdf2.*
 usr/local/openldap/libexec/openldap/pw-sha2.*
 usr/local/openldap/libexec/openldap/smbk5pwd.*
+usr/local/openldap/libexec/openldap/pw-argon2.*

debian/paquet-openldap-debian/openldap-ltb-2.4.49/debian/openldap-ltb.vars → debian/paquet-openldap-debian/openldap-ltb-2.4.50/debian/openldap-ltb.vars

@@ -6,7 +6,7 @@ set -e
 BUILD_DIR="$( pwd )"
 BDBDIR="/usr/local/berkeleydb"
 REAL_NAME="openldap"
-REAL_VERSION="2.4.49"
+REAL_VERSION="2.4.50"
 INSTALL_DIR="${BUILD_DIR}/debian/tmp"
 INSTALL_DIR_CP="${BUILD_DIR}/debian/openldap-ltb-check-password"
 INSTALL_DIR_PPM="${BUILD_DIR}/debian/openldap-ltb-ppm"

debian/paquet-openldap-debian/openldap-ltb-2.4.49/debian/postbuild → debian/paquet-openldap-debian/openldap-ltb-2.4.50/debian/postbuild

@@ -118,6 +118,12 @@ cd noopsrch
 make clean
 make "prefix=${LDAPSERVERDIR}"
 cd ..
+## argon2
+cd passwd/argon2
+make clean
+make "prefix=${LDAPSERVERDIR}"
+cd ../..
+
 cd ../..
 
 # mdb-utils
@@ -180,6 +186,10 @@ cd ..
 cd noopsrch
 make install "prefix=${INSTALL_DIR}${LDAPSERVERDIR}"
 cd ..
+cd passwd/argon2
+make install "prefix=${INSTALL_DIR}${LDAPSERVERDIR}"
+cd ../..
+
 cd ../..
 
 # mdb-utils

debian/paquet-openldap-debian/packaging_debian.README

@@ -9,6 +9,17 @@ 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
+
+
+
 get the sources
 ---------------
 	cd /opt
@@ -49,30 +60,6 @@ building the source package (with no signing). Take care to create openldap-ltb_
 
 
 
------------------------------
-
-
-Instructions for debian lenny
-=============================
-replace libltdl7 by libltdl3 in debian/control (delete the specific 2.2.6b version)
-replace libltdl-dev by libltdl3-dev in debian/control
-
-> Update : heimdal is not used any more because conflicting with debian wheezy hdb version.
-> Replace libkrb5-26-heimdal in debian/control by libkrb5-25-heimdal.
-> #apt-get install libkrb5-25-heimdal libhdb9-heimdal heimdal-dev
-
-	apt-get install libltdl3 et libltdl3-dev
-Use debian/rules.lenny target instead of debian/rules for berkeleydb
-
-in case of error for binary target:
-> dpkg-shlibdeps: erreur: impossible de trouver la bibliothèque libslapi-2.4.so.2 utilisée par debian/openldap-ltb/usr/local/openldap/libexec/slapd (format ELF : " elf64-x86-64 "; RPATH : "  ")
-
-do the following export just before running the target: (don't forget to un-export it to test the package)
-
-	export LD_LIBRARY_PATH=/opt/paquet-openldap-debian/openldap-ltb-2.4.46/debian/openldap-ltb/usr/local/openldap/lib64
-
-
-
 -----------------------------
 
 
@@ -101,6 +88,23 @@ Get the new archive, and extract it into the directory:
 	tar xvzf openldap-2.4.XX.tgz
 	cp -r openldap-2.4.XX/* openldap-ltb-2.4.XX/
 
+
+Adapt control files for libsodium:
+
+For Debian 7 :
+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