Accepting request 751846 from network

OBS-URL: https://build.opensuse.org/request/show/751846
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cyrus-sasl?expand=0&rev=58

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;

cyrus-sasl-saslauthd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 28 20:07:43 UTC 2019 - Michael Ströder <michael@stroeder.com>
+
+- 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 <michael@stroeder.com>
 

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

cyrus-sasl.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 28 20:07:43 UTC 2019 - Michael Ströder <michael@stroeder.com>
+
+- 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 <michael@stroeder.com>
 

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