[arch-commits] Commit in openldap/repos (14 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Mon Aug 5 13:43:59 UTC 2013
Date: Monday, August 5, 2013 @ 15:43:59
Author: bpiotrowski
Revision: 192057
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
openldap/repos/staging-i686/
openldap/repos/staging-i686/PKGBUILD
(from rev 192054, openldap/trunk/PKGBUILD)
openldap/repos/staging-i686/openldap-nssov.patch
(from rev 192054, openldap/trunk/openldap-nssov.patch)
openldap/repos/staging-i686/openldap-ntlm.patch
(from rev 192054, openldap/trunk/openldap-ntlm.patch)
openldap/repos/staging-i686/openldap.install
(from rev 192055, openldap/trunk/openldap.install)
openldap/repos/staging-i686/slapd.service
(from rev 192055, openldap/trunk/slapd.service)
openldap/repos/staging-i686/slapd.tmpfiles
(from rev 192055, openldap/trunk/slapd.tmpfiles)
openldap/repos/staging-x86_64/
openldap/repos/staging-x86_64/PKGBUILD
(from rev 192055, openldap/trunk/PKGBUILD)
openldap/repos/staging-x86_64/openldap-nssov.patch
(from rev 192055, openldap/trunk/openldap-nssov.patch)
openldap/repos/staging-x86_64/openldap-ntlm.patch
(from rev 192055, openldap/trunk/openldap-ntlm.patch)
openldap/repos/staging-x86_64/openldap.install
(from rev 192056, openldap/trunk/openldap.install)
openldap/repos/staging-x86_64/slapd.service
(from rev 192056, openldap/trunk/slapd.service)
openldap/repos/staging-x86_64/slapd.tmpfiles
(from rev 192056, openldap/trunk/slapd.tmpfiles)
-------------------------------------+
staging-i686/PKGBUILD | 114 ++++++++++++++++
staging-i686/openldap-nssov.patch | 30 ++++
staging-i686/openldap-ntlm.patch | 230 ++++++++++++++++++++++++++++++++++
staging-i686/openldap.install | 20 ++
staging-i686/slapd.service | 9 +
staging-i686/slapd.tmpfiles | 1
staging-x86_64/PKGBUILD | 114 ++++++++++++++++
staging-x86_64/openldap-nssov.patch | 30 ++++
staging-x86_64/openldap-ntlm.patch | 230 ++++++++++++++++++++++++++++++++++
staging-x86_64/openldap.install | 20 ++
staging-x86_64/slapd.service | 9 +
staging-x86_64/slapd.tmpfiles | 1
12 files changed, 808 insertions(+)
Copied: openldap/repos/staging-i686/PKGBUILD (from rev 192054, openldap/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-08-05 13:43:59 UTC (rev 192057)
@@ -0,0 +1,114 @@
+# $Id$
+# Maintainer:
+
+pkgbase=openldap
+pkgname=('libldap' 'openldap')
+pkgver=2.4.35
+pkgrel=5
+arch=('i686' 'x86_64')
+url="http://www.openldap.org/"
+license=('custom')
+makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath')
+options=('!makeflags')
+source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
+ slapd.service slapd.tmpfiles openldap-ntlm.patch openldap-nssov.patch)
+sha1sums=('db02243150b050baac6a8ea4145ad73a1f6d2266'
+ '2441815efbfa01ad7a1d39068e5503b53d1d04b0'
+ '59241a813d7508294e4ef1cec3bfe1f5495e109d'
+ 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
+ 'b2d11b4c522750ad9da3409333094fb599ac2c85')
+
+prepare() {
+ cd ${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}"/openldap-ntlm.patch
+ patch -p0 -i "${srcdir}"/openldap-nssov.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}
+ sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
+ ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
+ --sysconfdir=/etc --localstatedir=/var/lib/openldap --sbindir=/usr/bin \
+ --enable-ipv6 --enable-syslog --enable-local \
+ --enable-bdb --enable-hdb \
+ --enable-crypt --enable-dynamic \
+ --with-threads --disable-wrappers \
+ --without-fetch \
+ --enable-spasswd --with-cyrus-sasl \
+ --enable-overlays=mod --enable-modules=yes
+ make
+
+ cd contrib/slapd-modules/nssov
+ make prefix=/usr libexecdir=/usr/lib sysconfdir=/etc/openldap
+ chrpath -d .libs/nssov.so
+}
+
+check() {
+ cd ${pkgbase}-${pkgver}
+ #make test
+}
+
+package_libldap() {
+ pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
+ depends=('libsasl' 'e2fsprogs')
+ backup=('etc/openldap/ldap.conf')
+ options=('!libtool')
+
+ cd ${pkgbase}-${pkgver}
+ for dir in include libraries doc/man/man3 ; do
+ pushd ${dir}
+ make DESTDIR="${pkgdir}" install
+ popd
+ done
+ install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5
+
+# get rid of duplicate default conf files
+ rm "${pkgdir}"/etc/openldap/*.default
+
+ ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2
+ ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2
+
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_openldap() {
+ pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
+ depends=("libldap>=${pkgver}" 'libltdl')
+ backup=('etc/openldap/slapd.conf' 'etc/openldap/slapd.ldif')
+ options=('!libtool' 'emptydirs')
+ install=openldap.install
+
+ cd ${pkgbase}-${pkgver}
+ for dir in clients servers doc/man/man{1,5,8}; do
+ pushd ${dir}
+ make DESTDIR="${pkgdir}" install
+ popd
+ done
+
+ pushd contrib/slapd-modules/nssov
+ install -m755 .libs/nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap
+ ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so
+ ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so.0
+ install -m444 ldapns.schema "${pkgdir}"/etc/openldap/schema
+ popd
+
+ rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
+ rm -r "${pkgdir}"/run
+
+# get rid of duplicate default conf files
+ rm "${pkgdir}"/etc/openldap/*.default
+
+ ln -s ../lib/slapd "${pkgdir}"/usr/bin/slapd
+
+ chown root:439 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}
+ chmod 640 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}
+
+ install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap
+ install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
+ install -Dm644 "${srcdir}"/slapd.service "${pkgdir}"/usr/lib/systemd/system/slapd.service
+ install -Dm644 "${srcdir}"/slapd.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/slapd.conf
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Copied: openldap/repos/staging-i686/openldap-nssov.patch (from rev 192054, openldap/trunk/openldap-nssov.patch)
===================================================================
--- staging-i686/openldap-nssov.patch (rev 0)
+++ staging-i686/openldap-nssov.patch 2013-08-05 13:43:59 UTC (rev 192057)
@@ -0,0 +1,30 @@
+--- contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h 2013-03-28 11:41:51.000000000 -0400
++++ contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h 2012-07-08 04:34:12.000000000 -0400
+@@ -71,6 +71,16 @@
+ 1.0 release of nss-pam-ldapd is made. */
+ #define NSLCD_VERSION 1
+
++/* Get a NSLCD configuration option. There is one request parameter:
++ INT32 NSLCD_CONFIG_*
++ the result value is:
++ STRING value, interpretation depending on request */
++#define NSLCD_ACTION_CONFIG_GET 20006
++
++/* return the message, if any, that is presented to the user when password
++ modification through PAM is prohibited */
++#define NSLCD_CONFIG_PAM_PASSWORD_PROHIBIT_MESSAGE 852
++
+ /* Email alias (/etc/aliases) NSS requests. The result values for a
+ single entry are:
+ STRING alias name
+@@ -249,8 +262,10 @@
+ #define NSLCD_PAM_NEW_AUTHTOK_REQD 12 /* Password expired */
+ #define NSLCD_PAM_ACCT_EXPIRED 13 /* Account expired */
+ #define NSLCD_PAM_SESSION_ERR 14 /* Cannot make/remove session record */
++#define NSLCD_PAM_AUTHTOK_ERR 20 /* Authentication token manipulation error */
+ #define NSLCD_PAM_AUTHTOK_DISABLE_AGING 23 /* Password aging disabled */
+ #define NSLCD_PAM_IGNORE 25 /* Ignore module */
+ #define NSLCD_PAM_ABORT 26 /* Fatal error */
++#define NSLCD_PAM_AUTHTOK_EXPIRED 27 /* authentication token has expired */
+
+ #endif /* not _NSLCD_H */
Copied: openldap/repos/staging-i686/openldap-ntlm.patch (from rev 192054, openldap/trunk/openldap-ntlm.patch)
===================================================================
--- staging-i686/openldap-ntlm.patch (rev 0)
+++ staging-i686/openldap-ntlm.patch 2013-08-05 13:43:59 UTC (rev 192057)
@@ -0,0 +1,230 @@
+Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is
+actually called by evolution-data-server, checked at version 1.12.2.
+Without this patch, the Exchange addressbook integration uses simple binds
+with cleartext passwords.
+
+Russ checked with openldap-software for upstream's opinion on this patch
+on 2007-12-21. Upstream had never received it as a patch submission and
+given that it's apparently only for older Exchange servers that can't do
+SASL and DIGEST-MD5, it's not very appealing.
+
+Bug#457374 filed against evolution-data-server asking if this support is
+still required on 2007-12-21.
+
+Index: trunk/include/ldap.h
+===================================================================
+--- trunk.orig/include/ldap.h
++++ trunk/include/ldap.h
+@@ -2461,5 +2461,25 @@
+ LDAPControl **ctrls,
+ LDAPDerefRes **drp ));
+
++/*
++ * hacks for NTLM
++ */
++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
++#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU)
++LDAP_F( int )
++ldap_ntlm_bind LDAP_P((
++ LDAP *ld,
++ LDAP_CONST char *dn,
++ ber_tag_t tag,
++ struct berval *cred,
++ LDAPControl **sctrls,
++ LDAPControl **cctrls,
++ int *msgidp ));
++LDAP_F( int )
++ldap_parse_ntlm_bind_result LDAP_P((
++ LDAP *ld,
++ LDAPMessage *res,
++ struct berval *challenge));
++
+ LDAP_END_DECL
+ #endif /* _LDAP_H */
+Index: trunk/libraries/libldap/ntlm.c
+===================================================================
+--- /dev/null
++++ trunk/libraries/libldap/ntlm.c
+@@ -0,0 +1,138 @@
++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
++/*
++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
++ */
++
++/* Mostly copied from sasl.c */
++
++#include "portable.h"
++
++#include <stdlib.h>
++#include <stdio.h>
++
++#include <ac/socket.h>
++#include <ac/string.h>
++#include <ac/time.h>
++#include <ac/errno.h>
++
++#include "ldap-int.h"
++
++int
++ldap_ntlm_bind(
++ LDAP *ld,
++ LDAP_CONST char *dn,
++ ber_tag_t tag,
++ struct berval *cred,
++ LDAPControl **sctrls,
++ LDAPControl **cctrls,
++ int *msgidp )
++{
++ BerElement *ber;
++ int rc;
++ ber_int_t id;
++
++ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
++
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( msgidp != NULL );
++
++ if( msgidp == NULL ) {
++ ld->ld_errno = LDAP_PARAM_ERROR;
++ return ld->ld_errno;
++ }
++
++ /* create a message to send */
++ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
++ ld->ld_errno = LDAP_NO_MEMORY;
++ return ld->ld_errno;
++ }
++
++ assert( LBER_VALID( ber ) );
++
++ LDAP_NEXT_MSGID( ld, id );
++ rc = ber_printf( ber, "{it{istON}" /*}*/,
++ id, LDAP_REQ_BIND,
++ ld->ld_version, dn, tag,
++ cred );
++
++ /* Put Server Controls */
++ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
++ ber_free( ber, 1 );
++ return ld->ld_errno;
++ }
++
++ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
++ ld->ld_errno = LDAP_ENCODING_ERROR;
++ ber_free( ber, 1 );
++ return ld->ld_errno;
++ }
++
++ /* send the message */
++ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
++
++ if(*msgidp < 0)
++ return ld->ld_errno;
++
++ return LDAP_SUCCESS;
++}
++
++int
++ldap_parse_ntlm_bind_result(
++ LDAP *ld,
++ LDAPMessage *res,
++ struct berval *challenge)
++{
++ ber_int_t errcode;
++ ber_tag_t tag;
++ BerElement *ber;
++ ber_len_t len;
++
++ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
++
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( res != NULL );
++
++ if ( ld == NULL || res == NULL ) {
++ return LDAP_PARAM_ERROR;
++ }
++
++ if( res->lm_msgtype != LDAP_RES_BIND ) {
++ ld->ld_errno = LDAP_PARAM_ERROR;
++ return ld->ld_errno;
++ }
++
++ if ( ld->ld_error ) {
++ LDAP_FREE( ld->ld_error );
++ ld->ld_error = NULL;
++ }
++ if ( ld->ld_matched ) {
++ LDAP_FREE( ld->ld_matched );
++ ld->ld_matched = NULL;
++ }
++
++ /* parse results */
++
++ ber = ber_dup( res->lm_ber );
++
++ if( ber == NULL ) {
++ ld->ld_errno = LDAP_NO_MEMORY;
++ return ld->ld_errno;
++ }
++
++ tag = ber_scanf( ber, "{ioa" /*}*/,
++ &errcode, challenge, &ld->ld_error );
++ ber_free( ber, 0 );
++
++ if( tag == LBER_ERROR ) {
++ ld->ld_errno = LDAP_DECODING_ERROR;
++ return ld->ld_errno;
++ }
++
++ ld->ld_errno = errcode;
++
++ return( ld->ld_errno );
++}
++
+Index: trunk/libraries/libldap/Makefile.in
+===================================================================
+--- trunk.orig/libraries/libldap/Makefile.in
++++ trunk/libraries/libldap/Makefile.in
+@@ -27,7 +27,7 @@
+ init.c options.c print.c string.c util-int.c schema.c \
+ charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ tls2.c tls_o.c tls_g.c tls_m.c \
+- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ assertion.c deref.c ldif.c fetch.c
+
+ OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
+@@ -40,7 +40,7 @@
+ init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ assertion.lo deref.lo ldif.lo fetch.lo
+
+ LDAP_INCDIR= ../../include
+Index: trunk/libraries/libldap_r/Makefile.in
+===================================================================
+--- trunk.orig/libraries/libldap_r/Makefile.in
++++ trunk/libraries/libldap_r/Makefile.in
+@@ -29,7 +29,7 @@
+ init.c options.c print.c string.c util-int.c schema.c \
+ charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ tls2.c tls_o.c tls_g.c tls_m.c \
+- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ assertion.c deref.c ldif.c fetch.c
+ SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \
+ thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
+@@ -47,7 +47,7 @@
+ init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ assertion.lo deref.lo ldif.lo fetch.lo
+
+ LDAP_INCDIR= ../../include
Copied: openldap/repos/staging-i686/openldap.install (from rev 192055, openldap/trunk/openldap.install)
===================================================================
--- staging-i686/openldap.install (rev 0)
+++ staging-i686/openldap.install 2013-08-05 13:43:59 UTC (rev 192057)
@@ -0,0 +1,20 @@
+post_install(){
+ groupadd -g 439 ldap &>/dev/null
+ useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
+ chown -R ldap:ldap var/lib/openldap &>/dev/null
+}
+
+post_upgrade(){
+ getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null
+ getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
+ chown -R ldap:ldap var/lib/openldap &>/dev/null
+}
+
+post_remove(){
+ if getent passwd ldap >/dev/null 2>&1; then
+ userdel ldap
+ fi
+ if getent group ldap >/dev/null 2>&1; then
+ groupdel ldap
+ fi
+}
Copied: openldap/repos/staging-i686/slapd.service (from rev 192055, openldap/trunk/slapd.service)
===================================================================
--- staging-i686/slapd.service (rev 0)
+++ staging-i686/slapd.service 2013-08-05 13:43:59 UTC (rev 192057)
@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenLDAP server daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/slapd -u ldap -g ldap
+
+[Install]
+WantedBy=multi-user.target
Copied: openldap/repos/staging-i686/slapd.tmpfiles (from rev 192055, openldap/trunk/slapd.tmpfiles)
===================================================================
--- staging-i686/slapd.tmpfiles (rev 0)
+++ staging-i686/slapd.tmpfiles 2013-08-05 13:43:59 UTC (rev 192057)
@@ -0,0 +1 @@
+D /run/openldap 0755 ldap ldap -
Copied: openldap/repos/staging-x86_64/PKGBUILD (from rev 192055, openldap/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-08-05 13:43:59 UTC (rev 192057)
@@ -0,0 +1,114 @@
+# $Id$
+# Maintainer:
+
+pkgbase=openldap
+pkgname=('libldap' 'openldap')
+pkgver=2.4.35
+pkgrel=5
+arch=('i686' 'x86_64')
+url="http://www.openldap.org/"
+license=('custom')
+makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath')
+options=('!makeflags')
+source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
+ slapd.service slapd.tmpfiles openldap-ntlm.patch openldap-nssov.patch)
+sha1sums=('db02243150b050baac6a8ea4145ad73a1f6d2266'
+ '2441815efbfa01ad7a1d39068e5503b53d1d04b0'
+ '59241a813d7508294e4ef1cec3bfe1f5495e109d'
+ 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
+ 'b2d11b4c522750ad9da3409333094fb599ac2c85')
+
+prepare() {
+ cd ${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}"/openldap-ntlm.patch
+ patch -p0 -i "${srcdir}"/openldap-nssov.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}
+ sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
+ ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
+ --sysconfdir=/etc --localstatedir=/var/lib/openldap --sbindir=/usr/bin \
+ --enable-ipv6 --enable-syslog --enable-local \
+ --enable-bdb --enable-hdb \
+ --enable-crypt --enable-dynamic \
+ --with-threads --disable-wrappers \
+ --without-fetch \
+ --enable-spasswd --with-cyrus-sasl \
+ --enable-overlays=mod --enable-modules=yes
+ make
+
+ cd contrib/slapd-modules/nssov
+ make prefix=/usr libexecdir=/usr/lib sysconfdir=/etc/openldap
+ chrpath -d .libs/nssov.so
+}
+
+check() {
+ cd ${pkgbase}-${pkgver}
+ #make test
+}
+
+package_libldap() {
+ pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
+ depends=('libsasl' 'e2fsprogs')
+ backup=('etc/openldap/ldap.conf')
+ options=('!libtool')
+
+ cd ${pkgbase}-${pkgver}
+ for dir in include libraries doc/man/man3 ; do
+ pushd ${dir}
+ make DESTDIR="${pkgdir}" install
+ popd
+ done
+ install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5
+
+# get rid of duplicate default conf files
+ rm "${pkgdir}"/etc/openldap/*.default
+
+ ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2
+ ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2
+
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_openldap() {
+ pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
+ depends=("libldap>=${pkgver}" 'libltdl')
+ backup=('etc/openldap/slapd.conf' 'etc/openldap/slapd.ldif')
+ options=('!libtool' 'emptydirs')
+ install=openldap.install
+
+ cd ${pkgbase}-${pkgver}
+ for dir in clients servers doc/man/man{1,5,8}; do
+ pushd ${dir}
+ make DESTDIR="${pkgdir}" install
+ popd
+ done
+
+ pushd contrib/slapd-modules/nssov
+ install -m755 .libs/nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap
+ ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so
+ ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so.0
+ install -m444 ldapns.schema "${pkgdir}"/etc/openldap/schema
+ popd
+
+ rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
+ rm -r "${pkgdir}"/run
+
+# get rid of duplicate default conf files
+ rm "${pkgdir}"/etc/openldap/*.default
+
+ ln -s ../lib/slapd "${pkgdir}"/usr/bin/slapd
+
+ chown root:439 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}
+ chmod 640 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}
+
+ install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap
+ install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
+ install -Dm644 "${srcdir}"/slapd.service "${pkgdir}"/usr/lib/systemd/system/slapd.service
+ install -Dm644 "${srcdir}"/slapd.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/slapd.conf
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Copied: openldap/repos/staging-x86_64/openldap-nssov.patch (from rev 192055, openldap/trunk/openldap-nssov.patch)
===================================================================
--- staging-x86_64/openldap-nssov.patch (rev 0)
+++ staging-x86_64/openldap-nssov.patch 2013-08-05 13:43:59 UTC (rev 192057)
@@ -0,0 +1,30 @@
+--- contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h 2013-03-28 11:41:51.000000000 -0400
++++ contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h 2012-07-08 04:34:12.000000000 -0400
+@@ -71,6 +71,16 @@
+ 1.0 release of nss-pam-ldapd is made. */
+ #define NSLCD_VERSION 1
+
++/* Get a NSLCD configuration option. There is one request parameter:
++ INT32 NSLCD_CONFIG_*
++ the result value is:
++ STRING value, interpretation depending on request */
++#define NSLCD_ACTION_CONFIG_GET 20006
++
++/* return the message, if any, that is presented to the user when password
++ modification through PAM is prohibited */
++#define NSLCD_CONFIG_PAM_PASSWORD_PROHIBIT_MESSAGE 852
++
+ /* Email alias (/etc/aliases) NSS requests. The result values for a
+ single entry are:
+ STRING alias name
+@@ -249,8 +262,10 @@
+ #define NSLCD_PAM_NEW_AUTHTOK_REQD 12 /* Password expired */
+ #define NSLCD_PAM_ACCT_EXPIRED 13 /* Account expired */
+ #define NSLCD_PAM_SESSION_ERR 14 /* Cannot make/remove session record */
++#define NSLCD_PAM_AUTHTOK_ERR 20 /* Authentication token manipulation error */
+ #define NSLCD_PAM_AUTHTOK_DISABLE_AGING 23 /* Password aging disabled */
+ #define NSLCD_PAM_IGNORE 25 /* Ignore module */
+ #define NSLCD_PAM_ABORT 26 /* Fatal error */
++#define NSLCD_PAM_AUTHTOK_EXPIRED 27 /* authentication token has expired */
+
+ #endif /* not _NSLCD_H */
Copied: openldap/repos/staging-x86_64/openldap-ntlm.patch (from rev 192055, openldap/trunk/openldap-ntlm.patch)
===================================================================
--- staging-x86_64/openldap-ntlm.patch (rev 0)
+++ staging-x86_64/openldap-ntlm.patch 2013-08-05 13:43:59 UTC (rev 192057)
@@ -0,0 +1,230 @@
+Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is
+actually called by evolution-data-server, checked at version 1.12.2.
+Without this patch, the Exchange addressbook integration uses simple binds
+with cleartext passwords.
+
+Russ checked with openldap-software for upstream's opinion on this patch
+on 2007-12-21. Upstream had never received it as a patch submission and
+given that it's apparently only for older Exchange servers that can't do
+SASL and DIGEST-MD5, it's not very appealing.
+
+Bug#457374 filed against evolution-data-server asking if this support is
+still required on 2007-12-21.
+
+Index: trunk/include/ldap.h
+===================================================================
+--- trunk.orig/include/ldap.h
++++ trunk/include/ldap.h
+@@ -2461,5 +2461,25 @@
+ LDAPControl **ctrls,
+ LDAPDerefRes **drp ));
+
++/*
++ * hacks for NTLM
++ */
++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
++#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU)
++LDAP_F( int )
++ldap_ntlm_bind LDAP_P((
++ LDAP *ld,
++ LDAP_CONST char *dn,
++ ber_tag_t tag,
++ struct berval *cred,
++ LDAPControl **sctrls,
++ LDAPControl **cctrls,
++ int *msgidp ));
++LDAP_F( int )
++ldap_parse_ntlm_bind_result LDAP_P((
++ LDAP *ld,
++ LDAPMessage *res,
++ struct berval *challenge));
++
+ LDAP_END_DECL
+ #endif /* _LDAP_H */
+Index: trunk/libraries/libldap/ntlm.c
+===================================================================
+--- /dev/null
++++ trunk/libraries/libldap/ntlm.c
+@@ -0,0 +1,138 @@
++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
++/*
++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
++ */
++
++/* Mostly copied from sasl.c */
++
++#include "portable.h"
++
++#include <stdlib.h>
++#include <stdio.h>
++
++#include <ac/socket.h>
++#include <ac/string.h>
++#include <ac/time.h>
++#include <ac/errno.h>
++
++#include "ldap-int.h"
++
++int
++ldap_ntlm_bind(
++ LDAP *ld,
++ LDAP_CONST char *dn,
++ ber_tag_t tag,
++ struct berval *cred,
++ LDAPControl **sctrls,
++ LDAPControl **cctrls,
++ int *msgidp )
++{
++ BerElement *ber;
++ int rc;
++ ber_int_t id;
++
++ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
++
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( msgidp != NULL );
++
++ if( msgidp == NULL ) {
++ ld->ld_errno = LDAP_PARAM_ERROR;
++ return ld->ld_errno;
++ }
++
++ /* create a message to send */
++ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
++ ld->ld_errno = LDAP_NO_MEMORY;
++ return ld->ld_errno;
++ }
++
++ assert( LBER_VALID( ber ) );
++
++ LDAP_NEXT_MSGID( ld, id );
++ rc = ber_printf( ber, "{it{istON}" /*}*/,
++ id, LDAP_REQ_BIND,
++ ld->ld_version, dn, tag,
++ cred );
++
++ /* Put Server Controls */
++ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
++ ber_free( ber, 1 );
++ return ld->ld_errno;
++ }
++
++ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
++ ld->ld_errno = LDAP_ENCODING_ERROR;
++ ber_free( ber, 1 );
++ return ld->ld_errno;
++ }
++
++ /* send the message */
++ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
++
++ if(*msgidp < 0)
++ return ld->ld_errno;
++
++ return LDAP_SUCCESS;
++}
++
++int
++ldap_parse_ntlm_bind_result(
++ LDAP *ld,
++ LDAPMessage *res,
++ struct berval *challenge)
++{
++ ber_int_t errcode;
++ ber_tag_t tag;
++ BerElement *ber;
++ ber_len_t len;
++
++ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
++
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( res != NULL );
++
++ if ( ld == NULL || res == NULL ) {
++ return LDAP_PARAM_ERROR;
++ }
++
++ if( res->lm_msgtype != LDAP_RES_BIND ) {
++ ld->ld_errno = LDAP_PARAM_ERROR;
++ return ld->ld_errno;
++ }
++
++ if ( ld->ld_error ) {
++ LDAP_FREE( ld->ld_error );
++ ld->ld_error = NULL;
++ }
++ if ( ld->ld_matched ) {
++ LDAP_FREE( ld->ld_matched );
++ ld->ld_matched = NULL;
++ }
++
++ /* parse results */
++
++ ber = ber_dup( res->lm_ber );
++
++ if( ber == NULL ) {
++ ld->ld_errno = LDAP_NO_MEMORY;
++ return ld->ld_errno;
++ }
++
++ tag = ber_scanf( ber, "{ioa" /*}*/,
++ &errcode, challenge, &ld->ld_error );
++ ber_free( ber, 0 );
++
++ if( tag == LBER_ERROR ) {
++ ld->ld_errno = LDAP_DECODING_ERROR;
++ return ld->ld_errno;
++ }
++
++ ld->ld_errno = errcode;
++
++ return( ld->ld_errno );
++}
++
+Index: trunk/libraries/libldap/Makefile.in
+===================================================================
+--- trunk.orig/libraries/libldap/Makefile.in
++++ trunk/libraries/libldap/Makefile.in
+@@ -27,7 +27,7 @@
+ init.c options.c print.c string.c util-int.c schema.c \
+ charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ tls2.c tls_o.c tls_g.c tls_m.c \
+- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ assertion.c deref.c ldif.c fetch.c
+
+ OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
+@@ -40,7 +40,7 @@
+ init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ assertion.lo deref.lo ldif.lo fetch.lo
+
+ LDAP_INCDIR= ../../include
+Index: trunk/libraries/libldap_r/Makefile.in
+===================================================================
+--- trunk.orig/libraries/libldap_r/Makefile.in
++++ trunk/libraries/libldap_r/Makefile.in
+@@ -29,7 +29,7 @@
+ init.c options.c print.c string.c util-int.c schema.c \
+ charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ tls2.c tls_o.c tls_g.c tls_m.c \
+- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ assertion.c deref.c ldif.c fetch.c
+ SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \
+ thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
+@@ -47,7 +47,7 @@
+ init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ assertion.lo deref.lo ldif.lo fetch.lo
+
+ LDAP_INCDIR= ../../include
Copied: openldap/repos/staging-x86_64/openldap.install (from rev 192056, openldap/trunk/openldap.install)
===================================================================
--- staging-x86_64/openldap.install (rev 0)
+++ staging-x86_64/openldap.install 2013-08-05 13:43:59 UTC (rev 192057)
@@ -0,0 +1,20 @@
+post_install(){
+ groupadd -g 439 ldap &>/dev/null
+ useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
+ chown -R ldap:ldap var/lib/openldap &>/dev/null
+}
+
+post_upgrade(){
+ getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null
+ getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
+ chown -R ldap:ldap var/lib/openldap &>/dev/null
+}
+
+post_remove(){
+ if getent passwd ldap >/dev/null 2>&1; then
+ userdel ldap
+ fi
+ if getent group ldap >/dev/null 2>&1; then
+ groupdel ldap
+ fi
+}
Copied: openldap/repos/staging-x86_64/slapd.service (from rev 192056, openldap/trunk/slapd.service)
===================================================================
--- staging-x86_64/slapd.service (rev 0)
+++ staging-x86_64/slapd.service 2013-08-05 13:43:59 UTC (rev 192057)
@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenLDAP server daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/slapd -u ldap -g ldap
+
+[Install]
+WantedBy=multi-user.target
Copied: openldap/repos/staging-x86_64/slapd.tmpfiles (from rev 192056, openldap/trunk/slapd.tmpfiles)
===================================================================
--- staging-x86_64/slapd.tmpfiles (rev 0)
+++ staging-x86_64/slapd.tmpfiles 2013-08-05 13:43:59 UTC (rev 192057)
@@ -0,0 +1 @@
+D /run/openldap 0755 ldap ldap -
More information about the arch-commits
mailing list