rpms/openldap/devel openldap-2.3.37-smbk5pwd.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 openldap.spec, 1.83, 1.84 sources, 1.30, 1.31 openldap-2.3.34-smbk5pwd.patch, 1.3, NONE

Jan Šafránek (jsafrane) fedora-extras-commits at redhat.com
Tue Jul 31 15:36:24 UTC 2007


Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2898

Modified Files:
	.cvsignore openldap.spec sources 
Added Files:
	openldap-2.3.37-smbk5pwd.patch 
Removed Files:
	openldap-2.3.34-smbk5pwd.patch 
Log Message:
new upstream version

openldap-2.3.37-smbk5pwd.patch:

--- NEW FILE openldap-2.3.37-smbk5pwd.patch ---
--- openldap-2.3.34/contrib/slapd-modules/smbk5pwd/README.smbk5pwd	2005-11-14 19:06:04.000000000 +0100
+++ openldap-2.3.34/contrib/slapd-modules/smbk5pwd/README	2007-07-09 09:44:43.000000000 +0200
@@ -1,3 +1,8 @@
+***************************************************************
+Red Hat note: Kerberos support is NOT compiled into
+this version of smbk5pwd because we do not use Heimdall.
+***************************************************************
+
 Copyright 2004-2005 Howard Chu, Symas Corp. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
--- openldap-2.3.37/servers/slapd/overlays/Makefile.in.orig	2007-05-29 23:57:47.000000000 +0200
+++ openldap-2.3.37/servers/slapd/overlays/Makefile.in	2007-07-31 16:27:08.000000000 +0200
@@ -28,7 +28,8 @@ SRCS = overlays.c \
 	syncprov.c \
 	translucent.c \
 	unique.c \
-	valsort.c
+	valsort.c \
+	smbk5pwd.c
 OBJS = statover.o \
 	@SLAPD_STATIC_OVERLAYS@ \
 	overlays.o
@@ -41,14 +42,14 @@ LTONLY_MOD = $(LTONLY_mod)
 LDAP_INCDIR= ../../../include       
 LDAP_LIBDIR= ../../../libraries
 
-MOD_DEFS = -DSLAPD_IMPORT
+MOD_DEFS = -DSLAPD_IMPORT -DDO_SAMBA
 
 shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
 NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC at _LDAP_LIBS)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC at _LDAP_LIBS)
 
 LIBRARY = ../liboverlays.a
-PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@
+PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@ smbk5pwd.la
 
 XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = $(MODULES_CPPFLAGS)
@@ -105,6 +106,9 @@ unique.la : unique.lo
 valsort.la : valsort.lo
 	$(LTLINK_MOD) -module -o $@ valsort.lo version.lo $(LINK_LIBS)
 
+smbk5pwd.la : smbk5pwd.lo
+	$(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo $(LINK_LIBS)
+
 install-local:	$(PROGRAMS)
 	@if test -n "$?" ; then \
 		$(MKDIR) $(DESTDIR)$(moduledir); \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	20 Jul 2007 14:03:59 -0000	1.29
+++ .cvsignore	31 Jul 2007 15:35:51 -0000	1.30
@@ -9,3 +9,4 @@
 openldap-2.3.28.tgz
 openldap-2.3.30.tgz
 openldap-2.3.34.tgz
+openldap-2.3.37.tgz


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- openldap.spec	20 Jul 2007 14:03:59 -0000	1.83
+++ openldap.spec	31 Jul 2007 15:35:51 -0000	1.84
@@ -2,7 +2,7 @@
 %define db_version 4.4.20
 %define ldbm_backend berkeley
 %define version_22 2.2.29
-%define version_23 2.3.34
+%define version_23 2.3.37
 %define evolution_connector_prefix %{_libdir}/evolution-openldap
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 7%{?dist}
+Release: 1%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -42,7 +42,7 @@
 Patch8: openldap-2.3.19-gethostbyXXXX_r.patch
 Patch9: openldap-2.3.34-quiet-slaptest.patch
 Patch10: openldap-2.3.34-pthread.patch
-Patch11: openldap-2.3.34-smbk5pwd.patch
+Patch11: openldap-2.3.37-smbk5pwd.patch
 
 # Patches for 2.2.29 for the compat-openldap package.
 Patch100: openldap-2.2.13-tls-fix-connection-test.patch
@@ -747,6 +747,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Tue Jul 31 2007 Jan Safranek <jsafranek at redhat.com> 2.3.37-1%{?dist}
+- new upstream version
+
 * Fri Jul 20 2007 Jan Safranek <jsafranek at redhat.com> 2.3.34-7%{?dist}
 - MigrationTools-47 integrated
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	20 Jul 2007 14:03:59 -0000	1.30
+++ sources	31 Jul 2007 15:35:51 -0000	1.31
@@ -3,4 +3,4 @@
 6c4c72a1336aa45b463e738034c078d6  openldap-2.2.29.tgz
 3faf83eb8482e55979bda47f1d1e6501  MigrationTools-47.tar.gz
 33851f01b455cca48aa601956de93c6f  db-4.4.20.tar.gz
-143eeb6e3c163e5f52d8e744b43a5960  openldap-2.3.34.tgz
+f5c6cec07469ce8f64710eba3aeb58f8  openldap-2.3.37.tgz


--- openldap-2.3.34-smbk5pwd.patch DELETED ---




More information about the scm-commits mailing list