diff --git a/.cvsignore b/.cvsignore
index bf89282..92d54d1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,2 @@
-cyrus-sasl-1.5.24.tar.gz
-cyrus-sasl-1.5.28-BETA.tar.gz
-cyrus-sasl-2.1.7.tar.gz
+cyrus-sasl-1.5.28.tar.gz
+cyrus-sasl-2.1.10.tar.gz
diff --git a/cyrus-sasl-1.5.28.tar.gz.sig b/cyrus-sasl-1.5.28.tar.gz.sig
new file mode 100644
index 0000000..d1cab9c
Binary files /dev/null and b/cyrus-sasl-1.5.28.tar.gz.sig differ
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 555a26b..fa14b2e 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -4,25 +4,19 @@
 
 Summary: The Cyrus SASL library.
 Name: cyrus-sasl
-Version: 2.1.7
-Release: 2
+Version: 2.1.10
+Release: 1
 License: Freely Distributable
 Group: System Environment/Libraries
 Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
-Source1: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{cs1_version}-BETA.tar.gz
-Source2: saslauthd.init
-Source3: README.RPM
-Source4: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-1.5.24.tar.gz
+Source1: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz.sig
+Source2: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{cs1_version}.tar.gz
+Source3: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{cs1_version}.tar.gz.sig
+Source4: saslauthd.init
+Source5: README.RPM
 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-autoconf.patch
-Patch4: cyrus-sasl-1.5.24-rpath.patch
-Patch5: cyrus-sasl-2.1.6-automake.patch
-Patch6: cyrus-sasl-2.1.4-autoconf.patch
-Patch7: cyrus-sasl-2.1.4-ipctype.patch
-Patch8: cyrus-sasl-2.1.7-gdbm.patch
+Patch0: cyrus-sasl-1.5.24-rpath.patch
+Patch1: cyrus-sasl-2.1.7-gdbm.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildPrereq: autoconf213, automake15, libtool
 # Note: berkeley db for sasl2, gdbm for sasl1.
@@ -72,14 +66,9 @@ The %{name}-md5 package contains the Cyrus SASL plugins which support
 CRAM-MD5 and DIGEST-MD5 authentication schemes.
 
 %prep
-%setup -q -c -a 1
+%setup -q -c -a 2
 pushd cyrus-sasl-%{cs1_version}
-# These patches are not needed for 1.5.28, but are needed in 1.5.24.
-#%patch0 -p1 -b .des
-#%patch1 -p1 -b .external
-#%patch2 -p1 -b .syslog
-#%patch3 -p1 -b .autoconf
-%patch4 -p1 -b .rpath
+%patch0 -p1 -b .rpath
 libtoolize -f
 aclocal-1.5 -I ./config -I ./cmulocal
 automake-1.5 -a
@@ -88,10 +77,7 @@ autoconf-2.13
 popd
 
 pushd cyrus-sasl-%{version}
-%patch5 -p1 -b .automake
-%patch6 -p1 -b .autoconf
-%patch7 -p1 -b .ipctype
-%patch8 -p1 -b .gdbm
+%patch1 -p1 -b .gdbm
 libtoolize -f
 aclocal-1.5 -I ./config -I ./cmulocal
 automake-1.5 -a --include-deps
@@ -122,6 +108,8 @@ done
 popd
 
 %build
+LDFLAGS="-L%{_prefix}/kerberos/%{_lib}"; export LDFLAGS
+
 pushd cyrus-sasl-%{cs1_version}
 %configure \
 	--enable-static --with-pic --enable-shared \
@@ -135,7 +123,7 @@ pushd cyrus-sasl-%{cs1_version}
 	--enable-digest \
 	--enable-plain \
 	--enable-login
-make
+make sasldir=%{_plugindir}
 popd
 
 pushd cyrus-sasl-%{version}
@@ -153,30 +141,31 @@ LIBS=-lcrypt; export LIBS
 	--enable-digest \
 	--enable-plain \
 	--enable-login
-make -C sasldb allockey.o allockey.lo db_berkeley.o db_berkeley.lo
-make JAV=
+	# --enable-auth-sasldb -- EXPERIMENTAL
+make -C sasldb allockey.o allockey.lo db_berkeley.o db_berkeley.lo sasldir=%{_plugindir2}
+make JAV= sasldir=%{_plugindir2}
 popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 pushd cyrus-sasl-%{cs1_version}
-%makeinstall
+%makeinstall sasldir=$RPM_BUILD_ROOT/%{_plugindir}
 install -m755 -d $RPM_BUILD_ROOT%{_bindir}
-./libtool --mode=install \
+libtool --mode=install \
 install -m755 sample/client $RPM_BUILD_ROOT%{_bindir}/sasl-sample-client
-./libtool --mode=install \
+libtool --mode=install \
 install -m755 sample/server $RPM_BUILD_ROOT%{_bindir}/sasl-sample-server
 popd
 
 pushd cyrus-sasl-%{version}
-%makeinstall JAV=
+%makeinstall JAV= sasldir=$RPM_BUILD_ROOT/%{_plugindir2}
 install -m755 -d $RPM_BUILD_ROOT%{_bindir}
 
-./libtool --mode=install \
+libtool --mode=install \
 install -m755 sample/client $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-client
-./libtool --mode=install \
+libtool --mode=install \
 install -m755 sample/server $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-server
-./libtool --mode=install \
+libtool --mode=install \
 install -m755 utils/dbconverter-2 $RPM_BUILD_ROOT%{_sbindir}/dbconverter-2
 
 # Install the saslauthd man page in the expected location, even if it's
@@ -190,6 +179,10 @@ install -m755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -m755 $RPM_SOURCE_DIR/saslauthd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/saslauthd
 popd
 
+# Remove unpackaged files from the buildroot.
+rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/libotp.*
+rm -f $RPM_BUILD_ROOT%{_mandir}/cat8/saslauthd.8
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -288,6 +281,19 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec  9 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.10-1
+- update to 2.1.10, fixing buffer overflows in libsasl2 noted by Timo Sirainen
+
+* Tue Nov 12 2002 Tim Powers <timp@redhat.com> 2.1.7-5
+- remove files from $RPM_BUILD_ROOT that we don't intend to include
+
+* Tue Oct  9 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.7-4
+- update to SASLv1 to final 1.5.28
+
+* Fri Sep 13 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.7-3
+- rebuild, overriding sasldir when running make so that on multilib systems
+  applications will be able to load modules for the right arch
+
 * Mon Sep  2 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.7-2
 - include dbconverter-2 (#68741)
 
diff --git a/sources b/sources
index c845963..7dbb922 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-ac3837c071c258b80021325936db2583  cyrus-sasl-1.5.24.tar.gz
-60710be040801e9aff7353563b636518  cyrus-sasl-1.5.28-BETA.tar.gz
-a73e12bea77e96300103aaf511c6bfc4  cyrus-sasl-2.1.7.tar.gz
+60710be040801e9aff7353563b636518  cyrus-sasl-1.5.28.tar.gz
+3ac2a696c091a76ce6c7db27e5d859d4  cyrus-sasl-2.1.10.tar.gz