From 8921302ca2b6c2cf87c66d735da2c22b3863f136c241b6152901414a72e5c128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 29 Nov 2019 09:49:12 +0000 Subject: [PATCH] Accepting request 751708 from home:stroeder:branches:network - added backport-patch cyrus-sasl-bug587.patch which fixes off-by-one error in _sasl_add_string function (see https://github.com/cyrusimap/cyrus-sasl/issues/587) - added backport-patch cyrus-sasl-bug587.patch which fixes off-by-one error in _sasl_add_string function (see https://github.com/cyrusimap/cyrus-sasl/issues/587) OBS-URL: https://build.opensuse.org/request/show/751708 OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=77 --- cyrus-sasl-bug587.patch | 10 ++++++++++ cyrus-sasl-saslauthd.changes | 7 +++++++ cyrus-sasl-saslauthd.spec | 3 +++ cyrus-sasl.changes | 7 +++++++ cyrus-sasl.spec | 3 +++ 5 files changed, 30 insertions(+) create mode 100644 cyrus-sasl-bug587.patch diff --git a/cyrus-sasl-bug587.patch b/cyrus-sasl-bug587.patch new file mode 100644 index 0000000..f2f6244 --- /dev/null +++ b/cyrus-sasl-bug587.patch @@ -0,0 +1,10 @@ +--- 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.changes b/cyrus-sasl-saslauthd.changes index 72bc603..088b58d 100644 --- a/cyrus-sasl-saslauthd.changes +++ b/cyrus-sasl-saslauthd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 28 20:07:43 UTC 2019 - Michael Ströder + +- added backport-patch cyrus-sasl-bug587.patch which fixes + off-by-one error in _sasl_add_string function + (see https://github.com/cyrusimap/cyrus-sasl/issues/587) + ------------------------------------------------------------------- Sat Nov 17 10:14:14 UTC 2018 - Michael Ströder diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec index edd290b..16e76ed 100644 --- a/cyrus-sasl-saslauthd.spec +++ b/cyrus-sasl-saslauthd.spec @@ -36,6 +36,8 @@ 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 @@ -76,6 +78,7 @@ 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 5d8a0fa..5ad22a6 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 28 20:07:43 UTC 2019 - Michael Ströder + +- added backport-patch cyrus-sasl-bug587.patch which fixes + off-by-one error in _sasl_add_string function + (see https://github.com/cyrusimap/cyrus-sasl/issues/587) + ------------------------------------------------------------------- Sat Nov 17 10:14:14 UTC 2018 - Michael Ströder diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index eb4ac7a..3c3da5b 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -30,6 +30,8 @@ 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 @@ -164,6 +166,7 @@ then rm -rf %{_builddir}/%{name}-%{version}/dlcompat-* fi %patch +%patch1 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1