tstellar / rpms / openldap

Forked from rpms/openldap 3 years ago
Clone
Jan Vcelak 95d8d32
Patch exposes LDIF reading/writing API. This change is required to replace
Jan Vcelak 95d8d32
mozldap with openldap in FreeIPA project.
Jan Vcelak 95d8d32
Jan Vcelak 95d8d32
Upstream: ITS #6194
Jan Vcelak 95d8d32
Author: Rich Megginson <rmeggins@redhat.com>
Jan Vcelak 95d8d32
Jan Vcelak 95d8d32
diff -uNPrp openldap-2.4.23.old/include/Makefile.in openldap-2.4.23.new/include/Makefile.in
Jan Vcelak 95d8d32
--- openldap-2.4.23.old/include/Makefile.in	2010-04-13 22:22:47.000000000 +0200
Jan Vcelak 95d8d32
+++ openldap-2.4.23.new/include/Makefile.in	2010-08-19 17:40:29.073805139 +0200
Jan Vcelak 95d8d32
@@ -20,7 +20,8 @@ install-local: FORCE
Jan Vcelak 95d8d32
 	for header in $(srcdir)/lber.h lber_types.h \
Jan Vcelak 95d8d32
 		$(srcdir)/ldap.h $(srcdir)/ldap_cdefs.h \
Jan Vcelak 95d8d32
 		$(srcdir)/ldap_schema.h $(srcdir)/ldap_utf8.h \
Jan Vcelak 95d8d32
-		$(srcdir)/slapi-plugin.h ldap_features.h; \
Jan Vcelak 95d8d32
+		$(srcdir)/slapi-plugin.h ldap_features.h \
Jan Vcelak 95d8d32
+		$(srcdir)/ldif.h ; \
Jan Vcelak 95d8d32
 	do \
Jan Vcelak 95d8d32
 		$(INSTALL) $(INSTALLFLAGS) -m 644 $$header $(DESTDIR)$(includedir); \
Jan Vcelak 95d8d32
 	done
Jan Vcelak 95d8d32
diff -uNPrp openldap-2.4.23.old/libraries/liblutil/Makefile.in openldap-2.4.23.new/libraries/liblutil/Makefile.in
Jan Vcelak 95d8d32
--- openldap-2.4.23.old/libraries/liblutil/Makefile.in	2010-04-19 18:53:01.000000000 +0200
Jan Vcelak 95d8d32
+++ openldap-2.4.23.new/libraries/liblutil/Makefile.in	2010-08-19 17:40:20.424679962 +0200
Jan Vcelak 95d8d32
@@ -14,6 +14,9 @@
Jan Zeleny ecf9ab4
 ## <http://www.OpenLDAP.org/license.html>.
Jan Zeleny ecf9ab4
 
Jan Zeleny ecf9ab4
 LIBRARY	= liblutil.a
Jan Zeleny ecf9ab4
+
Jan Zeleny ecf9ab4
+SHAREDLIB = libldif.la
Jan Zeleny ecf9ab4
+
Jan Zeleny ecf9ab4
 PROGRAM = testavl
Jan Zeleny ecf9ab4
 
Jan Zeleny ecf9ab4
 LDAP_INCDIR= ../../include       
Jan Vcelak 95d8d32
@@ -40,6 +43,8 @@ OBJS	= base64.o entropy.o sasl.o signal.
Jan Zeleny ecf9ab4
 	meter.o \
Jan Zeleny ecf9ab4
 	@LIBOBJS@ $(@PLAT@_OBJS)
Jan Zeleny ecf9ab4
 
Jan Zeleny ecf9ab4
+SHAREDLIBOBJS = ldif.lo fetch.lo
Jan Zeleny ecf9ab4
+
Jan Zeleny ecf9ab4
 testavl: $(XLIBS) testavl.o
Jan Zeleny ecf9ab4
 	(LTLINK) -o $@ testavl.o $(LIBS)
Jan Zeleny ecf9ab4
 
Jan Vcelak 95d8d32
@@ -59,3 +64,19 @@ slapdmsg.res: slapdmsg.rc slapdmsg.bin
Jan Zeleny ecf9ab4
 clean-local:
Jan Zeleny ecf9ab4
 	$(RM) *.res
Jan Zeleny ecf9ab4
 
Jan Zeleny ecf9ab4
+all-local: $(SHAREDLIB)
Jan Zeleny ecf9ab4
+
Jan Zeleny ecf9ab4
+.SUFFIXES: .c .o .lo
Jan Zeleny ecf9ab4
+
Jan Zeleny ecf9ab4
+.c.lo:
Jan Zeleny ecf9ab4
+	$(LTCOMPILE_LIB) $<
Jan Zeleny ecf9ab4
+
Jan Zeleny ecf9ab4
+$(LIBRARY): $(SHAREDLIBOBJS) version.lo
Jan Zeleny ecf9ab4
+
Jan Zeleny ecf9ab4
+$(SHAREDLIB): $(SHAREDLIBOBJS) version.lo
Jan Zeleny ecf9ab4
+	$(LTLINK_LIB) -o $(SHAREDLIB) $(SHAREDLIBOBJS) version.lo $(LINK_LIBS)
Jan Zeleny ecf9ab4
+
Jan Zeleny ecf9ab4
+install-local: FORCE
Jan Zeleny ecf9ab4
+	-$(MKDIR) $(DESTDIR)$(libdir)
Jan Zeleny ecf9ab4
+	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(SHAREDLIB) $(DESTDIR)$(libdir)
Jan Zeleny ecf9ab4
+	$(LTFINISH) $(DESTDIR)$(libdir)