cyrus-sasl-2.1.27-3

c/cyrus-sasl/cyrus-sasl-vl.spec

@@ -8,14 +8,14 @@ Summary: The Cyrus SASL library.
 Summary(ja): Cyrus SASL ライブラリ
 Name: cyrus-sasl
 Version: 2.1.27
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
-Group: System Environment/Libraries
+Release: 3%{?_dist_release}%{?with_systemd:.systemd}
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 
 License: BSD with advertising
 URL: http://cyrusimap.org/
-Source0: ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-%{version}.tar.gz
+Source0: https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-%{version}/cyrus-sasl-%{version}.tar.gz
 Source4: saslauthd.init
 Source5: README.RPM
 Source9: saslauthd.sysconfig
@@ -26,13 +26,22 @@ Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.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
-
-Patch102: cyrus-sasl-2.1.26-configure.patch
-
-#security
-Patch1000: cyrus-sasl-cve-2019-19906.patch
-
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Patch60: cyrus-sasl-pr559-RC4-openssl.patch
+Patch100: cyrus-sasl-cve-2019-19906.patch
+Patch101: cyrus-sasl-2.1.27-Add-basic-test-infrastructure.patch
+Patch102: cyrus-sasl-2.1.27-Add-Channel-Binding-support-for-GSSAPI-GSS-SPNEGO.patch
+Patch103: cyrus-sasl-2.1.27-Add-support-for-setting-max-ssf-0-to-GSS-SPNEGO.patch
+Patch104: cyrus-sasl-2.1.27-Emit-debug-log-only-in-case-of-errors.patch
+Patch105: cyrus-sasl-2.1.27-fix-for-autoconf270.patch
+#https://github.com/simo5/cyrus-sasl/commit/ebd2387f06c84c7f9aac3167ec041bb01e5c6e48
+Patch106: cyrus-sasl-2.1.27-nostrncpy.patch
+# Upstream PR: https://github.com/cyrusimap/cyrus-sasl/pull/635
+Patch107: cyrus-sasl-2.1.27-Add-basic-test-plain-auth.patch
+#Migration tool should be removed from Fedora 36
+Patch108: cyrus-sasl-2.1.27-Migration-from-BerkeleyDB.patch
+Patch500: cyrus-sasl-2.1.27-coverity.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf, automake, libtool
 # Note: berkeley db for sasl2, gdbm for sasl1.
 BuildRequires: libdb-devel
@@ -46,8 +55,6 @@ BuildRequires: pkgconfig
 BuildRequires: krb5-devel
 BuildRequires: groff
 BuildRequires: libxcrypt-devel
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 %if %{with systemd}
 %{?systemd_requires}
 %else
@@ -55,26 +62,27 @@ Requires(post): chkconfig
 Requires(postun): chkconfig
 %endif
 
-
 %description
 The %{name} package contains the Cyrus implementation of SASL.
 SASL is the Simple Authentication and Security Layer, a method for
 adding authentication support to connection-based protocols.
 
+
 %package devel
 Summary: Files needed for developing applications with Cyrus SASL.
 Summary(ja): Cyrus SASL を用いるアプリケーションの開発に必要なファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package contains files needed for developing and
 compiling applications which use the Cyrus SASL library.
 
+
 %package gssapi
 Summary: GSSAPI support for Cyrus SASL.
 Summary(ja): Cyrus SASL の GSSAPI 認証サポート
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 
 %description gssapi
@@ -82,103 +90,113 @@ The %{name}-gssapi package contains the Cyrus SASL plugins which
 support GSSAPI authentication. GSSAPI is commonly used for Kerberos
 authentication.
 
+
 %package plain
 Summary: PLAIN and LOGIN support for Cyrus SASL.
 Summary(ja): Cyrus SASL の PLAIN, LOGIN 認証サポート
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 
 %description plain
 The %{name}-plain package contains the Cyrus SASL plugins which support
 PLAIN and LOGIN authentication schemes.
 
+
 %package md5
 Summary: CRAM-MD5 and DIGEST-MD5 support for Cyrus SASL.
 Summary(ja): Cyrus SASL の CRAM-MD5, DIGEST-MD5 認証サポート
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 
 %description md5
 The %{name}-md5 package contains the Cyrus SASL plugins which support
 CRAM-MD5 and DIGEST-MD5 authentication schemes.
 
+
 %package ntlm
 Summary: NTLM support for Cyrus SASL.
 Summary(ja): Cyrus SASL の NTLM 認証サポート
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 
 %description ntlm
 The %{name}-ntlm package contains the Cyrus SASL plugin which supports
 the NTLM authentication schemes.
 
+
 # This would more appropriately be named cyrus-sasl-auxprop-sql.
 %package sql
 Summary: SQL auxprop support for Cyrus SASL
 Summary(ja): Cyrus SASL の SQL auxprop サポート
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 
 %description sql
 The %{name}-sql package contains the Cyrus SASL plugin which supports
 using a RDBMS for storing shared secrets.
 
+
 # This was *almost* named cyrus-sasl-auxprop-ldapdb, but that's a lot of typing.
 %package ldap
 Summary: LDAP auxprop support for Cyrus SASL
 Summary(ja): Cyrus SASL の LDAP auxprop サポート
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 
 %description ldap
 The %{name}-ldap package contains the Cyrus SASL plugin which supports using
 a directory server, accessed using LDAP, for storing shared secrets.
 
+
 %package scram
 Summary: SCRAM auxprop support for Cyrus SASL
 Summary(ja): Cyrus SASL の SCRAM auxprop サポート
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 
 %description scram
 The %{name}-scram package contains the Cyrus SASL plugin which supports
 the SCRAM authentication scheme.
 
+
 %package gs2
 Summary: GS2 support for Cyrus SASL
 Summary(ja): Cyrus SASL の GS2 認証サポート
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 
 %description gs2
 The %{name}-gs2 package contains the Cyrus SASL plugin which supports
 the GS2 authentication scheme.
 
+
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
 Summary: The Cyrus SASL library.
 Summary(ja): Cyrus SASL ライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 The %{name} package contains the Cyrus implementation of SASL.
 SASL is the Simple Authentication and Security Layer, a method for
 adding authentication support to connection-based protocols.
 
+
 %package -n compat32-%{name}-devel
 Summary: Files needed for developing applications with Cyrus SASL.
 Summary(ja): Cyrus SASL を用いるアプリケーションの開発に必要なファイル
-Group: Development/Libraries
+Group: programming,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-devel
 The %{name}-devel package contains files needed for developing and
 compiling applications which use the Cyrus SASL library.
 
+
 %package -n compat32-%{name}-gssapi
 Summary: GSSAPI support for Cyrus SASL.
 Summary(ja): Cyrus SASL の GSSAPI 認証サポート
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-gssapi
@@ -186,36 +204,40 @@ The %{name}-gssapi package contains the Cyrus SASL plugins which
 support GSSAPI authentication. GSSAPI is commonly used for Kerberos
 authentication.
 
+
 %package -n compat32-%{name}-plain
 Summary: PLAIN and LOGIN support for Cyrus SASL.
 Summary(ja): Cyrus SASL の PLAIN, LOGIN 認証サポート
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-plain
 The %{name}-plain package contains the Cyrus SASL plugins which support
 PLAIN and LOGIN authentication schemes.
 
+
 %package -n compat32-%{name}-md5
 Summary: CRAM-MD5 and DIGEST-MD5 support for Cyrus SASL.
 Summary(ja): Cyrus SASL の CRAM-MD5, DIGEST-MD5 認証サポート
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-md5
 The %{name}-md5 package contains the Cyrus SASL plugins which support
 CRAM-MD5 and DIGEST-MD5 authentication schemes.
 
+
 %package -n compat32-%{name}-ntlm
 Summary: NTLM support for Cyrus SASL.
 Summary(ja): Cyrus SASL の NTLM 認証サポート
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-ntlm
 The %{name}-ntlm package contains the Cyrus SASL plugin which supports
 the NTLM authentication schemes.
 
+
 # %package -n compat32-%{name}-sql
 # Group: System Environment/Libraries
 # Summary: SQL auxprop support for Cyrus SASL
@@ -224,36 +246,43 @@ the NTLM authentication schemes.
 # The %{name}-sql package contains the Cyrus SASL plugin which supports
 # using a RDBMS for storing shared secrets.
 
+
 %package -n compat32-%{name}-ldap
 Summary: LDAP auxprop support for Cyrus SASL
 Summary(ja): Cyrus SASL の LDAP auxprop サポート
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-ldap
 The %{name}-ldap package contains the Cyrus SASL plugin which supports using
 a directory server, accessed using LDAP, for storing shared secrets.
 
+
 %package -n compat32-%{name}-scram
 Summary: SCRAM auxprop support for Cyrus SASL
 Summary(ja): Cyrus SASL の SCRAM auxprop サポート
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-scram
 The %{name}-scram package contains the Cyrus SASL plugin which supports
 the SCRAM authentication scheme.
 
+
 %package -n compat32-%{name}-gs2
 Summary: GS2 support for Cyrus SASL
 Summary(ja): Cyrus SASL の GS2 認証サポート
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-gs2
 The %{name}-gs2 package contains the Cyrus SASL plugin which supports
 the GS2 authentication scheme.
 
+
+%debug_package
+
+
 %prep
 %setup -q
 chmod -x doc/legacy/*.html
@@ -266,10 +295,18 @@ sed -i -e 's|/usr/local/etc|/etc|g' saslauthd/saslauthd.mdoc
 %endif
 %patch24 -p1 -b .sizes
 %patch49 -p1 -b .md5global.h
+%patch60 -p1 -b .openssl_rc4
+%patch100 -p1 -b .cve_2019_19906
+%patch101 -p1 -b .tests
+%patch102 -p1 -b .gssapi_cbs
+%patch103 -p1 -b .maxssf0
+%patch104 -p1 -b .nolog
+%patch105 -p1 -b .autoconf270
+%patch106 -p1 -b .nostrncpy
+%patch107 -p1 -b .plaintests
+%patch108 -p1 -b .frombdb
+%patch500 -p1 -b .coverity
 
-%patch102 -p1 -b .configure
-
-%patch1000 -p1 -b .CVE-2019-19906
 
 %build
 # FIXME - we remove these files directly so that we can avoid using the -f
@@ -395,6 +432,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_mandir}/cat8/saslauthd.8
 
+
 %clean
 test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
 
@@ -406,7 +444,6 @@ getent passwd %{username} >/dev/null || useradd -r -g saslauth -d /run/saslauthd
 %endif
 
 %post
-/sbin/ldconfig
 %if %{with systemd}
 if [ -e %{_initdir}/saslauthd ]; then
   /bin/systemctl --no-reload preset saslauthd.service || :
@@ -428,7 +465,6 @@ exit 0
 %endif
 
 %postun
-/sbin/ldconfig
 %if %{with systemd}
 %systemd_postun_with_restart saslauthd.service
 %else
@@ -438,15 +474,11 @@ fi
 exit 0
 %endif
 
-%if %{build_compat32}
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
-%endif
 
 %files
 %defattr(-,root,root)
 %license COPYING
-%doc AUTHORS NEWS README doc/legacy/*.html
+%doc AUTHORS README doc/legacy/*.html
 %doc $RPM_SOURCE_DIR/README.RPM
 %dir %{_sysconfdir}/sasl2
 %{_libdir}/libsasl*.so.*
@@ -454,6 +486,7 @@ exit 0
 %{_plugindir2}/*anonymous*.so*
 %{_plugindir2}/*sasldb*.so*
 %{_mandir}/man8/*
+%{_sbindir}/cyrusbdb2current
 %{_sbindir}/dbconverter-2
 %{_sbindir}/saslpasswd2
 %{_sbindir}/sasldblistusers2
@@ -505,8 +538,6 @@ exit 0
 
 %files devel
 %defattr(-,root,root)
-%doc doc/*.txt
-%defattr(-,root,root)
 %{_bindir}/sasl2-sample-client
 %{_bindir}/sasl2-sample-server
 %{_includedir}/*
@@ -564,6 +595,12 @@ exit 0
 
 
 %changelog
+* Tue Oct 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.27-3
+- rebuilt with openssl-3.0.0.
+- dropped ldconfig scriptlets.
+- dropped Patch102 and 1000.
+- imported Patch60-500 from rawhide.
+
 * Wed May 27 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.27-2
 - added systemd support (disables as default).