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

[Eric Belanger]

    Date: Sunday, October 19, 2008 @ 21:02:16
  Author: eric
Revision: 16008

Merged revisions 15809,16007 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/openldap/trunk

........
  r15809 | douglas | 2008-10-19 05:56:49 -0400 (Sun, 19 Oct 2008) | 1 line
  
  upgpkg: openldap 2.3.43-1
........
  r16007 | eric | 2008-10-19 21:01:39 -0400 (Sun, 19 Oct 2008) | 2 lines
  
  upgpkg: openldap 2.3.43-1
      FHS man pages, installed license file
........

Added:
  openldap/repos/extra-x86_64/openldap-2.3.41-r1-fixed-peercred-error.patch
    (from rev 16007, openldap/trunk/openldap-2.3.41-r1-fixed-peercred-error.patch)
Modified:
  openldap/repos/extra-x86_64/	(properties)
  openldap/repos/extra-x86_64/PKGBUILD

-----------------------------------------------+
 PKGBUILD                                      |   16 +++++++++++-----
 openldap-2.3.41-r1-fixed-peercred-error.patch |   12 ++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)


Property changes on: openldap/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /openldap/trunk:1-1720
   + /openldap/trunk:1-16007

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-20 01:01:39 UTC (rev 16007)
+++ extra-x86_64/PKGBUILD	2008-10-20 01:02:16 UTC (rev 16008)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=openldap
-pkgver=2.3.40
+pkgver=2.3.43
 pkgrel=1
 pkgdesc="LDAP Server"
 arch=('i686' 'x86_64')
@@ -9,13 +9,21 @@
 url="http://www.openldap.org/"
 backup=(etc/openldap/slapd.conf etc/default/slapd)
 depends=('db4.5' 'tcp_wrappers' "libldap>=${pkgver}")
-source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz slapd slapd.default)
+source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz
+        slapd 
+        slapd.default
+        openldap-2.3.41-r1-fixed-peercred-error.patch)
+md5sums=('1b25281086eb146b8e11ebd33de086dc' 'a9c9d906b2132ee3cb3d100ef1c068ae'\
+         '95f50ebf185b1caf299fa4e3970d8ec2' 'a68214b19bee704992d80322cac3ce49')
 options=('!makeflags' '!emptydirs')
 
+
 build() {
   cd ${startdir}/src/openldap-${pkgver}
   export CPPFLAGS="-I/usr/include/db4.5 $CPPFLAGS"
+  patch -p1 < ../openldap-2.3.41-r1-fixed-peercred-error.patch
   ./configure --prefix=/usr \
+              --mandir=/usr/share/man \
               --libexecdir=/usr/sbin \
               --sysconfdir=/etc \
               --localstatedir=/var/lib/openldap \
@@ -67,7 +75,5 @@
   sed -e 's|^pidfile[[:space:]].*$|pidfile   /var/run/slapd.pid|g' \
       -e 's|^argsfile[[:space:]].*$|argsfile  /var/run/slapd.args|g' \
       -i ${startdir}/pkg/etc/openldap/slapd.conf
+  install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums=('728e95d806a3d47d9686481d72e62072'
-         'a9c9d906b2132ee3cb3d100ef1c068ae'
-         '95f50ebf185b1caf299fa4e3970d8ec2')

Copied: openldap/repos/extra-x86_64/openldap-2.3.41-r1-fixed-peercred-error.patch (from rev 16007, openldap/trunk/openldap-2.3.41-r1-fixed-peercred-error.patch)
===================================================================
--- extra-x86_64/openldap-2.3.41-r1-fixed-peercred-error.patch	                        (rev 0)
+++ extra-x86_64/openldap-2.3.41-r1-fixed-peercred-error.patch	2008-10-20 01:02:16 UTC (rev 16008)
@@ -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