rpms/nss_ldap/F-8 nss_ldap.spec,1.87,1.88
Nalin Somabhai Dahyabhai (nalin)
fedora-extras-commits at redhat.com
Wed Nov 21 20:11:13 UTC 2007
Author: nalin
Update of /cvs/pkgs/rpms/nss_ldap/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17972/F-8
Modified Files:
nss_ldap.spec
Log Message:
- nss_ldap: go back to linking with static libldap and liblber so that we
don't get unresolved references which may be resolved by a different libldap
used by the calling application
Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/F-8/nss_ldap.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- nss_ldap.spec 12 Oct 2007 19:40:37 -0000 1.87
+++ nss_ldap.spec 21 Nov 2007 20:10:41 -0000 1.88
@@ -2,7 +2,7 @@
Summary: NSS library and PAM module for LDAP
Name: nss_ldap
Version: 257
-Release: 3.1%{?dist}
+Release: 4%{?dist}
Source0: ftp://ftp.padl.com/pub/nss_ldap-%{version}.tar.gz
Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz
Source3: nss_ldap.versions
@@ -120,7 +120,7 @@
--enable-schema-mapping \
--enable-rfc2307bis \
--enable-configurable-krb5-ccname-gssapi
-make %{?_smp_mflags}
+make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -Wl,-Bdynamic -lsasl2 -lgssapi_krb5 -lssl -ldl -lpthread_nonshared -lnsl -lresolv"
popd
# Check that the modules are actually loadable.
@@ -132,10 +132,12 @@
mkdir -p $RPM_BUILD_ROOT/{etc,%{_lib}/security,%{_libdir}}
# Let the nss_ldap install target do its thing, skipping the chown/chgrp bits
-# and making sure we only get one libc version, even on multilib boxen. NOTE:
-# the libc version part of the filename is otherwise purely cosmetic, as glibc
-# finds and loads the module using only its soname.
-libcver=`basename /%{_lib}/libnss_files-*.so .so | tail -n 1 | cut -f2 -d-`
+# and making sure we only get one libc version, even on multilib boxen.
+# We used to do some gymnastics to match the form of libnss_ldap-$libcversion.so
+# filenames that the glibc-bundled modules do, but that doesn't tell us anything
+# more than which version of libc was available at build time. People tend to
+# assume that's also the nss_ldap version, too, so forget that.
+libcver=%{version}
make -C nss_ldap-%{version} install \
DESTDIR=$RPM_BUILD_ROOT \
INST_UID=`id -un` INST_GID=`id -gn` \
@@ -193,6 +195,11 @@
%doc pam_ldap-%{pam_ldap_version}/ldapns.schema
%changelog
+* Wed Nov 21 2007 Nalin Dahyabhai <nalin at redhat.com> - 257-4
+- nss_ldap: go back to linking with static libldap and liblber so that we
+ don't get unresolved references which may be resolved by a different libldap
+ used by the calling application
+
* Thu Sep 20 2007 Nalin Dahyabhai <nalin at redhat.com>
- revise not-applied patch for attempting to stop infinite recursion in
poorly-configured case
More information about the fedora-extras-commits
mailing list