diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-01 00:54:46 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-01 00:54:46 -0700 |
| commit | 98eebe7ee4f7a21038033f54317f1b9fca6710b4 (patch) | |
| tree | 8c9e50574a425149e19d6797f10666a1eda6a56d /pkgs/development/libraries/openldap | |
| parent | 7bf25187bc0e8e26fa677fee7509a6d87665505c (diff) | |
| download | nixpkgs-98eebe7ee4f7a21038033f54317f1b9fca6710b4.tar nixpkgs-98eebe7ee4f7a21038033f54317f1b9fca6710b4.tar.gz nixpkgs-98eebe7ee4f7a21038033f54317f1b9fca6710b4.tar.bz2 nixpkgs-98eebe7ee4f7a21038033f54317f1b9fca6710b4.tar.lz nixpkgs-98eebe7ee4f7a21038033f54317f1b9fca6710b4.tar.xz nixpkgs-98eebe7ee4f7a21038033f54317f1b9fca6710b4.tar.zst nixpkgs-98eebe7ee4f7a21038033f54317f1b9fca6710b4.zip | |
openldap: 2.4.40 -> 2.4.41
Diffstat (limited to 'pkgs/development/libraries/openldap')
| -rw-r--r-- | pkgs/development/libraries/openldap/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch | 43 |
2 files changed, 2 insertions, 48 deletions
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 97752a268f7..e5b7ce10719 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,16 +1,13 @@ { stdenv, fetchurl, autoconf, openssl, cyrus_sasl, db, groff }: stdenv.mkDerivation rec { - name = "openldap-2.4.40"; + name = "openldap-2.4.41"; src = fetchurl { url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "1nyslrgwxwilgv5sixc37svls5rbvhsv9drb7hlrjr2vqaji29ni"; + sha256 = "0vkzfd1pmin6xsv8lb1nabfxma8n1q00khr6nfifqkxlm2s6p197"; }; - # Last tested for openldap 2.4.40 - patches = [ ./fix-libdb-detection-gcc5.patch ]; - nativeBuildInputs = [ autoconf ]; buildInputs = [ openssl cyrus_sasl db groff ]; diff --git a/pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch b/pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch deleted file mode 100644 index 40ba9de7375..00000000000 --- a/pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f0409f40dab6013d1aec05f5c86ae31d2f49b485 Mon Sep 17 00:00:00 2001 -From: Jan Synacek <jsynacek@redhat.com> -Date: Wed, 11 Feb 2015 10:32:28 +0100 -Subject: [PATCH] fix libdb detection with gcc 5 - -The old cpp version generated: -__db_version 5 - -The new output: -__db_version - 5 - -Running cpp with -P (inhibit linemarkers generation) fixes this when using gcc 5. -Behavior with older versions of gcc is not changed. ---- - build/openldap.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/openldap.m4 b/build/openldap.m4 -index caf8fc2..bdcb4d6 100644 ---- a/build/openldap.m4 -+++ b/build/openldap.m4 -@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION], - #endif - __db_version DB_VERSION_MAJOR - ]) -- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none -+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none - ol_cv_bdb_major=${3} - ]) - case $ol_cv_bdb_major in [[1-9]]*) : ;; *) -@@ -344,7 +344,7 @@ AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[ - #endif - __db_version DB_VERSION_MINOR - ]) -- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none -+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none - ol_cv_bdb_minor=${3} - ]) - case $ol_cv_bdb_minor in [[0-9]]*) : ;; *) --- -2.1.0 - |