[arch-commits] Commit in openldap/trunk (2 files)

[Sébastien Luttringer]

    Date: Wednesday, July 1, 2015 @ 09:17:48
  Author: seblu
Revision: 241660

upgpkg: openldap 2.4.41-1

Modified:
  openldap/trunk/PKGBUILD
Deleted:
  openldap/trunk/fix-libdb-detection-with-gcc-5.patch

--------------------------------------+
 PKGBUILD                             |   14 ++++------
 fix-libdb-detection-with-gcc-5.patch |   43 ---------------------------------
 2 files changed, 6 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-01 05:23:35 UTC (rev 241659)
+++ PKGBUILD	2015-07-01 07:17:48 UTC (rev 241660)
@@ -2,9 +2,9 @@
 # Maintainer:
 
 pkgbase=openldap
-pkgname=('libldap' 'openldap')
-pkgver=2.4.40
-pkgrel=3
+pkgname=('openldap' 'libldap')
+pkgver=2.4.41
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.openldap.org/"
 license=('custom')
@@ -11,13 +11,12 @@
 makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath' 'unixodbc')
 options=('!makeflags' 'emptydirs')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
-        slapd.service slapd.tmpfiles slapd.sysusers openldap-ntlm.patch fix-libdb-detection-with-gcc-5.patch)
-sha1sums=('0cfac3b024b99de2e2456cc7254481b6644e0b96'
+        slapd.service slapd.tmpfiles slapd.sysusers openldap-ntlm.patch)
+sha1sums=('c6880df9fec928a5f010b78a4285b497e8a12d6b'
           '2441815efbfa01ad7a1d39068e5503b53d1d04b0'
           '59241a813d7508294e4ef1cec3bfe1f5495e109d'
           '2bf64351c32b0bf0a70663bd42de22910998b795'
-          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
-          '9b14bb8b4b116a88d562c1e28abbba159106b4be')
+          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
 
 # see http://www.openldap.org/faq/data/cache/756.html
 # there's no proper backend support for anything apart from
@@ -27,7 +26,6 @@
 prepare() {
   cd ${pkgbase}-${pkgver}
   patch -p1 -i "${srcdir}"/openldap-ntlm.patch
-  patch -p1 -i "${srcdir}"/fix-libdb-detection-with-gcc-5.patch
   sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in
   sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
   sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}

Deleted: fix-libdb-detection-with-gcc-5.patch
===================================================================
--- fix-libdb-detection-with-gcc-5.patch	2015-07-01 05:23:35 UTC (rev 241659)
+++ fix-libdb-detection-with-gcc-5.patch	2015-07-01 07:17:48 UTC (rev 241660)
@@ -1,43 +0,0 @@
-From f0409f40dab6013d1aec05f5c86ae31d2f49b485 Mon Sep 17 00:00:00 2001
-From: Jan Synacek <jsynacek at 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
-