[arch-commits] Commit in openldap-clients/repos (3 files)

[Douglas Soares de Andrade]

    Date: Sunday, October 19, 2008 @ 06:04:49
  Author: douglas
Revision: 15814

Fixing conflicts

Added:
  openldap-clients/repos/extra-i686/openldap-2.3.41-r1-fixed-peercred-error.patch
Modified:
  openldap-clients/repos/extra-i686/	(properties)
  openldap-clients/repos/extra-i686/PKGBUILD

-----------------------------------------------+
 PKGBUILD                                      |   10 +++++++---
 openldap-2.3.41-r1-fixed-peercred-error.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)


Property changes on: openldap-clients/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /openldap-clients/trunk:1-1722
   + /openldap-clients/trunk:1-15809

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-19 09:59:11 UTC (rev 15813)
+++ extra-i686/PKGBUILD	2008-10-19 10:04:49 UTC (rev 15814)
@@ -1,18 +1,23 @@
 # $Id$
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=openldap-clients
-pkgver=2.3.40
+pkgver=2.3.43
 pkgrel=1
 pkgdesc="LDAP Client utilities"
 arch=(i686 x86_64)
 license=('custom')
 url="http://www.openldap.org/"
 depends=("libldap>=${pkgver}")
-source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz)
+source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz
+        openldap-2.3.41-r1-fixed-peercred-error.patch)
 options=('!makeflags')
 
+md5sums=('1b25281086eb146b8e11ebd33de086dc'
+         'a68214b19bee704992d80322cac3ce49')
+
 build() {
   cd ${startdir}/src/openldap-${pkgver}
+  patch -p1 < ../openldap-2.3.41-r1-fixed-peercred-error.patch 
   ./configure --prefix=/usr \
               --libexecdir=/usr/sbin \
               --sysconfdir=/etc \
@@ -48,4 +53,3 @@
   make || return 1
   make DESTDIR=${startdir}/pkg install
 }
-md5sums=('728e95d806a3d47d9686481d72e62072')

Added: extra-i686/openldap-2.3.41-r1-fixed-peercred-error.patch
===================================================================
--- extra-i686/openldap-2.3.41-r1-fixed-peercred-error.patch	                        (rev 0)
+++ extra-i686/openldap-2.3.41-r1-fixed-peercred-error.patch	2008-10-19 10:04:49 UTC (rev 15814)
@@ -0,0 +1,12 @@
+diff -Naur openldap-2.3.41/libraries/liblutil/getpeereid.c new/libraries/liblutil/getpeereid.c
+--- ./libraries/liblutil/getpeereid.c	2008-02-12 00:24:13.000000000 +0100
++++ ./libraries/liblutil/getpeereid.c	2008-06-12 12:55:34.000000000 +0200
+@@ -14,6 +14,8 @@
+  * <http://www.OpenLDAP.org/license.html>.
+  */
+ 
++#define _GNU_SOURCE
++
+ #include "portable.h"
+ 
+ #ifndef HAVE_GETPEEREID