From 240fb37b41bc513aaf6aedcaa4c327d1f8a10122 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 04:02:55 +0000
Subject: auto-import changelog data from cyrus-sasl-1.5.24-23.src.rpm

Fri Nov 02 2001 Nalin Dahyabhai <nalin@redhat.com> 1.5.24-23
- patch to fix possible syslog format-string vulnerability
Mon Oct 29 2001 Nalin Dahyabhai <nalin@redhat.com> 1.5.24-22
- add pam-devel as a buildprereq
Wed Aug 29 2001 Nalin Dahyabhai <nalin@redhat.com> 1.5.24-21
- include sample programs in the -devel subpackage, prefixing their names
    with "sasl-" to reduce future potential naming conflicts

---

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 440b596..6f2ded9 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -1,15 +1,28 @@
+# These define which plugins are built as subpackages.  The gssapi definition
+# also controls whether the plugin is even built.
+# For RHL 6.2, gssapi = 1, md5 = 0, plain = 0.
+# For RHL 7,   gssapi = 1, md5 = 0, plain = 0.
+# For RHL 7.1, gssapi = 1, md5 = 0, plain = 0.
+# For RHL 7.2, gssapi = 1, md5 = 1, plain = 1.
+%define gssapi 1
+%define md5    1
+%define plain  1
+
 Summary: The Cyrus SASL library.
 Name: cyrus-sasl
 Version: 1.5.24
-Release: 20
+Release: 23
 License: Freely Distributable
 Group: System Environment/Libraries
 Source: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
 URL: http://asg.web.cmu.edu/sasl/sasl-library.html
 Patch0: cyrus-sasl-1.5.21-des.patch
 Patch1: cyrus-sasl-1.5.24-external.patch
+Patch2: cyrus-sasl-1.5.24-syslog.patch
+Patch3: cyrus-sasl-1.5.24-rpath.patch
+Patch4: cyrus-sasl-1.5.24-autoconf.patch
 Buildroot: %{_tmppath}/%{name}-root
-BuildPrereq: gdbm-devel, krb5-devel, openssl-devel
+BuildPrereq: gdbm-devel, krb5-devel, openssl-devel, pam-devel
 Requires: pam
 Prereq: /sbin/ldconfig
 
@@ -59,26 +72,39 @@ CRAM-MD5 and DIGEST-MD5 authentication schemes.
 %setup -q
 %patch0 -p1 -b .des
 %patch1 -p1 -b .external
+%patch2 -p1 -b .syslog
+%patch3 -p1 -b .rpath
+%patch4 -p1 -b .autoconf
+aclocal -I ./cmulocal
+automake -a -c
+autoconf
 
 %build
-autoconf
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 %configure \
 	--enable-static --enable-shared \
 	--with-plugindir=%{_libdir}/sasl \
 	--with-dblib=gdbm \
 	--disable-krb4 \
+%if %{gssapi}
 	--enable-gssapi=/usr/kerberos \
+%endif
 	--with-rc4 \
 	--enable-anon \
 	--enable-cram \
+	--enable-digest \
 	--enable-plain \
 	--enable-login
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{makeinstall}
+%makeinstall
+install -m755 -d $RPM_BUILD_ROOT%{_bindir}
+./libtool --mode=install \
+install -m755 sample/sample-client $RPM_BUILD_ROOT%{_bindir}/sasl-sample-client
+./libtool --mode=install \
+install -m755 sample/sample-server $RPM_BUILD_ROOT%{_bindir}/sasl-sample-server
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,8 +123,30 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/saslpasswd
 %{_sbindir}/sasldblistusers
 
+%if %{plain}
+%files plain
+%defattr(-,root,root)
+%endif
+%{_libdir}/sasl/*plain*.so*
+%{_libdir}/sasl/*login*.so*
+
+%if %{md5}
+%files md5
+%defattr(-,root,root)
+%endif
+%{_libdir}/sasl/*crammd5*.so*
+%{_libdir}/sasl/*digestmd5*.so*
+
+%if %{gssapi}
+%files gssapi
+%defattr(-,root,root)
+%{_libdir}/sasl/*gssapi*.so*
+%endif
+
 %files devel
 %defattr(-,root,root)
+%{_bindir}/sasl-sample-client
+%{_bindir}/sasl-sample-server
 %{_includedir}/*.h
 %{_libdir}/libsasl*.*a
 %{_libdir}/libsasl*.*so
@@ -110,22 +158,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/sasl/*plain*.*a
 %{_mandir}/man3/*
 
-%files gssapi
-%defattr(-,root,root)
-%{_libdir}/sasl/*gssapi*.so*
+%changelog
+* Fri Nov  2 2001 Nalin Dahyabhai <nalin@redhat.com> 1.5.24-23
+- patch to fix possible syslog format-string vulnerability 
 
-%files plain
-%defattr(-,root,root)
-%{_libdir}/sasl/*plain*.so*
-%{_libdir}/sasl/*login*.so*
+* Mon Oct 29 2001 Nalin Dahyabhai <nalin@redhat.com> 1.5.24-22
+- add pam-devel as a buildprereq
 
-%files md5
-%defattr(-,root,root)
-%{_libdir}/sasl/*crammd5*.so*
-%{_libdir}/sasl/*digestmd5*.so*
+* Wed Aug 29 2001 Nalin Dahyabhai <nalin@redhat.com> 1.5.24-21
+- include sample programs in the -devel subpackage, prefixing their names
+  with "sasl-" to reduce future potential naming conflicts
 
-%changelog
-* Tue Aug 14 2001 Nalin Dahyabhai <nalin@redhat.com>
+* Tue Aug 14 2001 Nalin Dahyabhai <nalin@redhat.com> 1.5.24-20
 - build without -ggdb
 
 * Fri Aug  3 2001 Nalin Dahyabhai <nalin@redhat.com>