pool/cyrus-sasl
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 963371 from network

Browse Source 
- 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)

- 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)

- 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)

- 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)

OBS-URL: https://build.opensuse.org/request/show/963371
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cyrus-sasl?expand=0&rev=64
This commit is contained in:
Dominique Leuenberger 2022-03-23 19:15:22 +00:00 committed by Git OBS Bridge
commit 88f330f45e
12 changed files with 158 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cyrus-sasl-2.1.27.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5
size 4111249

BIN
cyrus-sasl-2.1.28.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

7
cyrus-sasl-bdb.changes
View File

@ -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>

115
cyrus-sasl-bdb.spec
View File

@ -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
@ -51,55 +48,98 @@ Obsoletes: cyrus-sasl-64bit
%endif
Conflicts: cyrus-sasl
%package gssapi
%description
This is the Cyrus SASL API. It can be used on the client or server side
to provide authentication. See RFC 2222 for more information.
%package gssapi
Summary: Plugin for the GSSAPI SASL mechanism
Group: Productivity/Networking/Other
Requires: cyrus-sasl-bdb = %{version}
Conflicts: cyrus-sasl-gssapi
%package crammd5
%description gssapi
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%package crammd5
Summary: Plugin for the CRAMMD5 SASL mechanism
Group: Productivity/Networking/Other
Requires: cyrus-sasl-bdb = %{version}
Conflicts: cyrus-sasl-crammd5
%package digestmd5
%description crammd5
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%package digestmd5
Summary: Plugin for the DIGESTMD5 SASL mechanism
Group: Productivity/Networking/Other
Requires: cyrus-sasl-bdb = %{version}
Conflicts: cyrus-sasl-digestmd5
%package otp
%description digestmd5
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%package otp
Summary: Plugin for the OTP SASL mechanism
Group: Productivity/Networking/Other
Requires: cyrus-sasl-bdb = %{version}
Conflicts: cyrus-sasl-otp
%package plain
%description otp
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%package plain
Summary: Plugin for the PLAIN SASL mechanism
Group: Productivity/Networking/Other
Requires: cyrus-sasl-bdb = %{version}
Conflicts: cyrus-sasl-plain
%package ntlm
%description plain
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%package ntlm
Summary: Plugin for the NTLM SASL mechanism
Group: Productivity/Networking/Other
Requires: cyrus-sasl-bdb = %{version}
Conflicts: cyrus-sasl-ntlm
%package gs2
%description ntlm
This is the Cyrus SASL API. It can be used on the client or server side
to provide authentication. See RFC 2222 for more information.
%package gs2
Summary: Plugin for the GS2 SASL mechanism
Group: Productivity/Networking/Other
Requires: cyrus-sasl-bdb = %{version}
Conflicts: cyrus-sasl-gs2
%package scram
%description gs2
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%package scram
Summary: Plugin for the SCRAM SASL mechanism
Group: Productivity/Networking/Other
Requires: cyrus-sasl-bdb = %{version}
Conflicts: cyrus-sasl-scram
%package devel
%description scram
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 5802 for more
information.
%package devel
# bug437293
%ifarch ppc64
Obsoletes: cyrus-sasl-devel-64bit
@ -111,53 +151,10 @@ Requires: %lname = %version
Requires: glibc-devel
Conflicts: cyrus-sasl-devel
%description
This is the Cyrus SASL API. It can be used on the client or server side
to provide authentication. See RFC 2222 for more information.
%description gssapi
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%description devel
This is the Cyrus SASL API. It can be used on the client or server side
to provide authentication. See RFC 2222 for more information.
%description digestmd5
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%description crammd5
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%description otp
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%description plain
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%description ntlm
This is the Cyrus SASL API. It can be used on the client or server side
to provide authentication. See RFC 2222 for more information.
%description gs2
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%description scram
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 5802 for more
information.
%prep
%setup -q -n cyrus-sasl-%{version} -a 1
if [ -e %{_builddir}/cyrus-sasl-%{version}/dlcompat-*/ ]
@ -166,7 +163,6 @@ then
rm -rf %{_builddir}/cyrus-sasl-%{version}/dlcompat-*
fi
%patch
%patch1 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
@ -199,6 +195,7 @@ chmod 0644 doc/*
rm -f doc/Makefile*
rm -f $RPM_BUILD_ROOT/%{_mandir}/cat?/*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/saslauthd*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/testsaslauthd*
rm -f $RPM_BUILD_ROOT/usr/sbin/saslauthd
rm -f $RPM_BUILD_ROOT/usr/sbin/testsaslauthd
rm -r $RPM_BUILD_ROOT%{_libdir}/libsasl2.so.3*

10
cyrus-sasl-bug587.patch
View File

@ -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;

7
cyrus-sasl-saslauthd-bdb.changes
View File

@ -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>

11
cyrus-sasl-saslauthd-bdb.spec
View File

@ -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

7
cyrus-sasl-saslauthd.changes
View File

@ -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>

11
cyrus-sasl-saslauthd.spec
View File

@ -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

7
cyrus-sasl.changes
View File

@ -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>

12
cyrus-sasl.dif
View File

@ -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

120
cyrus-sasl.spec
View File

@ -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
@ -47,55 +45,98 @@ Conflicts: cyrus-sasl-bdb
Obsoletes: cyrus-sasl-64bit
%endif
%package gssapi
%description
This is the Cyrus SASL API. It can be used on the client or server side
to provide authentication. See RFC 2222 for more information.
%package gssapi
Summary: Plugin for the GSSAPI SASL mechanism
Group: Productivity/Networking/Other
Requires: %{name} = %{version}
Conflicts: cyrus-sasl-bdb-gssapi
%package crammd5
%description gssapi
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%package crammd5
Summary: Plugin for the CRAMMD5 SASL mechanism
Group: Productivity/Networking/Other
Requires: %{name} = %{version}
Conflicts: cyrus-sasl-bdb-crammd5
%package digestmd5
%description crammd5
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%package digestmd5
Summary: Plugin for the DIGESTMD5 SASL mechanism
Group: Productivity/Networking/Other
Requires: %{name} = %{version}
Conflicts: cyrus-sasl-bdb-digestmd5
%package otp
%description digestmd5
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%package otp
Summary: Plugin for the OTP SASL mechanism
Group: Productivity/Networking/Other
Requires: %{name} = %{version}
Conflicts: cyrus-sasl-bdb-otp
%package plain
%description otp
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%package plain
Summary: Plugin for the PLAIN SASL mechanism
Group: Productivity/Networking/Other
Requires: %{name} = %{version}
Conflicts: cyrus-sasl-bdb-plain
%package ntlm
%description plain
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%package ntlm
Summary: Plugin for the NTLM SASL mechanism
Group: Productivity/Networking/Other
Requires: %{name} = %{version}
Conflicts: cyrus-sasl-bdb-ntlm
%package gs2
%description ntlm
This is the Cyrus SASL API. It can be used on the client or server side
to provide authentication. See RFC 2222 for more information.
%package gs2
Summary: Plugin for the GS2 SASL mechanism
Group: Productivity/Networking/Other
Requires: %{name} = %{version}
Conflicts: cyrus-sasl-bdb-ntlm
%package scram
%description gs2
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%package scram
Summary: Plugin for the SCRAM SASL mechanism
Group: Productivity/Networking/Other
Requires: %{name} = %{version}
Conflicts: cyrus-sasl-bdb-scram
%package devel
%description scram
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 5802 for more
information.
%package devel
Summary: Cyrus SASL API Implementation, Libraries and Header Files
Group: Development/Libraries/C and C++
Requires: %lname = %version
@ -106,56 +147,13 @@ Conflicts: cyrus-sasl-devel-bdb
Obsoletes: cyrus-sasl-devel-64bit
%endif
%package -n libsasl2-3
Summary: Simple Authentication and Security Layer (SASL) library
Group: System/Libraries
%description
This is the Cyrus SASL API. It can be used on the client or server side
to provide authentication. See RFC 2222 for more information.
%description gssapi
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%description devel
This is the Cyrus SASL API. It can be used on the client or server side
to provide authentication. See RFC 2222 for more information.
%description digestmd5
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%description crammd5
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%description otp
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%description plain
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%description ntlm
This is the Cyrus SASL API. It can be used on the client or server side
to provide authentication. See RFC 2222 for more information.
%description gs2
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 2222 for more
information.
%description scram
This is the Cyrus SASL API implementation. It can be used on the client
or server side to provide authentication. See RFC 5802 for more
information.
%package -n libsasl2-3
Summary: Simple Authentication and Security Layer (SASL) library
Group: System/Libraries
%description -n libsasl2-3
Simple Authentication and Security Layer (SASL) is a framework for
@ -173,7 +171,6 @@ then
rm -rf %{_builddir}/%{name}-%{version}/dlcompat-*
fi
%patch0
%patch1 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
@ -207,6 +204,7 @@ chmod 0644 doc/*
rm -f doc/Makefile*
rm -f %{buildroot}/%{_mandir}/cat?/*
rm -f %{buildroot}/%{_mandir}/man8/saslauthd*
rm -f %{buildroot}/%{_mandir}/man8/testsaslauthd*
rm -f %{buildroot}%{_sbindir}/saslauthd
rm -f %{buildroot}%{_sbindir}/testsaslauthd
find %{buildroot} -type f -name "*.la" -delete -print