Revert "Revert "oran-shell-release: release image for F""
[pti/rtp.git] / meta-starlingx / meta-stx-integ / recipes-support / openldap / files / 0014-openldap-module-passwd-sha2.patch
1 From 1281efe5b451e0fd030406bc68be9d1f9356adc5 Mon Sep 17 00:00:00 2001
2 From: babak sarashki <babak.sarashki@windriver.com>
3 Date: Sun, 3 Nov 2019 14:55:58 -0800
4 Subject: [PATCH 14/20] openldap module passwd sha2
5
6 From Stx 1901: openldap-module-passwd-sha2.patch
7 Include sha2 module
8
9 Author: Matus Honek <mhonek@redhat.com>
10 ---
11  servers/slapd/overlays/Makefile.in | 14 ++++++++++++--
12  1 file changed, 12 insertions(+), 2 deletions(-)
13
14 diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
15 index d940560..0b3eeb7 100644
16 --- a/servers/slapd/overlays/Makefile.in
17 +++ b/servers/slapd/overlays/Makefile.in
18 @@ -35,7 +35,8 @@ SRCS = overlays.c \
19         unique.c \
20         valsort.c \
21         smbk5pwd.c \
22 -       allop.c
23 +       allop.c \
24 +       sha2.c slapd-sha2.c
25  OBJS = statover.o \
26         @SLAPD_STATIC_OVERLAYS@ \
27         overlays.o
28 @@ -55,7 +56,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
29  UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
30  
31  LIBRARY = ../liboverlays.a
32 -PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@ smbk5pwd.la allop.la
33 +PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@ smbk5pwd.la allop.la pw-sha2.la
34  
35  XINCPATH = -I.. -I$(srcdir)/..
36  XDEFS = $(MODULES_CPPFLAGS)
37 @@ -139,6 +140,15 @@ allop.lo : allop.c
38  allop.la : allop.lo
39         $(LTLINK_MOD) -module -o $@ allop.lo version.lo $(LINK_LIBS) $(shell pkg-config openssl --libs)
40  
41 +sha2.lo : sha2.c
42 +       $(LTCOMPILE_MOD) $<
43 +
44 +slapd-sha2.lo : slapd-sha2.c
45 +       $(LTCOMPILE_MOD) $<
46 +
47 +pw-sha2.la : sha2.lo slapd-sha2.lo
48 +       $(LTLINK_MOD) -module -o $@ $? version.lo $(LINK_LIBS)
49 +
50  install-local: $(PROGRAMS)
51         @if test -n "$?" ; then \
52                 $(MKDIR) $(DESTDIR)$(moduledir); \
53 -- 
54 2.17.1
55