patches modifying openldap to work with mozilla NSS crypto

2010-06-28 15:09:10 +00:00 · 2010-06-28 15:09:10 +00:00 · ecf9ab4483
commit ecf9ab4483
parent 4d56125efa
2 changed files with 88 additions and 0 deletions
--- a/openldap-2.4.22-ldif_h.patch
+++ b/openldap-2.4.22-ldif_h.patch
@ -0,0 +1,22 @@
+--- openldap-2.4.22/include/Makefile.in.orig	2010-06-03 07:38:29.000000000 -0600
+++ openldap-2.4.22/include/Makefile.in	2010-06-03 07:39:21.000000000 -0600
+@@ -15,17 +15,18 @@
+ 
+ all-local: ldap_config.h FORCE
+ 
+ install-local: FORCE
+ 	-$(MKDIR) $(DESTDIR)$(includedir)
+ 	for header in $(srcdir)/lber.h lber_types.h \
+ 		$(srcdir)/ldap.h $(srcdir)/ldap_cdefs.h \
+ 		$(srcdir)/ldap_schema.h $(srcdir)/ldap_utf8.h \
+-		$(srcdir)/slapi-plugin.h ldap_features.h; \
+		$(srcdir)/slapi-plugin.h ldap_features.h \
+		$(srcdir)/ldif.h ; \
+ 	do \
+ 		$(INSTALL) $(INSTALLFLAGS) -m 644 $$header $(DESTDIR)$(includedir); \
+ 	done
+ 
+ clean-local: FORCE 
+ 	$(RM) ldap_config.h
+ 
+ veryclean-local: clean-local FORCE
--- a/openldap-2.4.22-libldif.patch
+++ b/openldap-2.4.22-libldif.patch
@ -0,0 +1,66 @@
+--- openldap-2.4.22/libraries/liblutil/Makefile.in.orig	2010-06-03 10:57:01.000000000 -0600
+++ openldap-2.4.22/libraries/liblutil/Makefile.in	2010-06-03 10:59:29.000000000 -0600
+@@ -9,16 +9,19 @@
+ ## 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>.
+ 
+ LIBRARY	= liblutil.a
+
+SHAREDLIB = libldif.la
+
+ PROGRAM = testavl
+ 
+ LDAP_INCDIR= ../../include       
+ LDAP_LIBDIR= ../../libraries
+ 
+ NT_SRCS = ntservice.c
+ NT_OBJS = ntservice.o slapdmsg.res
+ 
+@@ -35,16 +38,18 @@
+ 	@LIBSRCS@ $(@PLAT@_SRCS)
+ 
+ OBJS	= base64.o entropy.o sasl.o signal.o hash.o passfile.o \
+ 	md5.o passwd.o sha1.o getpass.o lockf.o utils.o uuid.o sockpair.o \
+ 	avl.o tavl.o ldif.o fetch.o \
+ 	meter.o \
+ 	@LIBOBJS@ $(@PLAT@_OBJS)
+ 
+SHAREDLIBOBJS = ldif.lo fetch.lo
+
+ testavl: $(XLIBS) testavl.o
+ 	(LTLINK) -o $@ testavl.o $(LIBS)
+ 
+ testtavl: $(XLIBS) testtavl.o
+ 	(LTLINK) -o $@ testtavl.o $(LIBS)
+ 
+ # These rules are for a Mingw32 build, specifically.
+ # It's ok for them to be here because the clean rule is harmless, and
+@@ -54,8 +59,24 @@
+ 	@if [ ! -f $@ ]; then cp $(srcdir)/$@ .; fi
+ 
+ slapdmsg.res: slapdmsg.rc slapdmsg.bin
+ 	windres $< -O coff -o $@
+ 
+ clean-local:
+ 	$(RM) *.res
+ 
+all-local: $(SHAREDLIB)
+
+.SUFFIXES: .c .o .lo
+
+.c.lo:
+	$(LTCOMPILE_LIB) $<
+
+$(LIBRARY): $(SHAREDLIBOBJS) version.lo
+
+$(SHAREDLIB): $(SHAREDLIBOBJS) version.lo
+	$(LTLINK_LIB) -o $(SHAREDLIB) $(SHAREDLIBOBJS) version.lo $(LINK_LIBS)
+
+install-local: FORCE
+	-$(MKDIR) $(DESTDIR)$(libdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(SHAREDLIB) $(DESTDIR)$(libdir)
+	$(LTFINISH) $(DESTDIR)$(libdir)