From 09be16f01d324654026139cd3c24cde49c86d7a5 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Thu, 13 Jun 2019 18:02:10 -0400 Subject: [PATCH] Update to final 2.1.27 release Signed-off-by: Simo Sorce --- .gitignore | 1 + ...0e51c7fa0421eb2f0210d34cf0ac48a228b1e9.patch | 17 ----------------- cyrus-sasl.spec | 11 +++++------ make-no-dlcompatorsrp-tarball.sh | 2 +- sources | 2 +- 5 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 cyrus-sasl-2.1.26-revert-upstream-080e51c7fa0421eb2f0210d34cf0ac48a228b1e9.patch diff --git a/.gitignore b/.gitignore index fbd2fa9..b3ce182 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ cyrus-sasl-2.1.23-nodlcompatorsrp.tar.gz /cyrus-sasl-2.1.25-nodlcompatorsrp.tar.gz /cyrus-sasl-2.1.26-nodlcompatorsrp.tar.gz /cyrus-sasl-2.1.27-rc7-nodlcompatorsrp.tar.gz +/cyrus-sasl-2.1.27-nodlcompatorsrp.tar.gz diff --git a/cyrus-sasl-2.1.26-revert-upstream-080e51c7fa0421eb2f0210d34cf0ac48a228b1e9.patch b/cyrus-sasl-2.1.26-revert-upstream-080e51c7fa0421eb2f0210d34cf0ac48a228b1e9.patch deleted file mode 100644 index 2f5c5c7..0000000 --- a/cyrus-sasl-2.1.26-revert-upstream-080e51c7fa0421eb2f0210d34cf0ac48a228b1e9.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/plugins/gssapi.c b/plugins/gssapi.c -index e6fcf46..a27eb2b 100644 ---- a/plugins/gssapi.c -+++ b/plugins/gssapi.c -@@ -1594,10 +1594,10 @@ static int gssapi_client_mech_step(void *conn_context, - } - - /* Setup req_flags properly */ -- req_flags = GSS_C_INTEG_FLAG; -+ req_flags = GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG; - if (params->props.max_ssf > params->external_ssf) { - /* We are requesting a security layer */ -- req_flags |= GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG; -+ req_flags |= GSS_C_INTEG_FLAG; - /* Any SSF bigger than 1 is confidentiality. */ - /* Let's check if the client of the API requires confidentiality, - and it wasn't already provided by an external layer */ diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 354e334..2f8d634 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -8,14 +8,14 @@ Summary: The Cyrus SASL library Name: cyrus-sasl Version: 2.1.27 -Release: 0.6rc7%{?dist} +Release: 1%{?dist} License: BSD with advertising URL: https://www.cyrusimap.org/sasl/ # Source0 originally comes from https://www.cyrusimap.org/releases/; # make-no-dlcompatorsrp-tarball.sh removes the "dlcompat" subdirectory and builds a # new tarball. -Source0: cyrus-sasl-%{version}-rc7-nodlcompatorsrp.tar.gz +Source0: cyrus-sasl-%{version}-nodlcompatorsrp.tar.gz Source5: saslauthd.service Source7: sasl-mechlist.c Source9: saslauthd.sysconfig @@ -31,9 +31,6 @@ Patch23: cyrus-sasl-2.1.23-man.patch Patch24: cyrus-sasl-2.1.21-sizes.patch # The 64 bit *INT8 type is not used anywhere and other types match Patch49: cyrus-sasl-2.1.26-md5global.patch -# revert upstream commit 080e51c7fa0421eb2f0210d34cf0ac48a228b1e9 (#984079) -# https://bugzilla.cyrusimap.org/show_bug.cgi?id=3480 -Patch50: cyrus-sasl-2.1.26-revert-upstream-080e51c7fa0421eb2f0210d34cf0ac48a228b1e9.patch BuildRequires: autoconf, automake, libtool, gdbm-devel, groff BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig @@ -152,7 +149,6 @@ the GS2 authentication scheme. %patch23 -p1 -b .man %patch24 -p1 -b .sizes %patch49 -p1 -b .md5global.h -%patch50 -p1 -b .gssapi %build # reconfigure @@ -359,6 +355,9 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} %{_sbindir}/sasl2-shared-mechlist %changelog +* Thu Jun 13 2019 Simo Sorce - 2.1.27-1 +- Update to final 2.1.27 sources + * Thu Jan 31 2019 Fedora Release Engineering - 2.1.27-0.6rc7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/make-no-dlcompatorsrp-tarball.sh b/make-no-dlcompatorsrp-tarball.sh index a0a3245..e58dc3b 100755 --- a/make-no-dlcompatorsrp-tarball.sh +++ b/make-no-dlcompatorsrp-tarball.sh @@ -1,6 +1,6 @@ #!/bin/bash -e # -# See ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ for unmodified sources. +# See https://github.com/cyrusimap/cyrus-sasl/releases for unmodified sources. # tmppath=`mktemp -d ${TMPDIR:-/tmp}/make-no-dlcompat-tarball-XXXXXX` diff --git a/sources b/sources index 637811b..cf1def5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cyrus-sasl-2.1.27-rc7-nodlcompatorsrp.tar.gz) = 8ecb21e82b2ca51bbc5ae08b2b68f63e5e6abdd5c8990cd30da3d35a5c6778689a7670769cddb1dca2d86c07a0316fb86ed18ac139e6b2586d880c9cce4b9a64 +SHA512 (cyrus-sasl-2.1.27-nodlcompatorsrp.tar.gz) = 86c45f729d5cf0aacc20c880d1cea5d927536c602d5d5866838036f00babfd5b89cb94d14a2c6ca4d78073f8f5c08da0f1f64a9a32b26c5f1e28b0d9246fd38e