[packages/cyrus-sasl] - updated to 2.1.28 - updated ac-libs,nagios-plugin patches - removed obsolete saslauthd-httpform-ur
qboosh
qboosh at pld-linux.org
Mon May 23 21:33:33 CEST 2022
commit 501f141cb902f92ba7ff8cddadb0808789e36b5f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon May 23 21:34:25 2022 +0200
- updated to 2.1.28
- updated ac-libs,nagios-plugin patches
- removed obsolete saslauthd-httpform-urlescape,sphinx patches
- use python3-based sphinx (no longer compatible with Sphinx 1.8)
cyrus-sasl-ac-libs.patch | 22 +++++++++++-----------
cyrus-sasl-nagios-plugin.patch | 7 +++----
cyrus-sasl-saslauthd-httpform-urlescape.patch | 12 ------------
cyrus-sasl.spec | 17 +++++++----------
sphinx.patch | 10 ----------
5 files changed, 21 insertions(+), 47 deletions(-)
---
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 7ad33bb..a0224d8 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -23,13 +23,13 @@ Summary(pt_BR.UTF-8): Implementação da API SASL
Summary(ru.UTF-8): Библиотека Cyrus SASL
Summary(uk.UTF-8): Бібліотека Cyrus SASL
Name: cyrus-sasl
-Version: 2.1.27
-Release: 2
+Version: 2.1.28
+Release: 1
License: distributable
Group: Libraries
#Source0Download: https://github.com/cyrusimap/cyrus-sasl/releases
Source0: https://github.com/cyrusimap/cyrus-sasl/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: a33820c66e0622222c5aefafa1581083
+# Source0-md5: 6f228a692516f5318a64505b46966cfa
Source1: saslauthd.init
Source2: saslauthd.sysconfig
Source3: %{name}.pam
@@ -45,11 +45,9 @@ Patch7: %{name}-db.patch
Patch9: %{name}-sizes.patch
Patch10: %{name}-nagios-plugin.patch
Patch12: %{name}-gssapi-detect.patch
-Patch13: %{name}-saslauthd-httpform-urlescape.patch
Patch14: %{name}-ac-libs.patch
Patch20: %{name}-auxprop.patch
Patch21: 0030-dont_use_la_files_for_opening_plugins.patch
-Patch22: sphinx.patch
URL: https://www.cyrusimap.org/sasl/
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11
@@ -66,7 +64,7 @@ BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: pam-devel
%{?with_pgsql:BuildRequires: postgresql-devel}
BuildRequires: rpmbuild(macros) >= 1.268
-BuildRequires: sphinx-pdg-2
+BuildRequires: sphinx-pdg-3
%{?with_sqlite:BuildRequires: sqlite-devel}
%{?with_sqlite3:BuildRequires: sqlite3-devel >= 3}
Requires: pam >= 0.79.0
@@ -514,11 +512,9 @@ Wtyczka Nagiosa do sprawdzania działania saslauthd.
%patch9 -p1
%patch10 -p1
%patch12 -p1
-%patch13 -p1
%patch14 -p1
%patch20 -p1
%patch21 -p1
-%patch22 -p1
# update to our paths
sed -i -e '
@@ -526,7 +522,7 @@ sed -i -e '
s,/etc/saslauthd.conf,%{_sysconfdir}/saslauthd.conf,g
s,/var/run/saslauthd/mux,/var/lib/sasl2/mux,g
s,/var/state/saslauthd,/var/lib/sasl2,g
-' saslauthd/saslauthd.8 saslauthd/saslauthd.mdoc saslauthd/LDAP_SASLAUTHD doc/legacy/sysadmin.html
+' saslauthd/saslauthd.mdoc saslauthd/LDAP_SASLAUTHD doc/legacy/sysadmin.html
%build
%{__libtoolize}
@@ -535,7 +531,7 @@ sed -i -e '
%{__autoheader}
%{__automake}
%configure \
- SPHINX_BUILD=/usr/bin/sphinx-build-2 \
+ SPHINX_BUILD=/usr/bin/sphinx-build-3 \
%{?with_cryptedpw: LDFLAGS=-lcrypt} \
%{!?with_gssapi:--disable-gssapi} \
%{?with_gssapi:--enable-gssapi --with-gss_impl=heimdal} \
@@ -772,6 +768,7 @@ fi
%ghost /var/lib/sasl2/mux.accept
%ghost /var/lib/sasl2/saslauthd.pid
%{_mandir}/man8/saslauthd.8*
+%{_mandir}/man8/testsaslauthd.8*
%files -n nagios-plugin-check_saslauthd
%defattr(644,root,root,755)
diff --git a/cyrus-sasl-ac-libs.patch b/cyrus-sasl-ac-libs.patch
index 689b711..5e6fde6 100644
--- a/cyrus-sasl-ac-libs.patch
+++ b/cyrus-sasl-ac-libs.patch
@@ -1,6 +1,6 @@
---- cyrus-sasl-2.1.27/configure.ac.orig 2018-11-24 13:32:32.178154053 +0100
-+++ cyrus-sasl-2.1.27/configure.ac 2018-11-24 17:29:45.091324872 +0100
-@@ -104,9 +104,6 @@
+--- cyrus-sasl-2.1.28/configure.ac.orig 2022-05-23 18:58:17.991069660 +0200
++++ cyrus-sasl-2.1.28/configure.ac 2022-05-23 19:03:29.906046539 +0200
+@@ -96,9 +96,6 @@ AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_USE_SYSTEM_EXTENSIONS
@@ -10,7 +10,7 @@
dnl xxx compatibility
AC_ARG_WITH(staticsasl)
if test "$with_staticsasl" = yes; then
-@@ -479,8 +476,7 @@
+@@ -430,8 +427,7 @@ if test "$otp" != no; then
;;
*)
if test -d $with_opie; then
@@ -20,7 +20,7 @@
else
with_opie="no"
fi
-@@ -800,16 +796,6 @@
+@@ -751,16 +747,6 @@ case "$with_mysql" in
LDFLAGS=$save_LDFLAGS
;;
*)
@@ -37,7 +37,7 @@
SASL_MECHS="$SASL_MECHS libmysql.la"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS mysql.o"
LIB_MYSQL_DIR=$LIB_MYSQL
-@@ -878,16 +864,6 @@
+@@ -829,16 +815,6 @@ case "$with_pgsql" in
LDFLAGS=$save_LDFLAGS
;;
*)
@@ -54,9 +54,9 @@
SASL_MECHS="$SASL_MECHS libpgsql.la"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS pgsql.o"
LIB_PGSQL_DIR=$LIB_PGSQL
-@@ -947,11 +923,6 @@
+@@ -898,11 +874,6 @@ case "$with_sqlite" in
no) true;;
- notfound) AC_WARN([SQLite Library not found]); true;;
+ notfound) AC_MSG_WARN(SQLite Library not found); true;;
*)
- if test -d ${with_sqlite}/lib; then
- CMU_ADD_LIBPATH_TO(${with_sqlite}/lib, LIB_SQLITE)
@@ -66,9 +66,9 @@
SASL_MECHS="$SASL_MECHS libsqlite.la"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite.o"
-@@ -1001,11 +972,6 @@
+@@ -952,11 +923,6 @@ case "$with_sqlite3" in
no) true;;
- notfound) AC_WARN([SQLite3 Library not found]); true;;
+ notfound) AC_MSG_WARN(SQLite3 Library not found); true;;
*)
- if test -d ${with_sqlite3}/lib; then
- CMU_ADD_LIBPATH_TO(${with_sqlite3}/lib, LIB_SQLITE3)
@@ -78,7 +78,7 @@
SASL_MECHS="$SASL_MECHS libsqlite3.la"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite3.o"
-@@ -1048,11 +1014,6 @@
+@@ -999,11 +965,6 @@ if test "$ldapdb" != no; then
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
diff --git a/cyrus-sasl-nagios-plugin.patch b/cyrus-sasl-nagios-plugin.patch
index f70aaea..c206e0b 100644
--- a/cyrus-sasl-nagios-plugin.patch
+++ b/cyrus-sasl-nagios-plugin.patch
@@ -1,6 +1,5 @@
-diff -urNp -x '*.orig' cyrus-sasl-2.1.27.org/saslauthd/Makefile.am cyrus-sasl-2.1.27/saslauthd/Makefile.am
---- cyrus-sasl-2.1.27.org/saslauthd/Makefile.am 2018-09-20 17:44:51.000000000 +0200
-+++ cyrus-sasl-2.1.27/saslauthd/Makefile.am 2021-09-28 23:58:31.072659837 +0200
+--- cyrus-sasl-2.1.28/saslauthd/Makefile.am.orig 2022-02-18 22:50:42.000000000 +0100
++++ cyrus-sasl-2.1.28/saslauthd/Makefile.am 2022-05-23 18:49:42.340529846 +0200
@@ -1,5 +1,7 @@
AUTOMAKE_OPTIONS = 1.7
sbin_PROGRAMS = saslauthd testsaslauthd
@@ -19,7 +18,7 @@ diff -urNp -x '*.orig' cyrus-sasl-2.1.27.org/saslauthd/Makefile.am cyrus-sasl-2.
+
saslcache_SOURCES = saslcache.c
- EXTRA_DIST = saslauthd.8 saslauthd.mdoc include \
+ EXTRA_DIST = testsaslauthd.8 saslauthd.mdoc include \
diff -urNp -x '*.orig' cyrus-sasl-2.1.27.org/saslauthd/testsaslauthd.c cyrus-sasl-2.1.27/saslauthd/testsaslauthd.c
--- cyrus-sasl-2.1.27.org/saslauthd/testsaslauthd.c 2018-11-08 18:29:57.000000000 +0100
+++ cyrus-sasl-2.1.27/saslauthd/testsaslauthd.c 2021-09-28 23:58:31.072659837 +0200
diff --git a/cyrus-sasl-saslauthd-httpform-urlescape.patch b/cyrus-sasl-saslauthd-httpform-urlescape.patch
deleted file mode 100644
index f44a4c8..0000000
--- a/cyrus-sasl-saslauthd-httpform-urlescape.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp -x '*.orig' cyrus-sasl-2.1.27.org/saslauthd/auth_httpform.c cyrus-sasl-2.1.27/saslauthd/auth_httpform.c
---- cyrus-sasl-2.1.27.org/saslauthd/auth_httpform.c 2018-11-08 18:29:57.000000000 +0100
-+++ cyrus-sasl-2.1.27/saslauthd/auth_httpform.c 2021-09-28 23:58:31.612658295 +0200
-@@ -180,7 +180,7 @@ static char *url_escape(
- return NULL;
-
- while (inidx < length) {
-- char in = string[inidx];
-+ unsigned char in = string[inidx];
- if (!(in >= 'a' && in <= 'z') &&
- !(in >= 'A' && in <= 'Z') &&
- !(in >= '0' && in <= '9')) {
diff --git a/sphinx.patch b/sphinx.patch
deleted file mode 100644
index e701b6a..0000000
--- a/sphinx.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py~ 2016-11-07 14:52:12.000000000 +0100
-+++ cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py 2021-09-29 00:15:02.216786169 +0200
-@@ -23,7 +23,6 @@
- from sphinx import addnodes
- from sphinx.locale import admonitionlabels, _
- from sphinx.util.osutil import ustrftime
--from sphinx.util.compat import docutils_version
-
- class CyrusManualPageWriter(ManualPageWriter):
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cyrus-sasl.git/commitdiff/501f141cb902f92ba7ff8cddadb0808789e36b5f
More information about the pld-cvs-commit
mailing list