| 1 |
robbat2 09/07/28 18:45:51 |
| 2 |
|
| 3 |
Added: nss_ldap-264-disable-automagic.patch |
| 4 |
Log: |
| 5 |
Version bump. Bug #214750 - fix automagic deps on kerberos, ssl, sasl. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-auth/nss_ldap/files/nss_ldap-264-disable-automagic.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/nss_ldap/files/nss_ldap-264-disable-automagic.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/nss_ldap/files/nss_ldap-264-disable-automagic.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: nss_ldap-264-disable-automagic.patch |
| 15 |
=================================================================== |
| 16 |
Explicitly provide a way to disable Kerberos/SASL/SSL usage in nss_ldap, so |
| 17 |
that you can build non-kerberos versions on systems with Kerberos installed |
| 18 |
WITHOUT it linking due to presence. |
| 19 |
|
| 20 |
Signed-off-by: Robin H. Johnson <robbat2@g.o> |
| 21 |
|
| 22 |
diff -Nuar nss_ldap-264.orig/configure.in nss_ldap-264/configure.in |
| 23 |
--- nss_ldap-264.orig/configure.in 2009-07-28 10:35:27.599965878 -0700 |
| 24 |
+++ nss_ldap-264/configure.in 2009-07-28 10:36:00.620375469 -0700 |
| 25 |
@@ -10,6 +10,21 @@ |
| 26 |
AC_PROG_INSTALL |
| 27 |
|
| 28 |
dnl |
| 29 |
+dnl Turn on/off SSL |
| 30 |
+dnl |
| 31 |
+AC_ARG_ENABLE(ssl, [ --enable-ssl enable SSL code ], [AC_DEFINE([WANT_SSL], [1], [Define if SSL is wanted])]) |
| 32 |
+ |
| 33 |
+dnl |
| 34 |
+dnl Turn on/off Kerberos |
| 35 |
+dnl |
| 36 |
+AC_ARG_ENABLE(krb, [ --enable-krb enable Kerberos code ], [AC_DEFINE([WANT_KRB], [1], [Define if Kerberos is wanted])]) |
| 37 |
+ |
| 38 |
+dnl |
| 39 |
+dnl Turn on/off SASL |
| 40 |
+dnl |
| 41 |
+AC_ARG_ENABLE(sasl, [ --enable-sasl enable Kerberos code ], [AC_DEFINE([WANT_SASL], [1], [Define if SASL is wanted])]) |
| 42 |
+ |
| 43 |
+dnl |
| 44 |
dnl --enable-rfc2307bis is now deprecated; if this option is set, |
| 45 |
dnl then RFC2307bis support will be enabled by default. However |
| 46 |
dnl it can now always be enabled at runtime with the nss_schema |
| 47 |
@@ -178,12 +193,18 @@ |
| 48 |
AC_CHECK_HEADERS(sys/un.h) |
| 49 |
AC_CHECK_HEADERS(libc-lock.h) |
| 50 |
AC_CHECK_HEADERS(bits/libc-lock.h) |
| 51 |
-AC_CHECK_HEADERS(sasl.h sasl/sasl.h) |
| 52 |
+if test "$enable_sasl" \!= "no"; then |
| 53 |
+ AC_CHECK_HEADERS(sasl.h sasl/sasl.h) |
| 54 |
+fi |
| 55 |
AC_CHECK_HEADERS(strings.h) |
| 56 |
-AC_CHECK_HEADERS(gssldap.h) |
| 57 |
-AC_CHECK_HEADERS(gsssasl.h) |
| 58 |
-AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi/gssapi.h gssapi.h) |
| 59 |
-AC_CHECK_HEADERS(krb5.h) |
| 60 |
+if test "$enable_krb" \!= "no"; then |
| 61 |
+ AC_CHECK_HEADERS(gssldap.h) |
| 62 |
+ if test "$enable_sasl" \!= "no"; then |
| 63 |
+ AC_CHECK_HEADERS(gsssasl.h) |
| 64 |
+ fi |
| 65 |
+ AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi/gssapi.h gssapi.h) |
| 66 |
+ AC_CHECK_HEADERS(krb5.h) |
| 67 |
+fi |
| 68 |
|
| 69 |
AC_CHECK_LIB(resolv, main) |
| 70 |
AC_CHECK_LIB(nsl, main) |
| 71 |
@@ -286,19 +307,25 @@ |
| 72 |
AC_CHECK_LIB(dl, dlopen,[LIBS="-ldl $LIBS"],,$LIBS) |
| 73 |
dnl AC_CHECK_LIB(db, main,[LIBS="-ldb $LIBS"],,$LIBS) |
| 74 |
|
| 75 |
-AC_CHECK_LIB(gssapi, gss_krb5_ccache_name,[LIBS="-lgssapi $LIBS" found_gssapi_lib=yes],,$LIBS) |
| 76 |
-if test -z "$found_gssapi_lib"; then |
| 77 |
- AC_CHECK_LIB(gssapi_krb5, gss_krb5_ccache_name,[LIBS="-lgssapi_krb5 $LIBS"],,$LIBS) |
| 78 |
+if test "$enable_krb" \!= "no"; then |
| 79 |
+ AC_CHECK_LIB(gssapi, gss_krb5_ccache_name,[LIBS="-lgssapi $LIBS" found_gssapi_lib=yes],,$LIBS) |
| 80 |
+ if test -z "$found_gssapi_lib"; then |
| 81 |
+ AC_CHECK_LIB(gssapi_krb5, gss_krb5_ccache_name,[LIBS="-lgssapi_krb5 $LIBS"],,$LIBS) |
| 82 |
+ fi |
| 83 |
fi |
| 84 |
|
| 85 |
dnl Following checks probably not strictly necessary. |
| 86 |
dnl AC_CHECK_LIB(crypto, main,[LIBS="-lcrypto $LIBS"],,$LIBS) |
| 87 |
dnl AC_CHECK_LIB(ssl, main,[LIBS="-lssl $LIBS"],,$LIBS) |
| 88 |
AC_CHECK_LIB(com_err, main,[LIBS="-lcom_err $LIBS"],,$LIBS) |
| 89 |
-dnl AC_CHECK_LIB(k5crypto, main,[LIBS="-lk5crypto $LIBS"],,$LIBS) |
| 90 |
-AC_CHECK_LIB(krb5, main,[LIBS="-lkrb5 $LIBS"],,$LIBS) |
| 91 |
-dnl AC_CHECK_LIB(krb4, main,[LIBS="-lkrb4 $LIBS"],,$LIBS) |
| 92 |
-AC_CHECK_LIB(sasl2, sasl_client_init) |
| 93 |
+if test "$enable_krb" \!= "no"; then |
| 94 |
+ dnl AC_CHECK_LIB(k5crypto, main,[LIBS="-lk5crypto $LIBS"],,$LIBS) |
| 95 |
+ AC_CHECK_LIB(krb5, main,[LIBS="-lkrb5 $LIBS"],,$LIBS) |
| 96 |
+ dnl AC_CHECK_LIB(krb4, main,[LIBS="-lkrb4 $LIBS"],,$LIBS) |
| 97 |
+fi |
| 98 |
+if test "$enable_sasl" \!= "no"; then |
| 99 |
+ AC_CHECK_LIB(sasl2, sasl_client_init) |
| 100 |
+fi |
| 101 |
|
| 102 |
if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = umich -o $with_ldap_lib = openldap \); then |
| 103 |
AC_CHECK_LIB(lber, main) |
| 104 |
@@ -331,13 +358,17 @@ |
| 105 |
AC_CHECK_LIB(pthread, main) |
| 106 |
fi |
| 107 |
|
| 108 |
-AC_CHECK_LIB(gssldap, ldap_gss_bind,[LIBS="-lgssldap $LIBS"],,$LIBS) |
| 109 |
+if test "$enable_krb" \!= "no"; then |
| 110 |
+ AC_CHECK_LIB(gssldap, ldap_gss_bind,[LIBS="-lgssldap $LIBS"],,$LIBS) |
| 111 |
+fi |
| 112 |
|
| 113 |
-AC_CHECK_FUNCS(sasl_auxprop_request) |
| 114 |
AC_CHECK_FUNCS(ldap_init ldap_get_lderrno ldap_parse_result ldap_memfree ldap_controls_free) |
| 115 |
AC_CHECK_FUNCS(ldap_ld_free ldap_explode_rdn ldap_set_option ldap_get_option) |
| 116 |
-AC_CHECK_FUNCS(ldap_sasl_interactive_bind_s ldap_initialize ldap_search_ext) |
| 117 |
+AC_CHECK_FUNCS(ldap_initialize ldap_search_ext) |
| 118 |
AC_CHECK_FUNCS(ldap_create_control ldap_create_page_control ldap_parse_page_control) |
| 119 |
+if test "$enable_sasl" \!= "no"; then |
| 120 |
+ AC_CHECK_FUNCS(sasl_auxprop_request ldap_sasl_interactive_bind_s) |
| 121 |
+fi |
| 122 |
if test "$enable_ssl" \!= "no"; then |
| 123 |
AC_CHECK_FUNCS(ldapssl_client_init ldap_start_tls_s ldap_pvt_tls_set_option ldap_start_tls) |
| 124 |
fi |
Archives