X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-integ%2Frecipes-support%2Fopenldap%2Ffiles%2F0014-openldap-module-passwd-sha2.patch;fp=meta-starlingx%2Fmeta-stx-integ%2Frecipes-support%2Fopenldap%2Ffiles%2F0014-openldap-module-passwd-sha2.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=e11c8d8cd905611890a48d9236a755bc99f8f79a;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0014-openldap-module-passwd-sha2.patch b/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0014-openldap-module-passwd-sha2.patch
deleted file mode 100644
index e11c8d8..0000000
--- a/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0014-openldap-module-passwd-sha2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1281efe5b451e0fd030406bc68be9d1f9356adc5 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:55:58 -0800
-Subject: [PATCH 14/20] openldap module passwd sha2
-
-From Stx 1901: openldap-module-passwd-sha2.patch
-Include sha2 module
-
-Author: Matus Honek <mhonek@redhat.com>
----
- servers/slapd/overlays/Makefile.in | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
-index d940560..0b3eeb7 100644
---- a/servers/slapd/overlays/Makefile.in
-+++ b/servers/slapd/overlays/Makefile.in
-@@ -35,7 +35,8 @@ SRCS = overlays.c \
- 	unique.c \
- 	valsort.c \
- 	smbk5pwd.c \
--	allop.c
-+	allop.c \
-+	sha2.c slapd-sha2.c
- OBJS = statover.o \
- 	@SLAPD_STATIC_OVERLAYS@ \
- 	overlays.o
-@@ -55,7 +56,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
- UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
- 
- LIBRARY = ../liboverlays.a
--PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@ smbk5pwd.la allop.la
-+PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@ smbk5pwd.la allop.la pw-sha2.la
- 
- XINCPATH = -I.. -I$(srcdir)/..
- XDEFS = $(MODULES_CPPFLAGS)
-@@ -139,6 +140,15 @@ allop.lo : allop.c
- allop.la : allop.lo
- 	$(LTLINK_MOD) -module -o $@ allop.lo version.lo $(LINK_LIBS) $(shell pkg-config openssl --libs)
- 
-+sha2.lo : sha2.c
-+	$(LTCOMPILE_MOD) $<
-+
-+slapd-sha2.lo : slapd-sha2.c
-+	$(LTCOMPILE_MOD) $<
-+
-+pw-sha2.la : sha2.lo slapd-sha2.lo
-+	$(LTLINK_MOD) -module -o $@ $? version.lo $(LINK_LIBS)
-+
- install-local:	$(PROGRAMS)
- 	@if test -n "$?" ; then \
- 		$(MKDIR) $(DESTDIR)$(moduledir); \
--- 
-2.17.1
-