23492474 pam_pkcs11 doesn't build (work?) on s12-100
authorHuie-Ying Lee <huieying.lee@oracle.com>
Wed, 01 Jun 2016 16:27:50 -0700
changeset 6105 bbe5186e3c04
parent 6104 583b39846694
child 6106 501ea5a9d7f4
23492474 pam_pkcs11 doesn't build (work?) on s12-100
components/pam_pkcs11/Makefile
components/pam_pkcs11/patches/pam_pkcs11.patch
--- a/components/pam_pkcs11/Makefile	Wed Jun 01 15:59:29 2016 -0700
+++ b/components/pam_pkcs11/Makefile	Wed Jun 01 16:27:50 2016 -0700
@@ -51,6 +51,7 @@
 
 CONFIGURE_BINDIR.32= $(USRLIB.32)/pam_pkcs11
 CONFIGURE_BINDIR.64= $(USRLIB.64)/pam_pkcs11
+CPPFLAGS += -I$(USRINCDIR)/openldap
 CONFIGURE_OPTIONS += --datarootdir=$(ETCDIR)/security
 CONFIGURE_OPTIONS += --with-pcsclite=no
 CONFIGURE_OPTIONS += --localedir=$(USRSHARELOCALEDIR)
@@ -60,5 +61,7 @@
 
 ASLR_MODE = $(ASLR_ENABLE)
 
+REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += system/network/ldap/openldap 
--- a/components/pam_pkcs11/patches/pam_pkcs11.patch	Wed Jun 01 15:59:29 2016 -0700
+++ b/components/pam_pkcs11/patches/pam_pkcs11.patch	Wed Jun 01 16:27:50 2016 -0700
@@ -1,5 +1,22 @@
-*** pam_pkcs11-0.6.0-ORIG/configure.in	Mon Jun 11 05:17:38 2007
---- pam_pkcs11-WS/configure.in	Mon Sep 28 16:06:48 2009
+*** pam_pkcs11-0.6.0_ORIG/configure.in	Mon Jun 11 05:17:38 2007
+--- pam_pkcs11-0.6.0_NEW/configure.in	Tue May 31 17:47:21 2016
+***************
+*** 76,82 ****
+    AC_CHECK_LIB( ldap, ldap_init,
+  	[
+  	with_ldap=yes
+! 	LIBS="$LIBS -lldap"
+  	],[
+  	AC_MSG_WARN([Cannot find LDAP libraries. LDAP support disabled])
+  	with_ldap=no
+--- 76,82 ----
+    AC_CHECK_LIB( ldap, ldap_init,
+  	[
+  	with_ldap=yes
+! 	LIBS="$LIBS -lldap_r"
+  	],[
+  	AC_MSG_WARN([Cannot find LDAP libraries. LDAP support disabled])
+  	with_ldap=no
 ***************
 *** 237,243 ****
   AC_FUNC_REALLOC