开源软件构建与测试

_service:extract_file:cyrus-sasl.spec Deleted

@@ -1,308 +0,0 @@
-%global username    saslauth
-%global hint        Saslauthd user
-%global homedir     /run/saslauthd
-
-%global bootstrap_cyrus_sasl 0
-
-Name: cyrus-sasl
-Version: 2.1.27
-Release: 14
-Summary: The Cyrus SASL API Implementation
-
-License: BSD with advertising
-URL: https://www.cyrusimap.org/sasl/
-Source0: https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz
-Source1: saslauthd.service
-Source2: saslauthd.sysconfig
-
-Patch0: 0003-Prevent-double-free-of-RC4-context.patch
-Patch1: fix-CVE-2019-19906.patch
-Patch2: backport-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch
-Patch3: backport-CVE-2022-24407-Escape-password-for-SQL-insert-update.patch
-Patch4: backport-configure-fix-check-for-dlsym-underscore.patch
-Patch5: backport-configure.ac-avoid-side-effects-in-AC_CACHE_VAL.patch  
-Patch6: backport-configure.ac-properly-quote-macro-arguments.patch
-
-BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
-BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig
-BuildRequires: mariadb-connector-c-devel, postgresql-devel, zlib-devel
-%if ! %{bootstrap_cyrus_sasl}
-BuildRequires: openldap-devel
-%endif
-%{?systemd_requires}
-
-Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd
-Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel
-Requires: /sbin/nologin
-Requires: systemd >= 211
-
-Provides: user(%username)
-Provides: group(%username)
-Provides: %{name}-gssapi = %{version}-%{release}
-Provides: %{name}-gssapi%{?_isa} = %{version}-%{release}
-Provides: %{name}-plain  = %{version}-%{release}
-Provides: %{name}-md5 = %{version}-%{release}
-Provides: %{name}-ntlm = %{version}-%{release}
-Provides: %{name}-ldap = %{version}-%{release}
-Provides: %{name}-scram = %{version}-%{release}
-Provides: %{name}-gs2 = %{version}-%{release}
-Obsoletes: %{name}-gssapi  < %{version}-%{release}
-Obsoletes: %{name}-plain  < %{version}-%{release}
-Obsoletes: %{name}-md5 < %{version}-%{release}
-Obsoletes: %{name}-ntlm < %{version}-%{release}
-Obsoletes: %{name}-ldap < %{version}-%{release}
-Obsoletes: %{name}-scram < %{version}-%{release}
-Obsoletes: %{name}-gs2 < %{version}-%{release}
-
-%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: Development files for %{name}
-Requires: %{name}-lib%{?_isa} = %{version}-%{release}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: pkgconf
-
-%description devel
-The %{name}-devel package contains files needed for developing and
-compiling applications which use the Cyrus SASL library.
-
-%package lib
-Summary: Shared libraries needed by applications which use Cyrus SASL
-
-%description lib
-The %{name}-lib package contains shared libraries which are needed by
-applications which use the Cyrus SASL library.
-
-%package sql
-Summary: SQL auxprop support for Cyrus SASL
-Requires: %{name}-lib%{?_isa} = %{version}-%{release}
-
-%description sql
-The %{name}-sql package contains the Cyrus SASL plugin which supports
-using a RDBMS for storing shared secrets.
-
-%package_help
-
-%prep
-%autosetup -n %{name}-%{version} -p1
-
-%build
-rm configure aclocal.m4 config/ltmain.sh Makefile.in
-export NOCONFIGURE=yes
-aclocal --install
-autoreconf --verbose --force --install -Wno-portability
- 
-krb5_prefix=`krb5-config --prefix`
-if test x$krb5_prefix = x%{_prefix} ; then
-        krb5_prefix=
-else
-        CPPFLAGS="-I${krb5_prefix}/include $CPPFLAGS"; export CPPFLAGS
-        LDFLAGS="-L${krb5_prefix}/%{_lib} $LDFLAGS"; export LDFLAGS
-fi
- 
-LIBS="-lcrypt"; export LIBS
-if pkg-config openssl ; then
-        CPPFLAGS="`pkg-config --cflags-only-I openssl` $CPPFLAGS"; export CPPFLAGS
-        LDFLAGS="`pkg-config --libs-only-L openssl` $LDFLAGS"; export LDFLAGS
-fi
- 
-INC_DIR="`mysql_config --include`"
-if test x"$INC_DIR" != "x-I%{_includedir}"; then
-        CPPFLAGS="$INC_DIR $CPPFLAGS"; export CPPFLAGS
-fi
-LIB_DIR="`mysql_config --libs | sed -e 's,-^L^ *,,g' -e 's,^ *,,' -e 's, *$,,' -e 's,  *, ,g'`"
-if test x"$LIB_DIR" != "x-L%{_libdir}"; then
-        LDFLAGS="$LIB_DIR $LDFLAGS"; export LDFLAGS
-fi
- 
-INC_DIR="-I`pg_config --includedir`"
-if test x"$INC_DIR" != "x-I%{_includedir}"; then
-        CPPFLAGS="$INC_DIR $CPPFLAGS"; export CPPFLAGS
-fi
-LIB_DIR="-L`pg_config --libdir`"
-if test x"$LIB_DIR" != "x-L%{_libdir}"; then
-        LDFLAGS="$LIB_DIR $LDFLAGS"; export LDFLAGS
-fi
- 
-CFLAGS="$RPM_OPT_FLAGS $CFLAGS $CPPFLAGS -fPIC -pie -Wl,-z,relro -Wl,-z,now"; export CFLAGS
- 
-echo "$CFLAGS"
-echo "$CPPFLAGS"
-echo "$LDFLAGS"
- 
-%configure \
-        --enable-shared --disable-static \
-        --disable-java \
-        --with-plugindir=%{_libdir}/sasl2 \
-        --with-configdir=%{_libdir}/sasl2:%{_sysconfdir}/sasl2 \
-        --disable-krb4 \
-        --enable-gssapi${krb5_prefix:+=${krb5_prefix}} \
-        --with-gss_impl=mit \
-        --with-rc4 \
-        --with-bdb=gdbm \
-        --with-saslauthd=/run/saslauthd --without-pwcheck \
-%if ! %{bootstrap_cyrus_sasl}
-        --with-ldap \
-%endif
-        --with-devrandom=/dev/urandom \
-        --enable-anon \
-        --enable-cram \
-        --enable-digest \
-        --enable-ntlm \
-        --enable-plain \
-        --enable-login \
-        --enable-alwaystrue \
-        --enable-httpform \
-        --disable-otp \
-%if ! %{bootstrap_cyrus_sasl}
-        --enable-ldapdb \
-%endif
-        --enable-sql --with-mysql=yes --with-pgsql=yes \
-        --without-sqlite \
-        "$@"
-make sasldir=%{_libdir}/sasl2
-make -C saslauthd testsaslauthd
-make -C sample
- 
-
-%install
-test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
- 
-make install DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2
-make install DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 -C plugins
- 
-install -m755 -d $RPM_BUILD_ROOT%{_bindir}
-./libtool --mode=install \
-install -m755 sample/client $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-client
-./libtool --mode=install \
-install -m755 sample/server $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-server
-./libtool --mode=install \
-install -m755 saslauthd/testsaslauthd $RPM_BUILD_ROOT%{_sbindir}/testsaslauthd
-install -m755 -d $RPM_BUILD_ROOT%{_mandir}/man8/
-install -m644 -p saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8
-install -m755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d $RPM_BUILD_ROOT/etc/sysconfig
-install -d -m755 $RPM_BUILD_ROOT/%{_unitdir}
-install -m644 -p %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}/saslauthd.service
-install -m644 -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
-install -m755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2
-install -m755 -d $RPM_BUILD_ROOT/%{_libdir}/sasl2
- 
-rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/libotp.*
-rm -f $RPM_BUILD_ROOT%{_mandir}/cat8/saslauthd.8
-%delete_la_and_a
-
-%check
-make check
-

_service:tar_scm:cyrus-sasl.spec Added

@@ -0,0 +1,308 @@
+%global username    saslauth
+%global hint        Saslauthd user
+%global homedir     /run/saslauthd
+
+%global bootstrap_cyrus_sasl 0
+
+Name: cyrus-sasl
+Version: 2.1.28
+Release: 1
+Summary: The Cyrus SASL API Implementation
+
+License: BSD with advertising
+URL: https://www.cyrusimap.org/sasl/
+Source0: https://github.com/cyrusimap/cyrus-sasl/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source1: saslauthd.service
+Source2: saslauthd.sysconfig
+
+Patch1:  backport-Fix-earlier-554-commit-to-use-fetch_errno-instead-of.patch
+
+BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
+BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig
+BuildRequires: mariadb-connector-c-devel, postgresql-devel, zlib-devel
+%if ! %{bootstrap_cyrus_sasl}
+BuildRequires: openldap-devel
+%endif
+%{?systemd_requires}
+
+Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd
+Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel
+Requires: /sbin/nologin
+Requires: systemd >= 211
+
+Provides: user(%username)
+Provides: group(%username)
+Provides: %{name}-gssapi = %{version}-%{release}
+Provides: %{name}-gssapi%{?_isa} = %{version}-%{release}
+Provides: %{name}-plain  = %{version}-%{release}
+Provides: %{name}-md5 = %{version}-%{release}
+Provides: %{name}-ntlm = %{version}-%{release}
+Provides: %{name}-ldap = %{version}-%{release}
+Provides: %{name}-scram = %{version}-%{release}
+Provides: %{name}-gs2 = %{version}-%{release}
+Obsoletes: %{name}-gssapi  < %{version}-%{release}
+Obsoletes: %{name}-plain  < %{version}-%{release}
+Obsoletes: %{name}-md5 < %{version}-%{release}
+Obsoletes: %{name}-ntlm < %{version}-%{release}
+Obsoletes: %{name}-ldap < %{version}-%{release}
+Obsoletes: %{name}-scram < %{version}-%{release}
+Obsoletes: %{name}-gs2 < %{version}-%{release}
+
+%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: Development files for %{name}
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: pkgconf
+
+%description devel
+The %{name}-devel package contains files needed for developing and
+compiling applications which use the Cyrus SASL library.
+
+%package lib
+Summary: Shared libraries needed by applications which use Cyrus SASL
+
+%description lib
+The %{name}-lib package contains shared libraries which are needed by
+applications which use the Cyrus SASL library.
+
+%package sql
+Summary: SQL auxprop support for Cyrus SASL
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+
+%description sql
+The %{name}-sql package contains the Cyrus SASL plugin which supports
+using a RDBMS for storing shared secrets.
+
+%package_help
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+%build
+rm configure aclocal.m4 config/ltmain.sh Makefile.in
+export NOCONFIGURE=yes
+aclocal --install
+autoreconf --verbose --force --install -Wno-portability
+ 
+krb5_prefix=`krb5-config --prefix`
+if test x$krb5_prefix = x%{_prefix} ; then
+        krb5_prefix=
+else
+        CPPFLAGS="-I${krb5_prefix}/include $CPPFLAGS"; export CPPFLAGS
+        LDFLAGS="-L${krb5_prefix}/%{_lib} $LDFLAGS"; export LDFLAGS
+fi
+ 
+LIBS="-lcrypt"; export LIBS
+if pkg-config openssl ; then
+        CPPFLAGS="`pkg-config --cflags-only-I openssl` $CPPFLAGS"; export CPPFLAGS
+        LDFLAGS="`pkg-config --libs-only-L openssl` $LDFLAGS"; export LDFLAGS
+fi
+ 
+INC_DIR="`mysql_config --include`"
+if test x"$INC_DIR" != "x-I%{_includedir}"; then
+        CPPFLAGS="$INC_DIR $CPPFLAGS"; export CPPFLAGS
+fi
+LIB_DIR="`mysql_config --libs | sed -e 's,-^L^ *,,g' -e 's,^ *,,' -e 's, *$,,' -e 's,  *, ,g'`"
+if test x"$LIB_DIR" != "x-L%{_libdir}"; then
+        LDFLAGS="$LIB_DIR $LDFLAGS"; export LDFLAGS
+fi
+ 
+INC_DIR="-I`pg_config --includedir`"
+if test x"$INC_DIR" != "x-I%{_includedir}"; then
+        CPPFLAGS="$INC_DIR $CPPFLAGS"; export CPPFLAGS
+fi
+LIB_DIR="-L`pg_config --libdir`"
+if test x"$LIB_DIR" != "x-L%{_libdir}"; then
+        LDFLAGS="$LIB_DIR $LDFLAGS"; export LDFLAGS
+fi
+ 
+CFLAGS="$RPM_OPT_FLAGS $CFLAGS $CPPFLAGS -fPIC -pie -Wl,-z,relro -Wl,-z,now"; export CFLAGS
+ 
+echo "$CFLAGS"
+echo "$CPPFLAGS"
+echo "$LDFLAGS"
+ 
+%configure \
+        --enable-shared --disable-static \
+        --disable-java \
+        --with-plugindir=%{_libdir}/sasl2 \
+        --with-configdir=%{_libdir}/sasl2:%{_sysconfdir}/sasl2 \
+        --disable-krb4 \
+        --enable-gssapi${krb5_prefix:+=${krb5_prefix}} \
+        --with-gss_impl=mit \
+        --with-rc4 \
+        --with-bdb=gdbm \
+        --with-saslauthd=/run/saslauthd --without-pwcheck \
+%if ! %{bootstrap_cyrus_sasl}
+        --with-ldap \
+%endif
+        --with-devrandom=/dev/urandom \
+        --enable-anon \
+        --enable-cram \
+        --enable-digest \
+        --enable-ntlm \
+        --enable-plain \
+        --enable-login \
+        --enable-alwaystrue \
+        --enable-httpform \
+        --disable-otp \
+%if ! %{bootstrap_cyrus_sasl}
+        --enable-ldapdb \
+%endif
+        --enable-sql --with-mysql=yes --with-pgsql=yes \
+        --without-sqlite \
+        "$@"
+make sasldir=%{_libdir}/sasl2
+make -C saslauthd testsaslauthd
+make -C sample
+ 
+
+%install
+test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
+ 
+make install DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2
+make install DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 -C plugins
+ 
+install -m755 -d $RPM_BUILD_ROOT%{_bindir}
+./libtool --mode=install \
+install -m755 sample/client $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-client
+./libtool --mode=install \
+install -m755 sample/server $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-server
+./libtool --mode=install \
+install -m755 saslauthd/testsaslauthd $RPM_BUILD_ROOT%{_sbindir}/testsaslauthd
+install -m755 -d $RPM_BUILD_ROOT%{_mandir}/man8/
+install -m644 -p saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8
+install -m755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d $RPM_BUILD_ROOT/etc/sysconfig
+install -d -m755 $RPM_BUILD_ROOT/%{_unitdir}
+install -m644 -p %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}/saslauthd.service
+install -m644 -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
+install -m755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2
+install -m755 -d $RPM_BUILD_ROOT/%{_libdir}/sasl2
+ 
+rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/libotp.*
+rm -f $RPM_BUILD_ROOT%{_mandir}/cat8/saslauthd.8
+%delete_la_and_a
+
+%check
+make check
+
+%pre
+getent group %{username} >/dev/null || groupadd -g 76 -r %{username}
+getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} -s /sbin/nologin -c "%{hint}" %{username}
+
+%post
+%systemd_post saslauthd.service

_service:extract_file:0003-Prevent-double-free-of-RC4-context.patch Deleted

@@ -1,34 +0,0 @@
-From ca6c587cc9da51235b125a97e841fa786aaad7ff Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Tue, 16 Apr 2019 10:18:43 -0400
-Subject: PATCH 3/3 Prevent double free of RC4 context
-
-Signed-off-by: Simo Sorce <simo@redhat.com>
----
- plugins/digestmd5.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/digestmd5.c b/plugins/digestmd5.c
-index f184c16..df35093 100644
---- a/plugins/digestmd5.c
-+++ b/plugins/digestmd5.c
-@@ -1224,8 +1224,14 @@ static void free_rc4(context_t *text)
- {
-     /* free rc4 context structures */
- 
--    if(text->cipher_enc_context) text->utils->free(text->cipher_enc_context);
--    if(text->cipher_dec_context) text->utils->free(text->cipher_dec_context);
-+    if (text->cipher_enc_context) {
-+        text->utils->free(text->cipher_enc_context);
-+        text->cipher_enc_context = NULL;
-+    }
-+    if (text->cipher_dec_context) {
-+        text->utils->free(text->cipher_dec_context);
-+        text->cipher_dec_context = NULL;
-+    }
- }
- 
- static int init_rc4(context_t *text, 
--- 
-2.7.4
-

_service:extract_file:backport-CVE-2022-24407-Escape-password-for-SQL-insert-update.patch Deleted

@@ -1,82 +0,0 @@
-From 9eff746c9daecbcc0041b09a5a51ba30738cdcbc Mon Sep 17 00:00:00 2001
-From: Klaus Espenlaub <klaus@espenlaub.com>
-Date: Tue, 8 Feb 2022 20:34:40 +0000
-Subject: PATCH CVE-2022-24407 Escape password for SQL insert/update
- commands.
-
-Signed-off-by: Klaus Espenlaub <klaus@espenlaub.com>
----
- plugins/sql.c | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/sql.c b/plugins/sql.c
-index 31b54a7..6ac81c2 100644
---- a/plugins/sql.c
-+++ b/plugins/sql.c
-@@ -1151,6 +1151,7 @@ static int sql_auxprop_store(void *glob_context,
-     char *statement = NULL;
-     char *escap_userid = NULL;
-     char *escap_realm = NULL;
-+    char *escap_passwd = NULL;
-     const char *cmd;
-     
-     sql_settings_t *settings;
-@@ -1222,6 +1223,11 @@ static int sql_auxprop_store(void *glob_context,
- 			    "Unable to begin transaction\n");
-     }
-     for (cur = to_store; ret == SASL_OK && cur->name; cur++) {
-+	/* Free the buffer, current content is from previous loop. */
-+	if (escap_passwd) {
-+	    sparams->utils->free(escap_passwd);
-+	    escap_passwd = NULL;
-+	}
- 
- 	if (cur->name0 == '*') {
- 	    continue;
-@@ -1243,19 +1249,32 @@ static int sql_auxprop_store(void *glob_context,
- 	}
- 	sparams->utils->free(statement);
- 
-+	if (cur->values0) {
-+	    escap_passwd = (char *)sparams->utils->malloc(strlen(cur->values0)*2+1);
-+	    if (!escap_passwd) {
-+		ret = SASL_NOMEM;
-+		break;
-+	    }
-+	    settings->sql_engine->sql_escape_str(escap_passwd, cur->values0);
-+	}
-+
- 	/* create a statement that we will use */
- 	statement = sql_create_statement(cmd, cur->name, escap_userid,
- 					 escap_realm,
--					 cur->values && cur->values0 ?
--					 cur->values0 : SQL_NULL_VALUE,
-+					 escap_passwd ?
-+					 escap_passwd : SQL_NULL_VALUE,
- 					 sparams->utils);
-+	if (!statement) {
-+	    ret = SASL_NOMEM;
-+	    break;
-+	}
- 	
- 	{
- 	    char *log_statement =
- 		sql_create_statement(cmd, cur->name,
- 				     escap_userid,
- 				     escap_realm,
--				     cur->values && cur->values0 ?
-+				     escap_passwd ?
- 				     "<omitted>" : SQL_NULL_VALUE,
- 				     sparams->utils);
- 	    sparams->utils->log(sparams->utils->conn, SASL_LOG_DEBUG,
-@@ -1288,6 +1307,7 @@ static int sql_auxprop_store(void *glob_context,
-   done:
-     if (escap_userid) sparams->utils->free(escap_userid);
-     if (escap_realm) sparams->utils->free(escap_realm);
-+    if (escap_passwd) sparams->utils->free(escap_passwd);
-     if (conn) settings->sql_engine->sql_close(conn);
-     if (userid) sparams->utils->free(userid);
-     if (realm) sparams->utils->free(realm);
--- 
-1.8.3.1
-

_service:extract_file:backport-configure-fix-check-for-dlsym-underscore.patch Deleted

_service:extract_file:backport-configure.ac-avoid-side-effects-in-AC_CACHE_VAL.patch Deleted

@@ -1,37 +0,0 @@
-From 15cbc14aeb4b754b1b3db65f7c892c7deabaab41 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Thu, 1 Apr 2021 17:17:52 +0200
-Subject: PATCH configure.ac: avoid side-effects in AC_CACHE_VAL
-
-In the COMMANDS-TO-SET-IT argument, per Autoconf docs:
-https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Caching-Results.html
-
-Signed-off-by: Pavel Raiskup <praiskup@redhat.com>
----
- configure.ac | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f3e5ddc..79c93c8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -221,11 +221,14 @@ void foo() { int i=0;}
- int main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY);
-     if(self) { ptr1=dlsym(self,"foo"); ptr2=dlsym(self,"_foo");
-     if(ptr1 && !ptr2) exit(0); } exit(1); } 
--, sasl_cv_dlsym_adds_uscore=yes, sasl_cv_dlsym_adds_uscore=no
--	AC_DEFINE(DLSYM_NEEDS_UNDERSCORE, , Do we need a leading _ for dlsym?),
-+, sasl_cv_dlsym_adds_uscore=yes, sasl_cv_dlsym_adds_uscore=no,
- 	AC_MSG_WARN(cross-compiler, we'll do our best)))
- 	LIBS="$cmu_save_LIBS"
-       AC_MSG_RESULT($sasl_cv_dlsym_adds_uscore)
-+
-+      if test "$sasl_cv_dlsym_adds_uscore" = no; then
-+        AC_DEFINE(DLSYM_NEEDS_UNDERSCORE, , Do we need a leading _ for dlsym?)
-+      fi
-   fi
- fi
- 
--- 
-1.8.3.1
-

_service:extract_file:backport-configure.ac-properly-quote-macro-arguments.patch Deleted

@@ -1,48 +0,0 @@
-From 5664c3f535289ce9efb513a2897991b5c436bb44 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Thu, 1 Apr 2021 17:26:28 +0200
-Subject: PATCH configure.ac: properly quote macro arguments
-
-Autoconf 2.70+ is more picky about the quotation (even though with
-previous versions the arguments should have been quoted, too).  When we
-don't quote macros inside the AC_CACHE_VAL macro - some of the Autoconf
-initialization is wrongly ordered in ./configure script and we keep
-seeing bugs like:
-
-    ./configure: line 2165: ac_fn_c_try_run: command not found
-
-Original report: https://bugzilla.redhat.com/1943013
-
-Signed-off-by: Pavel Raiskup <praiskup@redhat.com>
----
- configure.ac | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 79c93c8..aa0dc38 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -213,7 +213,8 @@ if test $sasl_cv_uscore = yes; then
- 	AC_MSG_CHECKING(whether dlsym adds the underscore for us)
- 	cmu_save_LIBS="$LIBS"
- 	LIBS="$LIBS $SASL_DL_LIB"
--	AC_CACHE_VAL(sasl_cv_dlsym_adds_uscore,AC_TRY_RUN( 
-+	AC_CACHE_VAL(sasl_cv_dlsym_adds_uscore,
-+	             AC_TRY_RUN(
- #include <dlfcn.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -221,8 +222,8 @@ void foo() { int i=0;}
- int main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY);
-     if(self) { ptr1=dlsym(self,"foo"); ptr2=dlsym(self,"_foo");
-     if(ptr1 && !ptr2) exit(0); } exit(1); } 
--, sasl_cv_dlsym_adds_uscore=yes, sasl_cv_dlsym_adds_uscore=no,
--	AC_MSG_WARN(cross-compiler, we'll do our best)))
-+, sasl_cv_dlsym_adds_uscore=yes, sasl_cv_dlsym_adds_uscore=no,
-+	AC_MSG_WARN(cross-compiler, we'll do our best)))
- 	LIBS="$cmu_save_LIBS"
-       AC_MSG_RESULT($sasl_cv_dlsym_adds_uscore)
- 
--- 
-1.8.3.1
-

_service:extract_file:backport-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch Deleted

@@ -1,32 +0,0 @@
-From af48f6fec9a7b6374d4153c5db894d4a1f349645 Mon Sep 17 00:00:00 2001
-From: Jonas Jelten <jj@sft.mx>
-Date: Sat, 2 Feb 2019 20:53:37 +0100
-Subject: PATCH db_gdbm: fix gdbm_errno overlay from gdbm_close
-
-`gdbm_close` also sets gdbm_errno since version 1.17.
-This leads to a problem in `libsasl` as the `gdbm_close` incovation overlays
-the `gdbm_errno` value which is then later used for the error handling.
----
- sasldb/db_gdbm.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/sasldb/db_gdbm.c b/sasldb/db_gdbm.c
-index ee56a6b..c908808 100644
---- a/sasldb/db_gdbm.c
-+++ b/sasldb/db_gdbm.c
-@@ -107,9 +107,11 @@ int _sasldb_getdata(const sasl_utils_t *utils,
-   gkey.dptr = key;
-   gkey.dsize = key_len;
-   gvalue = gdbm_fetch(db, gkey);
-+  int fetch_errno = gdbm_errno;
-+
-   gdbm_close(db);
-   if (! gvalue.dptr) {
--      if (gdbm_errno == GDBM_ITEM_NOT_FOUND) {
-+      if (fetch_errno == GDBM_ITEM_NOT_FOUND) {
-           utils->seterror(conn, SASL_NOLOG,
- 			  "user: %s@%s property: %s not found in %s",
- 			  authid, realm, propName, path);
--- 
-1.8.3.1
-

_service:extract_file:fix-CVE-2019-19906.patch Deleted

_service:tar_scm:backport-Fix-earlier-554-commit-to-use-fetch_errno-instead-of.patch Added

_service Changed

_service:extract_file:cyrus-sasl-2.1.27.tar.gz Deleted

_service:extract_file:cyrus-sasl.yaml Deleted

_service:extract_file:saslauthd.service Deleted

_service:extract_file:saslauthd.sysconfig Deleted

_service:tar_scm:cyrus-sasl-1653271549.08109d2.tar -> _service:tar_scm:cyrus-sasl-2.1.28.tar.gz Changed

_service:tar_scm:cyrus-sasl.yaml Added

_service:tar_scm:saslauthd.service Added

_service:tar_scm:saslauthd.sysconfig Added

Changes of Revision 2