rpms/nss_ldap/F-9 nss_ldap.spec,1.96,1.97

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20671

Modified Files:
	nss_ldap.spec 
Log Message:
- add libssl and libcrypto to the list of libraries against which we link
  statically to avoid running into symbol collisions at run-time, from devel
  stream (#446860)
- defuzz one patch by pulling it from the development stream
- rebuild (#4



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/F-9/nss_ldap.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- nss_ldap.spec	24 May 2008 14:59:07 -0000	1.96
+++ nss_ldap.spec	30 Sep 2008 17:24:12 -0000	1.97
@@ -2,7 +2,7 @@
 Summary: NSS library and PAM module for LDAP
 Name: nss_ldap
 Version: 259
-Release: 3%{?dist}.1
+Release: 3%{?dist}.2
 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
@@ -10,7 +10,7 @@
 Source5: README.TLS
 Source6: version.c
 Source7: dlopen.sh
-Patch0: pam_ldap-176-dnsconfig.patch
+Patch0: pam_ldap-184-dnsconfig.patch
 Patch1: pam_ldap-180-local_users.patch
 Patch2: nss_ldap-259-parse2.patch
 Patch3: pam_ldap-180-install-perms.patch
@@ -112,7 +112,7 @@
         --enable-schema-mapping \
         --enable-rfc2307bis \
         --enable-configurable-krb5-ccname-gssapi
-make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -Wl,-Bdynamic -lsasl2 -lgssapi_krb5 -lssl -ldl -lpthread_nonshared -lnsl -lresolv"
+make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -lssl -lcrypto -Wl,-Bdynamic -lz -lsasl2 -lgssapi_krb5 -ldl -lpthread_nonshared -lnsl -lresolv"
 popd
 
 # Check that the modules are actually loadable.
@@ -188,6 +188,13 @@
 %doc pam_ldap-%{pam_ldap_version}/ns-pwd-policy.schema
 
 %changelog
+* Tue Sep 30 2008 Nalin Dahyabhai <nalin at redhat.com> - 259-3.2
+- add libssl and libcrypto to the list of libraries against which we link
+  statically to avoid running into symbol collisions at run-time, from devel
+  stream (#446860)
+- defuzz one patch by pulling and updated version from the development stream
+- rebuild (#464620)
+
 * Sat May 24 2008 Dennis Gilmore <dennis at ausil.us> - 259-3.1
 - minor rebuild for sparc