packages: openldap/openldap-contrib-modules.patch, openldap/openldap.spec -...
alucard
alucard at pld-linux.org
Tue Feb 14 15:29:56 CET 2012
Author: alucard Date: Tue Feb 14 14:29:56 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.4.29
- updated contrib-modules patch (fixed upstream)
---- Files affected:
packages/openldap:
openldap-contrib-modules.patch (1.4 -> 1.5) , openldap.spec (1.367 -> 1.368)
---- Diffs:
================================================================
Index: packages/openldap/openldap-contrib-modules.patch
diff -u packages/openldap/openldap-contrib-modules.patch:1.4 packages/openldap/openldap-contrib-modules.patch:1.5
--- packages/openldap/openldap-contrib-modules.patch:1.4 Sun Nov 27 11:17:03 2011
+++ packages/openldap/openldap-contrib-modules.patch Tue Feb 14 15:29:50 2012
@@ -121,56 +121,6 @@
+XDEFS = $(MODULES_CPPFLAGS)
+
+MANSECT=5
-diff -urN openldap-2.4.25/contrib/slapd-modules/allowed/Makefile openldap-2.4.25-contrib/contrib/slapd-modules/allowed/Makefile
---- openldap-2.4.25/contrib/slapd-modules/allowed/Makefile 2011-01-05 00:49:30.000000000 +0100
-+++ openldap-2.4.25-contrib/contrib/slapd-modules/allowed/Makefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,46 +0,0 @@
--# $OpenLDAP$
--# This work is part of OpenLDAP Software <http://www.openldap.org/>.
--#
--# Copyright 1998-2011 The OpenLDAP Foundation.
--# Copyright 2004 Howard Chu, Symas Corp. All Rights Reserved.
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted only as authorized by the OpenLDAP
--# Public License.
--#
--# A copy of this license is available in the file LICENSE in the
--# top-level directory of the distribution or, alternatively, at
--# <http://www.OpenLDAP.org/license.html>.
--
--PREFIX=/opt/openldap-HEAD
--
--LIBTOOL=../../../libtool
--OPT=-g -O2
--CC=gcc
--
--DEFS=-DSLAPD_OVER_ALLOWED=SLAPD_MOD_DYNAMIC
--
--LDAP_INC=-I../../../include -I../../../servers/slapd
--INCS=$(LDAP_INC)
--
--LDAP_LIB=-lldap_r -llber -L../../../lib
--LDAP_LIB=
--LIBS=$(LDAP_LIB)
--
--all: allowed.la
--
--
--allowed.lo: allowed.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
--
--allowed.la: allowed.lo
-- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-- -rpath $(PREFIX)/lib -module -o $@ $? $(LIBS)
--
--clean:
-- rm -f allowed.o allowed.lo allowed.la
--
--install: allowed.la
-- mkdir -p $(PREFIX)/libexec/openldap
-- $(LIBTOOL) --mode=install cp allowed.la $(PREFIX)/libexec/openldap
-- $(LIBTOOL) --finish $(PREFIX)/libexec/openldap
diff -urN openldap-2.4.25/contrib/slapd-modules/allowed/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/allowed/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/allowed/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/allowed/Makefile.in 2011-03-28 17:51:20.127152000 +0200
@@ -297,76 +247,6 @@
+XDEFS = $(MODULES_CPPFLAGS)
+
+MANSECT=5
-diff -urN openldap-2.4.25/contrib/slapd-modules/comp_match/Makefile openldap-2.4.25-contrib/contrib/slapd-modules/comp_match/Makefile
---- openldap-2.4.25/contrib/slapd-modules/comp_match/Makefile 2011-01-05 00:49:31.000000000 +0100
-+++ openldap-2.4.25-contrib/contrib/slapd-modules/comp_match/Makefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,66 +0,0 @@
--# $OpenLDAP$
--# This work is part of OpenLDAP Software <http://www.openldap.org/>.
--#
--# Copyright 2003-2011 The OpenLDAP Foundation.
--# Portions Copyright 2004 by IBM Corporation.
--# All rights reserved.
--
--# Copyright 2004 Sang Seok Lim, IBM Corp. All Rights Reserved.
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted only as authorized by the OpenLDAP
--# Public License.
--#
--# A copy of this license is available in the file LICENSE in the
--# top-level directory of the distribution or, alternatively, at
--# <http://www.OpenLDAP.org/license.html>.
--
--topsrcdir = ../../..
--snaccdir = ../$(topsrcdir)/snacc
--openssldir = /usr/local/include/openssl
--
--LIBTOOL=$(topsrcdir)/libtool
--OPT=-g -O2 -DLDAP_COMPONENT
--CC=gcc
--
--SNACC_INC=-I$(snaccdir) -I$(snaccdir)/c-lib/inc
--LDAP_INC=-I$(topsrcdir)/include -I$(topsrcdir)/servers/slapd -I$(topbuilddir)/include
--OPENSSL_INC=-I$(openssldir)
--INCS=$(LDAP_INC) $(SNACC_INC) $(OPENSSL_INC)
--
--SNACC_LIB=$(snaccdir)/c-lib/libcasn1.a
--SSL_LIB=/usr/local/lib/lcrypto
--
--LIBS=$(LDAP_LIB) $(SNACC_LIB) $(SSL_LIB)
--
--all: compmatch.la
--
--
--componentlib.lo: componentlib.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(INCS) -c $?
--
--certificate.lo: certificate.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(INCS) -c $?
--
--crl.lo: crl.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(INCS) -c $?
--
--authorityKeyIdentifier.lo: authorityKeyIdentifier.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(INCS) -c $?
--
--asn_to_syn_mr.lo: asn_to_syn_mr.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(INCS) -c $?
--
--init.lo: init.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(INCS) -c $?
--
--compmatch.la: componentlib.lo init.lo certificate.lo asn_to_syn_mr.lo authorityKeyIdentifier.lo crl.lo
-- $(LIBTOOL) --mode=link $(CC) $(OPT) $(LIBS) -version-info 0:0:0 \
-- -rpath /usr/local/libexec/openldap -module -o $@ $? $(LIBS)
--
--clean:
-- \rm compmatch.la componentlib.lo certificate.lo asn_to_syn_mr.lo authorityKeyIdentifier.lo crl.lo\
-- init.o init.lo componentlib.o certificate.o asn_to_syn_mr.o authorityKeyIdentifier.o crl.o
--install:
-- cp -r .libs $(topsrcdir)/tests/data/comp_libs
-- cp compmatch.la $(topsrcdir)/tests/data/comp_libs
diff -urN openldap-2.4.25/contrib/slapd-modules/comp_match/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/comp_match/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/comp_match/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/comp_match/Makefile.in 2011-03-28 17:51:20.128152000 +0200
@@ -447,62 +327,6 @@
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
-diff -urN openldap-2.4.25/contrib/slapd-modules/dupent/Makefile openldap-2.4.25-contrib/contrib/slapd-modules/dupent/Makefile
---- openldap-2.4.25/contrib/slapd-modules/dupent/Makefile 2011-01-05 00:49:32.000000000 +0100
-+++ openldap-2.4.25-contrib/contrib/slapd-modules/dupent/Makefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,52 +0,0 @@
--# $OpenLDAP$
--# This work is part of OpenLDAP Software <http://www.openldap.org/>.
--#
--# Copyright 1998-2011 The OpenLDAP Foundation.
--# Copyright 2004 Howard Chu, Symas Corp. All Rights Reserved.
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted only as authorized by the OpenLDAP
--# Public License.
--#
--# A copy of this license is available in the file LICENSE in the
--# top-level directory of the distribution or, alternatively, at
--# <http://www.OpenLDAP.org/license.html>.
--
--LIBTOOL=../../../libtool
--OPT=-DSLAPD_OVER_DUPENT=2 -g -O2
--#LIBTOOL=../../../../ldap-devel/libtool
--#OPT=-DSLAPD_OVER_DUPENT=2 -g -O0
--CC=gcc
--
--LDAP_INC=-I../../../include -I../../../servers/slapd
--#LDAP_INC=-I../../../include -I../../../servers/slapd -I../../../../ldap-devel/include
--INCS=$(LDAP_INC)
--
--LDAP_LIB=-lldap_r -llber
--LIBS=$(LDAP_LIB)
--
--prefix=/usr/local
--exec_prefix=$(prefix)
--ldap_subdir=/openldap
--
--libdir=$(exec_prefix)/lib
--libexecdir=$(exec_prefix)/libexec
--moduledir = $(libexecdir)$(ldap_subdir)
--
--all: dupent.la
--
--
--dupent.lo: dupent.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
--
--dupent.la: dupent.lo
-- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-- -rpath $(moduledir) -module -o $@ $? $(LIBS)
--
--clean:
-- rm -f dupent.lo dupent.la
--
--install: dupent.la
-- mkdir -p $(DESTDIR)$(moduledir)
-- $(LIBTOOL) --mode=install cp dupent.la $(DESTDIR)$(moduledir)
--
diff -urN openldap-2.4.25/contrib/slapd-modules/dupent/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/dupent/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/dupent/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/dupent/Makefile.in 2011-03-28 17:51:20.133152000 +0200
@@ -671,62 +495,6 @@
+ samba4 \
+ smbk5pwd \
+ trace
-diff -urN openldap-2.4.25/contrib/slapd-modules/noopsrch/Makefile openldap-2.4.25-contrib/contrib/slapd-modules/noopsrch/Makefile
---- openldap-2.4.25/contrib/slapd-modules/noopsrch/Makefile 2011-01-05 00:49:32.000000000 +0100
-+++ openldap-2.4.25-contrib/contrib/slapd-modules/noopsrch/Makefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,52 +0,0 @@
--# $OpenLDAP$
--# This work is part of OpenLDAP Software <http://www.openldap.org/>.
--#
--# Copyright 1998-2011 The OpenLDAP Foundation.
--# Copyright 2004 Howard Chu, Symas Corp. All Rights Reserved.
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted only as authorized by the OpenLDAP
--# Public License.
--#
--# A copy of this license is available in the file LICENSE in the
--# top-level directory of the distribution or, alternatively, at
--# <http://www.OpenLDAP.org/license.html>.
--
--LIBTOOL=../../../libtool
--OPT=-DSLAPD_OVER_NOOPSRCH=2 -g -O2
--#LIBTOOL=../../../../ldap-devel/libtool
--#OPT=-DSLAPD_OVER_NOOPSRCH=2 -g -O0
--CC=gcc
--
--LDAP_INC=-I../../../include -I../../../servers/slapd
--#LDAP_INC=-I../../../include -I../../../servers/slapd -I../../../../ldap-devel/include
--INCS=$(LDAP_INC)
--
--LDAP_LIB=-lldap_r -llber
--LIBS=$(LDAP_LIB)
--
--prefix=/usr/local
--exec_prefix=$(prefix)
--ldap_subdir=/openldap
--
--libdir=$(exec_prefix)/lib
--libexecdir=$(exec_prefix)/libexec
--moduledir = $(libexecdir)$(ldap_subdir)
--
--all: noopsrch.la
--
--
--noopsrch.lo: noopsrch.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
--
--noopsrch.la: noopsrch.lo
-- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-- -rpath $(moduledir) -module -o $@ $? $(LIBS)
--
--clean:
-- rm -f noopsrch.lo noopsrch.la
--
--install: noopsrch.la
-- mkdir -p $(DESTDIR)$(moduledir)
-- $(LIBTOOL) --mode=install cp noopsrch.la $(DESTDIR)$(moduledir)
--
diff -urN openldap-2.4.25/contrib/slapd-modules/noopsrch/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/noopsrch/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/noopsrch/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/noopsrch/Makefile.in 2011-03-28 17:51:20.144152000 +0200
@@ -804,81 +572,6 @@
+XDEFS = $(MODULES_CPPFLAGS)
+
+MANSECT=5
-diff -urN openldap-2.4.25/contrib/slapd-modules/nssov/Makefile openldap-2.4.25-contrib/contrib/slapd-modules/nssov/Makefile
---- openldap-2.4.25/contrib/slapd-modules/nssov/Makefile 2011-01-05 00:49:33.000000000 +0100
-+++ openldap-2.4.25-contrib/contrib/slapd-modules/nssov/Makefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,71 +0,0 @@
--# $OpenLDAP$
--# This work is part of OpenLDAP Software <http://www.openldap.org/>.
--#
--# Copyright 2008-2011 The OpenLDAP Foundation.
--# Portions Copyright 2008 Howard Chu, Symas Corp. All Rights Reserved.
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted only as authorized by the OpenLDAP
--# Public License.
--#
--# A copy of this license is available in the file LICENSE in the
--# top-level directory of the distribution or, alternatively, at
--# <http://www.OpenLDAP.org/license.html>.
--
--# Path to the OpenLDAP source tree
--LDAPSRC=../../..
--
--# Path to the OpenLDAP object tree - same as above unless
--# you're doing out-of-tree builds.
--LDAPOBJ=../../..
--
--LIBTOOL=$(LDAPOBJ)/libtool
--OPT=-g -O2
--CC=gcc
--
--LDAP_INC=-I$(LDAPOBJ)/include -I$(LDAPSRC)/include -I$(LDAPSRC)/servers/slapd
--NLDAPD_INC=-Inss-pam-ldapd
--INCS=$(LDAP_INC) $(NLDAPD_INC)
--
--LDAP_LIB=-lldap_r -llber
--LIBS=$(LDAP_LIB)
--
--prefix=/usr/local
--exec_prefix=$(prefix)
--ldap_subdir=/openldap
--
--libdir=$(exec_prefix)/lib
--libexecdir=$(exec_prefix)/libexec
--moduledir = $(libexecdir)$(ldap_subdir)
--sysconfdir = $(prefix)/etc$(ldap_subdir)
--schemadir = $(sysconfdir)/schema
--
--all: nssov.la
--
--XOBJS = tio.lo
--
--OBJS = alias.lo ether.lo group.lo host.lo netgroup.lo network.lo \
-- nssov.lo passwd.lo protocol.lo rpc.lo service.lo shadow.lo pam.lo
--
--.SUFFIXES: .c .o .lo
--
--.c.lo:
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
--
--tio.lo: nss-pam-ldapd/tio.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
--
--$(OBJS): nssov.h
--
--nssov.la: $(OBJS) $(XOBJS)
-- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-- -rpath $(libdir) -module -o $@ $(OBJS) $(XOBJS) $(LIBS)
--
--install: nssov.la
-- mkdir -p $(DESTDIR)$(moduledir)
-- $(LIBTOOL) --mode=install cp nssov.la $(DESTDIR)$(moduledir)
-- cp ldapns.schema $(DESTDIR)$(schemadir)
--
--clean:
-- rm -f *.*o *.la .libs/*
-- rm -rf .libs
diff -urN openldap-2.4.25/contrib/slapd-modules/nssov/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/nssov/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/nssov/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/nssov/Makefile.in 2011-03-28 19:59:41.531991162 +0200
@@ -1033,54 +726,6 @@
+ SCR=''; for i in $$OBJ2; do SCR="$$SCR -e s/^$$i.lo:/$$i.o:/"; done; \
+ mv Makefile Makefile.bak; $(SED) $$SCR Makefile.bak > Makefile && \
+ $(RM) Makefile.bak; fi
-diff -urN openldap-2.4.25/contrib/slapd-modules/proxyOld/Makefile openldap-2.4.25-contrib/contrib/slapd-modules/proxyOld/Makefile
---- openldap-2.4.25/contrib/slapd-modules/proxyOld/Makefile 2011-01-05 00:49:35.000000000 +0100
-+++ openldap-2.4.25-contrib/contrib/slapd-modules/proxyOld/Makefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,44 +0,0 @@
--# $OpenLDAP$
--# This work is part of OpenLDAP Software <http://www.openldap.org/>.
--#
--# Copyright 2005-2011 The OpenLDAP Foundation.
--# Portions Copyright 2005 Howard Chu, Symas Corp. All Rights Reserved.
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted only as authorized by the OpenLDAP
--# Public License.
--#
--# A copy of this license is available in the file LICENSE in the
--# top-level directory of the distribution or, alternatively, at
--# <http://www.OpenLDAP.org/license.html>.
--#
--LIBTOOL=../../../libtool
--ROOT=../../../../..
--rundir=$(LIB)
--instdir=$(LIB)/openldap
--CFLAGS=-g -O2
--CC=$(C_CC)
--INSTALL=../../../build/shtool install -c
--LTVER=1:0:0
--
--INCS=-I../../../include -I../../../servers/slapd -I ../../../../../opt/symas/include
--
--LIBS=../../../libraries/libldap_r/libldap_r.la ../../../libraries/liblber/liblber.la
--
--all: proxyOld.la
--
--proxyOld.lo: proxyOld.c
-- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $?
--
--proxyOld.la: proxyOld.lo
-- $(LIBTOOL) --mode=link $(CC) $(OPT) $(LDFLAGS) -version-info $(LTVER) \
-- -rpath $(rundir) -module -o $@ $? $(LIBS) $(LIBEXTRAS)
--
--install:
-- -mkdir $(DESTDIR)$(instdir)
-- $(LIBTOOL) --mode=install $(INSTALL) -m 644 proxyOld.la $(DESTDIR)$(instdir)
--
--clean:
-- rm -rf *.o *.lo *.la .libs .libt
--
--veryclean: clean
diff -urN openldap-2.4.25/contrib/slapd-modules/proxyOld/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/proxyOld/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/proxyOld/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/proxyOld/Makefile.in 2011-03-28 17:51:20.149152000 +0200
@@ -1105,86 +750,6 @@
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
-diff -urN openldap-2.4.25/contrib/slapd-modules/samba4/Makefile openldap-2.4.25-contrib/contrib/slapd-modules/samba4/Makefile
---- openldap-2.4.25/contrib/slapd-modules/samba4/Makefile 2011-01-05 00:49:36.000000000 +0100
-+++ openldap-2.4.25-contrib/contrib/slapd-modules/samba4/Makefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,76 +0,0 @@
--# $OpenLDAP$
--# This work is part of OpenLDAP Software <http://www.openldap.org/>.
--#
--# Copyright 1998-2011 The OpenLDAP Foundation.
--# Copyright 2004 Howard Chu, Symas Corp. All Rights Reserved.
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted only as authorized by the OpenLDAP
--# Public License.
--#
--# A copy of this license is available in the file LICENSE in the
--# top-level directory of the distribution or, alternatively, at
--# <http://www.OpenLDAP.org/license.html>.
--
--LDAP_SRC=../../..
--# craft according to your installation
--LDAP_BUILD=../../..
--
--LIBTOOL=$(LDAP_BUILD)/libtool
--OPT=-g -O2
--CC=gcc
--
--DEFS=-DSLAPD_OVER_RDNVAL=2 -DSLAPD_OVER_PGUID=2 -DSLAPD_OVER_VERNUM=2
--
--LDAP_INC=-I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd \
-- -I$(LDAP_BUILD)/include
--INCS=$(LDAP_INC)
--
--LDAP_LIB=-lldap_r -llber
--LIBS=$(LDAP_LIB)
--
--prefix=/usr/local
--exec_prefix=$(prefix)
--ldap_subdir=/openldap
--
--libdir=$(exec_prefix)/lib
--libexecdir=$(exec_prefix)/libexec
--moduledir = $(libexecdir)$(ldap_subdir)
--
--PROGRAMS = pguid.la rdnval.la vernum.la
--
--all: $(PROGRAMS)
--
--pguid.lo: pguid.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
--
--pguid.la: pguid.lo
-- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-- -rpath $(moduledir) -module -o $@ $? $(LIBS)
--
--rdnval.lo: rdnval.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
--
--rdnval.la: rdnval.lo
-- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-- -rpath $(moduledir) -module -o $@ $? $(LIBS)
--
--vernum.lo: vernum.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
--
--vernum.la: vernum.lo
-- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-- -rpath $(moduledir) -module -o $@ $? $(LIBS)
--
--clean:
-- rm -f \
-- pguid.o pguid.lo pguid.la \
-- rdnval.o rdnval.lo rdnval.la \
-- vernum.o vernum.lo vernum.la
--
--install: $(PROGRAMS)
-- mkdir -p $(DESTDIR)$(moduledir)
-- for p in $(PROGRAMS) ; do \
-- $(LIBTOOL) --mode=install cp $$p $(DESTDIR)$(moduledir) ; \
-- done
--
diff -urN openldap-2.4.25/contrib/slapd-modules/samba4/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/samba4/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/samba4/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/samba4/Makefile.in 2011-03-28 17:51:20.150152000 +0200
@@ -1248,64 +813,6 @@
+ SCR=''; for i in $$OBJ2; do SCR="$$SCR -e s/^$$i.lo:/$$i.o:/"; done; \
+ mv Makefile Makefile.bak; $(SED) $$SCR Makefile.bak > Makefile && \
+ $(RM) Makefile.bak; fi
---- openldap-2.4.26/contrib/slapd-modules/smbk5pwd/Makefile.orig 2011-06-30 17:13:36.000000000 +0200
-+++ openldap-2.4.26/contrib/slapd-modules/smbk5pwd/Makefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,55 +0,0 @@
--# $OpenLDAP$
--# This work is part of OpenLDAP Software <http://www.openldap.org/>.
--#
--# Copyright 1998-2011 The OpenLDAP Foundation.
--# Copyright 2004 Howard Chu, Symas Corp. All Rights Reserved.
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted only as authorized by the OpenLDAP
--# Public License.
--#
--# A copy of this license is available in the file LICENSE in the
--# top-level directory of the distribution or, alternatively, at
--# <http://www.OpenLDAP.org/license.html>.
--
--LIBTOOL=../../../libtool
--OPT=-g -O2
--CC=gcc
--
--# Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it.
--DEFS=-DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
--
--HEIMDAL_INC=-I/usr/heimdal/include
--SSL_INC=
--LDAP_INC=-I../../../include -I../../../servers/slapd
--INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
--
--HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv
--SSL_LIB=-lcrypto
--LDAP_LIB=-lldap_r -llber
--LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
--
--prefix=/usr/local
--exec_prefix=$(prefix)
--ldap_subdir=/openldap
--
--libdir=$(exec_prefix)/lib
--libexecdir=$(exec_prefix)/libexec
--moduledir = $(libexecdir)$(ldap_subdir)
--
--all: smbk5pwd.la
--
--
--smbk5pwd.lo: smbk5pwd.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
--
--smbk5pwd.la: smbk5pwd.lo
-- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-- -rpath $(moduledir) -module -o $@ $? $(LIBS)
--
--clean:
-- rm -f smbk5pwd.lo smbk5pwd.la
--
--install: smbk5pwd.la
-- mkdir -p $(DESTDIR)$(moduledir)
-- $(LIBTOOL) --mode=install cp smbk5pwd.la $(DESTDIR)$(moduledir)
diff -urN openldap-2.4.25/contrib/slapd-modules/smbk5pwd/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/smbk5pwd/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/smbk5pwd/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/smbk5pwd/Makefile.in 2011-03-28 17:51:20.152152000 +0200
================================================================
Index: packages/openldap/openldap.spec
diff -u packages/openldap/openldap.spec:1.367 packages/openldap/openldap.spec:1.368
--- packages/openldap/openldap.spec:1.367 Tue Jan 31 12:53:48 2012
+++ packages/openldap/openldap.spec Tue Feb 14 15:29:50 2012
@@ -25,12 +25,12 @@
Summary(ru.UTF-8): Образцы клиентов LDAP
Summary(uk.UTF-8): Зразки клієнтів LDAP
Name: openldap
-Version: 2.4.28
-Release: 4
+Version: 2.4.29
+Release: 1
License: OpenLDAP Public License
Group: Networking/Daemons
Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
-# Source0-md5: 196023e552eeb259e048edcd61a9645b
+# Source0-md5: 9821ee7d3316c55030106589a6adb26e
Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
# Source1-md5: 718082e7e35fc48478a2334b0bc4cd11
Source2: ldap.init
@@ -2369,6 +2369,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.368 2012/02/14 14:29:50 alucard
+- up to 2.4.29
+- updated contrib-modules patch (fixed upstream)
+
Revision 1.367 2012/01/31 11:53:48 baggins
- release 4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap-contrib-modules.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap.spec?r1=1.367&r2=1.368&f=u
More information about the pld-cvs-commit
mailing list