packages: openldap/openldap-contrib-modules.patch, openldap/openldap.spec, ...
qboosh
qboosh at pld-linux.org
Sun Jul 3 15:36:50 CEST 2011
Author: qboosh Date: Sun Jul 3 13:36:50 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.4.26
- updated contrib-modules patch
- removed obsolete smbk5pwd-shadowLastChange patch
---- Files affected:
packages/openldap:
openldap-contrib-modules.patch (1.2 -> 1.3) , openldap.spec (1.358 -> 1.359) , openldap-smbk5pwd-shadowLastChange.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/openldap/openldap-contrib-modules.patch
diff -u packages/openldap/openldap-contrib-modules.patch:1.2 packages/openldap/openldap-contrib-modules.patch:1.3
--- packages/openldap/openldap-contrib-modules.patch:1.2 Tue Mar 29 19:47:19 2011
+++ packages/openldap/openldap-contrib-modules.patch Sun Jul 3 15:36:44 2011
@@ -58,7 +58,7 @@
--- openldap-2.4.25/contrib/slapd-modules/addpartial/Makefile 2009-01-21 01:18:19.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/addpartial/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
--# $OpenLDAP: pkg/ldap/contrib/slapd-modules/addpartial/Makefile,v 1.1.2.4 2009/01/21 00:18:19 quanah Exp $
+-# $OpenLDAP$
-OPENLDAP_SRC=../../..
-OPENLDAP_BLD=../../..
-CPPFLAGS+=-I${OPENLDAP_SRC}/include -I${OPENLDAP_SRC}/servers/slapd -I${OPENLDAP_BLD}/include
@@ -125,7 +125,7 @@
--- 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: pkg/ldap/contrib/slapd-modules/allowed/Makefile,v 1.1.2.4 2011/01/04 23:49:30 kurt Exp $
+-# $OpenLDAP$
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
-#
-# Copyright 1998-2011 The OpenLDAP Foundation.
@@ -254,7 +254,7 @@
--- openldap-2.4.25/contrib/slapd-modules/cloak/Makefile 2011-03-24 19:15:01.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/cloak/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
--# $OpenLDAP: pkg/ldap/contrib/slapd-modules/cloak/Makefile,v 1.2.2.2 2011/03/24 18:15:01 quanah Exp $
+-# $OpenLDAP$
-CPPFLAGS+=-I../../../include -I../../../servers/slapd
-CPPFLAGS+=-DSLAPD_OVER_CLOAK=SLAPD_MOD_DYNAMIC
-LIBS=-lldap_r -llber -lcrypto
@@ -301,7 +301,7 @@
--- 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: pkg/ldap/contrib/slapd-modules/comp_match/Makefile,v 1.11.2.6 2011/01/04 23:49:31 kurt Exp $
+-# $OpenLDAP$
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
-#
-# Copyright 2003-2011 The OpenLDAP Foundation.
@@ -451,7 +451,7 @@
--- 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: pkg/ldap/contrib/slapd-modules/dupent/Makefile,v 1.1.2.3 2011/01/04 23:49:32 kurt Exp $
+-# $OpenLDAP$
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
-#
-# Copyright 1998-2011 The OpenLDAP Foundation.
@@ -558,7 +558,7 @@
--- openldap-2.4.25/contrib/slapd-modules/lastbind/Makefile 2011-03-25 20:39:47.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/lastbind/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
--# $OpenLDAP: pkg/ldap/contrib/slapd-modules/lastbind/Makefile,v 1.2.2.4 2011/03/25 19:39:47 quanah Exp $
+-# $OpenLDAP$
-# Copyright 2009 Jonathan Clarke <jonathan at phillipoux.net>.
-# All rights reserved.
-#
@@ -675,7 +675,7 @@
--- 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: pkg/ldap/contrib/slapd-modules/noopsrch/Makefile,v 1.1.2.3 2011/01/04 23:49:32 kurt Exp $
+-# $OpenLDAP$
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
-#
-# Copyright 1998-2011 The OpenLDAP Foundation.
@@ -755,7 +755,7 @@
--- openldap-2.4.25/contrib/slapd-modules/nops/Makefile 2009-04-28 01:35:48.000000000 +0200
+++ openldap-2.4.25-contrib/contrib/slapd-modules/nops/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
--# $OpenLDAP: pkg/ldap/contrib/slapd-modules/nops/Makefile,v 1.1.2.4 2009/04/27 23:35:48 quanah Exp $
+-# $OpenLDAP$
-CPPFLAGS+=-I../../../include -I../../../servers/slapd
-CPPFLAGS+=-DSLAPD_OVER_NOPS=SLAPD_MOD_DYNAMIC
-LIBS=-L$(PREFIX)/lib -lldap_r -llber -lcrypto
@@ -808,7 +808,7 @@
--- 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: pkg/ldap/contrib/slapd-modules/nssov/Makefile,v 1.1.2.8 2011/01/04 23:49:33 kurt Exp $
+-# $OpenLDAP$
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
-#
-# Copyright 2008-2011 The OpenLDAP Foundation.
@@ -921,7 +921,7 @@
--- openldap-2.4.25/contrib/slapd-modules/passwd/Makefile 2009-04-28 03:06:14.000000000 +0200
+++ openldap-2.4.25-contrib/contrib/slapd-modules/passwd/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
--# $OpenLDAP: pkg/ldap/contrib/slapd-modules/passwd/Makefile,v 1.2.2.2 2009/04/28 01:06:14 quanah Exp $
+-# $OpenLDAP$
-CPPFLAGS+=-I../../../include -I../../../servers/slapd
-
-all: kerberos.la netscape.la radius.la
@@ -1027,7 +1027,7 @@
--- 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: pkg/ldap/contrib/slapd-modules/proxyOld/Makefile,v 1.1.2.3 2011/01/04 23:49:35 kurt Exp $
+-# $OpenLDAP$
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
-#
-# Copyright 2005-2011 The OpenLDAP Foundation.
@@ -1099,7 +1099,7 @@
--- 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: pkg/ldap/contrib/slapd-modules/samba4/Makefile,v 1.3.2.4 2011/01/04 23:49:36 kurt Exp $
+-# $OpenLDAP$
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
-#
-# Copyright 1998-2011 The OpenLDAP Foundation.
@@ -1238,11 +1238,10 @@
+ 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/smbk5pwd/Makefile openldap-2.4.25-contrib/contrib/slapd-modules/smbk5pwd/Makefile
---- openldap-2.4.25/contrib/slapd-modules/smbk5pwd/Makefile 2011-01-05 00:49:36.000000000 +0100
-+++ openldap-2.4.25-contrib/contrib/slapd-modules/smbk5pwd/Makefile 1970-01-01 01:00:00.000000000 +0100
+--- 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: pkg/ldap/contrib/slapd-modules/smbk5pwd/Makefile,v 1.1.6.6 2011/01/04 23:49:36 kurt Exp $
+-# $OpenLDAP$
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
-#
-# Copyright 1998-2011 The OpenLDAP Foundation.
@@ -1260,8 +1259,8 @@
-OPT=-g -O2
-CC=gcc
-
--# Omit DO_KRB5 or DO_SAMBA if you don't want to support it.
--DEFS=-DDO_KRB5 -DDO_SAMBA
+-# 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=
@@ -1314,7 +1313,7 @@
+
+HEIMDAL_LIBS = -lkrb5 -lkadm5srv
+
-+MOD_DEFS = -DSLAPD_IMPORT -DDO_SAMBA -DDO_KRB5
++MOD_DEFS = -DSLAPD_IMPORT -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
+MOD_LIBS = $(HEIMDAL_LIBS)
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
================================================================
Index: packages/openldap/openldap.spec
diff -u packages/openldap/openldap.spec:1.358 packages/openldap/openldap.spec:1.359
--- packages/openldap/openldap.spec:1.358 Wed Mar 30 11:47:02 2011
+++ packages/openldap/openldap.spec Sun Jul 3 15:36:44 2011
@@ -25,12 +25,12 @@
Summary(ru.UTF-8): Образцы клиентов LDAP
Summary(uk.UTF-8): Зразки клієнтів LDAP
Name: openldap
-Version: 2.4.25
+Version: 2.4.26
Release: 1
License: OpenLDAP Public License
Group: Networking/Daemons
Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
-# Source0-md5: ec63f9c2add59f323a0459128846905b
+# Source0-md5: f36f3086031dd56ae94f722ffae8df5e
Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
# Source1-md5: 718082e7e35fc48478a2334b0bc4cd11
Source2: ldap.init
@@ -54,13 +54,12 @@
Patch13: %{name}-ldapc++.patch
Patch14: %{name}-pie.patch
Patch15: %{name}-gethostbyXXXX_r.patch
-Patch16: %{name}-smbk5pwd-shadowLastChange.patch
-Patch17: %{name}-contrib-modules.patch
-Patch18: %{name}-contrib-krb5.patch
+Patch16: %{name}-contrib-modules.patch
+Patch17: %{name}-contrib-krb5.patch
# Patch for the evolution library
Patch100: %{name}-ntlm.diff
URL: http://www.openldap.org/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.59
BuildRequires: automake
%if %{with sasl}
BuildRequires: cyrus-sasl-devel >= 2.1.15
@@ -1220,10 +1219,9 @@
%patch13 -p1
%patch14 -p1
%patch15 -p1
-%patch16 -p0
-%patch17 -p1
+%patch16 -p1
%if %{with krb5}
-%patch18 -p1
+%patch17 -p1
%endif
cd ..
@@ -2336,6 +2334,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.359 2011/07/03 13:36:44 qboosh
+- updated to 2.4.26
+- updated contrib-modules patch
+- removed obsolete smbk5pwd-shadowLastChange patch
+
Revision 1.358 2011/03/30 09:47:02 baggins
- rel 1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap-contrib-modules.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap.spec?r1=1.358&r2=1.359&f=u
More information about the pld-cvs-commit
mailing list