diff --git a/cyrus-sasl-2.1.27.tar.gz b/cyrus-sasl-2.1.27.tar.gz
deleted file mode 100644
index 8aa0055..0000000
--- a/cyrus-sasl-2.1.27.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5
-size 4111249
diff --git a/cyrus-sasl-2.1.28.tar.gz b/cyrus-sasl-2.1.28.tar.gz
new file mode 100644
index 0000000..2768b39
--- /dev/null
+++ b/cyrus-sasl-2.1.28.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c
+size 4034803
diff --git a/cyrus-sasl-bdb.changes b/cyrus-sasl-bdb.changes
index 1c7e87c..47b9157 100644
--- a/cyrus-sasl-bdb.changes
+++ b/cyrus-sasl-bdb.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar  9 08:39:23 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.1.28 (bsc#1196036, CVE-2022-24407):
+  * https://www.cyrusimap.org/sasl/sasl/release-notes/2.1/index.html#new-in-2-1-28 
+- drop cyrus-sasl-bug587.patch (upstream)
+
 -------------------------------------------------------------------
 Mon Jan 31 10:03:15 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/cyrus-sasl-bdb.spec b/cyrus-sasl-bdb.spec
index 4529beb..5dfa71a 100644
--- a/cyrus-sasl-bdb.spec
+++ b/cyrus-sasl-bdb.spec
@@ -18,20 +18,17 @@
 
 Name:           cyrus-sasl-bdb
 %define lname   libsasl2-3
-Version:        2.1.27
+Version:        2.1.28
 Release:        0
-URL:            http://asg.web.cmu.edu/sasl/
+URL:            https://github.com/cyrusimap/cyrus-sasl
 Summary:        Implementation of Cyrus SASL API
 License:        BSD-4-Clause
 Group:          Productivity/Networking/Other
-
-Source:         cyrus-sasl-%{version}.tar.gz
+Source:         https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-%{version}/cyrus-sasl-%{version}.tar.gz
 Source1:        cyrus-sasl-rc.tar.bz2
 Source2:        README.Source
 Source3:        baselibs.conf
 Patch:          cyrus-sasl.dif
-# see https://github.com/cyrusimap/cyrus-sasl/issues/587
-Patch1:         cyrus-sasl-bug587.patch
 Patch5:         cyrus-sasl-no_rpath.patch
 Patch6:         cyrus-sasl-lfs.patch
 Patch7:         fix_libpq-fe_include.diff
@@ -166,7 +163,6 @@ then
     rm -rf %{_builddir}/cyrus-sasl-%{version}/dlcompat-*
 fi
 %patch
-%patch1 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
diff --git a/cyrus-sasl-bug587.patch b/cyrus-sasl-bug587.patch
deleted file mode 100644
index f2f6244..0000000
--- a/cyrus-sasl-bug587.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cyrus-sasl-2.1.27.orig/lib/common.c	2018-11-08 18:29:57.000000000 +0100
-+++ cyrus-sasl-2.1.27/lib/common.c	2019-11-28 21:15:11.246656079 +0100
-@@ -190,7 +190,7 @@
- 
-   if (add==NULL) add = "(null)";
- 
--  addlen=strlen(add); /* only compute once */
-+  addlen=strlen(add)+1; /* only compute once */
-   if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK)
-     return SASL_NOMEM;
diff --git a/cyrus-sasl-saslauthd-bdb.changes b/cyrus-sasl-saslauthd-bdb.changes
index 1c7e87c..47b9157 100644
--- a/cyrus-sasl-saslauthd-bdb.changes
+++ b/cyrus-sasl-saslauthd-bdb.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar  9 08:39:23 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.1.28 (bsc#1196036, CVE-2022-24407):
+  * https://www.cyrusimap.org/sasl/sasl/release-notes/2.1/index.html#new-in-2-1-28 
+- drop cyrus-sasl-bug587.patch (upstream)
+
 -------------------------------------------------------------------
 Mon Jan 31 10:03:15 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/cyrus-sasl-saslauthd-bdb.spec b/cyrus-sasl-saslauthd-bdb.spec
index 3e804f0..6fb43e9 100644
--- a/cyrus-sasl-saslauthd-bdb.spec
+++ b/cyrus-sasl-saslauthd-bdb.spec
@@ -22,22 +22,18 @@
 %endif
 
 Name:           cyrus-sasl-saslauthd-bdb
-Version:        2.1.27
+Version:        2.1.28
 Release:        0
 Summary:        The SASL Authentication Server
 License:        BSD-4-Clause
 Group:          Productivity/Networking/Other
-URL:            http://asg.web.cmu.edu/sasl/
-
-Source:         cyrus-sasl-%{version}.tar.gz
+URL:            https://github.com/cyrusimap/cyrus-sasl
+Source:         https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-%{version}/cyrus-sasl-%{version}.tar.gz
 Source1:        cyrus-sasl-rc.tar.bz2
 Source2:        README.Source
 Source3:        baselibs.conf
 Source4:        saslauthd.service
-
 Patch:          cyrus-sasl.dif
-# see https://github.com/cyrusimap/cyrus-sasl/issues/587
-Patch1:         cyrus-sasl-bug587.patch
 Patch5:         cyrus-sasl-no_rpath.patch
 Patch6:         cyrus-sasl-lfs.patch
 Patch7:         fix_libpq-fe_include.diff
@@ -81,7 +77,6 @@ The SQL auxprop plugin supports PostgreSQL and MySQL
 %prep
 %setup -n cyrus-sasl-%{version} -a 1
 %patch
-%patch1 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes
index 1c7e87c..47b9157 100644
--- a/cyrus-sasl-saslauthd.changes
+++ b/cyrus-sasl-saslauthd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar  9 08:39:23 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.1.28 (bsc#1196036, CVE-2022-24407):
+  * https://www.cyrusimap.org/sasl/sasl/release-notes/2.1/index.html#new-in-2-1-28 
+- drop cyrus-sasl-bug587.patch (upstream)
+
 -------------------------------------------------------------------
 Mon Jan 31 10:03:15 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec
index da854c5..5f4a650 100644
--- a/cyrus-sasl-saslauthd.spec
+++ b/cyrus-sasl-saslauthd.spec
@@ -22,22 +22,18 @@
 %endif
 
 Name:           cyrus-sasl-saslauthd
-Version:        2.1.27
+Version:        2.1.28
 Release:        0
 Summary:        The SASL Authentication Server
 License:        BSD-4-Clause
 Group:          Productivity/Networking/Other
-URL:            http://asg.web.cmu.edu/sasl/
-
-Source:         cyrus-sasl-%{version}.tar.gz
+URL:            https://github.com/cyrusimap/cyrus-sasl
+Source:         https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-%{version}/cyrus-sasl-%{version}.tar.gz
 Source1:        cyrus-sasl-rc.tar.bz2
 Source2:        README.Source
 Source3:        baselibs.conf
 Source4:        saslauthd.service
-
 Patch:          cyrus-sasl.dif
-# see https://github.com/cyrusimap/cyrus-sasl/issues/587
-Patch1:         cyrus-sasl-bug587.patch
 Patch5:         cyrus-sasl-no_rpath.patch
 Patch6:         cyrus-sasl-lfs.patch
 Patch7:         fix_libpq-fe_include.diff
@@ -81,7 +77,6 @@ The SQL auxprop plugin supports PostgreSQL and MySQL
 %prep
 %setup -n cyrus-sasl-%{version} -a 1
 %patch
-%patch1 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes
index 1c7e87c..47b9157 100644
--- a/cyrus-sasl.changes
+++ b/cyrus-sasl.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar  9 08:39:23 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.1.28 (bsc#1196036, CVE-2022-24407):
+  * https://www.cyrusimap.org/sasl/sasl/release-notes/2.1/index.html#new-in-2-1-28 
+- drop cyrus-sasl-bug587.patch (upstream)
+
 -------------------------------------------------------------------
 Mon Jan 31 10:03:15 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/cyrus-sasl.dif b/cyrus-sasl.dif
index 5b4a6af..17f7217 100644
--- a/cyrus-sasl.dif
+++ b/cyrus-sasl.dif
@@ -2,7 +2,7 @@ Index: m4/cyrus.m4
 ===================================================================
 --- m4/cyrus.m4.orig
 +++ m4/cyrus.m4
-@@ -37,7 +37,7 @@ AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
+@@ -36,7 +36,7 @@ AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
      SAVE_LDFLAGS="${LDFLAGS}"
      LDFLAGS="-R /usr/lib"
      AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-R"], [
@@ -15,7 +15,7 @@ Index: Makefile.am
 ===================================================================
 --- Makefile.am.orig
 +++ Makefile.am
-@@ -43,6 +43,7 @@ AUTOMAKE_OPTIONS = 1.7
+@@ -44,6 +44,7 @@ ACLOCAL_AMFLAGS = -I m4
  #
  ################################################################
  
@@ -25,11 +25,11 @@ Index: Makefile.am
  else
 Index: sasldb/Makefile.am
 ===================================================================
---- sasldb/Makefile.am	2016-01-29 18:35:35.000000000 +0100
-+++ sasldb/Makefile.am	2018-11-17 12:51:05.800696917 +0100
-@@ -57,3 +57,9 @@
+--- sasldb/Makefile.am.orig
++++ sasldb/Makefile.am
+@@ -57,3 +57,9 @@ EXTRA_libsasldb_la_SOURCES = $(extra_com
  libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
- libsasldb_la_LIBADD = $(SASL_DB_BACKEND)
+ libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
  libsasldb_la_LDFLAGS = -no-undefined
 +
 +# avoid these two files created at the same time, they use both the same
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 0b8ea29..857e397 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -18,19 +18,17 @@
 
 %define lname	libsasl2-3
 Name:           cyrus-sasl
-Version:        2.1.27
+Version:        2.1.28
 Release:        0
 Summary:        Implementation of Cyrus SASL API
 License:        BSD-4-Clause
 Group:          Productivity/Networking/Other
-URL:            http://asg.web.cmu.edu/sasl/
-Source:         %{name}-%{version}.tar.gz
+URL:            https://github.com/cyrusimap/cyrus-sasl/
+Source:         https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-%{version}/cyrus-sasl-%{version}.tar.gz
 Source1:        cyrus-sasl-rc.tar.bz2
 Source2:        README.Source
 Source3:        baselibs.conf
 Patch0:         cyrus-sasl.dif
-# see https://github.com/cyrusimap/cyrus-sasl/issues/587
-Patch1:         cyrus-sasl-bug587.patch
 Patch5:         cyrus-sasl-no_rpath.patch
 Patch6:         cyrus-sasl-lfs.patch
 Patch7:         fix_libpq-fe_include.diff
@@ -173,7 +171,6 @@ then
     rm -rf %{_builddir}/%{name}-%{version}/dlcompat-*
 fi
 %patch0
-%patch1 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1