Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/pam_pkcs11/patches/01-solaris_build.patch
author Huie-Ying Lee <huieying.lee@oracle.com>
Tue, 19 Jul 2016 14:22:34 -0700
changeset 6432 e821c64a5943
parent 6105 components/pam_pkcs11/patches/pam_pkcs11.patch@bbe5186e3c04
permissions -rw-r--r--
PSARC/2016/427 PAM_PKCS11 0.6.8 23210165 Upgrade pam_pkcs11 to 0.6.8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6432
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
     1
 
#
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
     2
 
# This patch contains changes for Solaris build.   This is for Solaris only,
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
     3
 
# so we will not contribute back this change to the upstream community.
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
     4
 
#
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
     5
 
--- pam_pkcs11-0.6.8_ORIG/configure.in	Sat Apr  7 10:09:19 2012
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
     6
 
+++ pam_pkcs11-0.6.8_NEW/configure.in	Wed Jul 13 15:12:01 2016
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
     7
 
@@ -96,7 +96,7 @@
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
     8
 
   AC_CHECK_LIB( ldap, ldap_init,
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
     9
 
 	[
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    10
 
 	with_ldap=yes
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    11
 
-	LIBS="$LIBS -lldap"
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    12
 
+	LIBS="$LIBS -lldap_r"
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    13
 
 	],[
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    14
 
 	AC_MSG_WARN([Cannot find LDAP libraries. LDAP support disabled])
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    15
 
 	with_ldap=no
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    16
 
--- pam_pkcs11-0.6.8_ORIG/src/pam_pkcs11/Makefile.am	Sat Oct 23 11:36:36 2010
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    17
 
+++ pam_pkcs11-0.6.8_NEW/src/pam_pkcs11/Makefile.am	Wed Jul 13 15:30:48 2016
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    18
 
@@ -2,8 +2,8 @@
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    19
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    20
 
 MAINTAINERCLEANFILES = Makefile.in
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    21
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    22
 
-AM_CFLAGS = -Wall -fno-strict-aliasing $(CRYPTO_CFLAGS)
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    23
 
-AM_CPPFLAGS = -Wall -fno-strict-aliasing $(CRYPTO_CFLAGS)
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    24
 
+AM_CFLAGS = -v -fno-strict-aliasing $(CRYPTO_CFLAGS)
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    25
 
+AM_CPPFLAGS = -v -fno-strict-aliasing $(CRYPTO_CFLAGS)
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    26
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    27
 
 pamdir=$(libdir)/security
e821c64a5943 PSARC/2016/427 PAM_PKCS11 0.6.8
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 6105
diff changeset 
    28
upstream/oracle/userland-gate