[packages/cyrus-sasl] - rediff patches and fix man build
baggins
baggins at pld-linux.org
Wed Sep 29 00:18:06 CEST 2021
commit b0aee5d17ee469e8ee5544b1a294ecc82c4cb431
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Sep 29 00:17:40 2021 +0200
- rediff patches and fix man build
cyrus-sasl-cryptedpw.patch | 34 ++++++++++++++------------
cyrus-sasl-nagios-plugin.patch | 24 +++++++++---------
cyrus-sasl-saslauthd-httpform-urlescape.patch | 9 ++++---
cyrus-sasl-split-sql.patch | 35 +++++++++++++++------------
cyrus-sasl.spec | 6 ++++-
sphinx.patch | 10 ++++++++
6 files changed, 70 insertions(+), 48 deletions(-)
---
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index ac10388..f9c1c59 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -49,6 +49,7 @@ 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
@@ -65,6 +66,7 @@ BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: pam-devel
%{?with_pgsql:BuildRequires: postgresql-devel}
BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: sphinx-pdg-2
%{?with_sqlite:BuildRequires: sqlite-devel}
%{?with_sqlite3:BuildRequires: sqlite3-devel >= 3}
Requires: pam >= 0.79.0
@@ -512,10 +514,11 @@ Wtyczka Nagiosa do sprawdzania działania saslauthd.
%patch9 -p1
%patch10 -p1
%patch12 -p1
-%patch13 -p0
+%patch13 -p1
%patch14 -p1
%patch20 -p1
%patch21 -p1
+%patch22 -p1
# update to our paths
sed -i -e '
@@ -532,6 +535,7 @@ sed -i -e '
%{__autoheader}
%{__automake}
%configure \
+ SPHINX_BUILD=/usr/bin/sphinx-build-2 \
%{?with_cryptedpw: LDFLAGS=-lcrypt} \
%{!?with_gssapi:--disable-gssapi} \
%{?with_gssapi:--enable-gssapi --with-gss_impl=heimdal} \
diff --git a/cyrus-sasl-cryptedpw.patch b/cyrus-sasl-cryptedpw.patch
index 9a36ede..fb17b13 100644
--- a/cyrus-sasl-cryptedpw.patch
+++ b/cyrus-sasl-cryptedpw.patch
@@ -1,20 +1,21 @@
-diff -ur cyrus-sasl-2.1.19.orig/Makefile.in cyrus-sasl-2.1.19/Makefile.in
---- cyrus-sasl-2.1.19.orig/Makefile.in 2005-07-04 23:59:31.000000000 +0200
-+++ cyrus-sasl-2.1.19/Makefile.in 2005-07-05 00:04:27.000000000 +0200
-@@ -134,7 +134,7 @@
- JAVA_TRUE = @JAVA_TRUE@
+diff -urNp -x '*.orig' cyrus-sasl-2.1.27.org/Makefile.in cyrus-sasl-2.1.27/Makefile.in
+--- cyrus-sasl-2.1.27.org/Makefile.in 2018-10-09 16:58:13.000000000 +0200
++++ cyrus-sasl-2.1.27/Makefile.in 2021-09-28 23:58:30.012662863 +0200
+@@ -308,7 +308,7 @@ LDAP_LIBS = @LDAP_LIBS@
LDFLAGS = @LDFLAGS@
+ LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = -lcrypt @LIBS@
LIBTOOL = @LIBTOOL@
LIB_CRYPT = @LIB_CRYPT@
LIB_DES = @LIB_DES@
---- cyrus-sasl-2.1.27-orig/doc/legacy/options.html 2004-05-27 18:02:58.000000000 +0200
-+++ cyrus-sasl-2.1.27/doc/legacy/options.html 2005-07-10 17:17:38.000000000 +0200
-@@ -103,6 +103,14 @@
- <TD>sasldb_path</TD><TD>sasldb plugin</TD>
- <TD>Path to sasldb file</TD><TD><tt>/etc/sasldb2</tt> (system dependant)</TD>
+diff -urNp -x '*.orig' cyrus-sasl-2.1.27.org/doc/legacy/options.html cyrus-sasl-2.1.27/doc/legacy/options.html
+--- cyrus-sasl-2.1.27.org/doc/legacy/options.html 2017-07-24 14:53:03.000000000 +0200
++++ cyrus-sasl-2.1.27/doc/legacy/options.html 2021-09-28 23:58:30.012662863 +0200
+@@ -163,6 +163,14 @@ database.</TD>
+ <TD>126</TD>
+ </TR>
<TR>
+<TD>password_format</TD><TD></TD>
+<TD>Method of password storage (possible values: 'plain', 'crypt', 'crypt_trad').
@@ -25,10 +26,11 @@ diff -ur cyrus-sasl-2.1.19.orig/Makefile.in cyrus-sasl-2.1.19/Makefile.in
+</TR>
+<TR>
<TD>sql_engine</TD><TD>SQL plugin</TD>
- <TD>Name of SQL engine to use (possible values: 'mysql', 'pgsql', 'sqlite').</TD>
+ <TD>Name of SQL engine to use (possible values: 'mysql', 'pgsql', 'sqlite', 'sqlite3').</TD>
<TD><tt>mysql</tt></TD>
---- cyrus-sasl-2.1.25/lib/checkpw.c.orig 2009-12-03 20:07:01.000000000 +0100
-+++ cyrus-sasl-2.1.25/lib/checkpw.c 2011-09-16 21:27:43.302773195 +0200
+diff -urNp -x '*.orig' cyrus-sasl-2.1.27.org/lib/checkpw.c cyrus-sasl-2.1.27/lib/checkpw.c
+--- cyrus-sasl-2.1.27.org/lib/checkpw.c 2018-11-08 18:29:57.000000000 +0100
++++ cyrus-sasl-2.1.27/lib/checkpw.c 2021-09-28 23:58:30.012662863 +0200
@@ -95,6 +95,23 @@
# endif
#endif
@@ -53,7 +55,7 @@ diff -ur cyrus-sasl-2.1.19.orig/Makefile.in cyrus-sasl-2.1.19/Makefile.in
/* we store the following secret to check plaintext passwords:
*
-@@ -142,7 +159,51 @@
+@@ -142,7 +159,51 @@ static int auxprop_verify_password(sasl_
"*cmusaslsecretPLAIN",
NULL };
struct propval auxprop_values[3];
@@ -106,7 +108,7 @@ diff -ur cyrus-sasl-2.1.19.orig/Makefile.in cyrus-sasl-2.1.19/Makefile.in
if (!conn || !userstr)
return SASL_BADPARAM;
-@@ -188,14 +249,31 @@
+@@ -188,14 +249,31 @@ static int auxprop_verify_password(sasl_
return SASL_NOUSER;
}
@@ -146,7 +148,7 @@ diff -ur cyrus-sasl-2.1.19.orig/Makefile.in cyrus-sasl-2.1.19/Makefile.in
} else if(auxprop_values[1].name
&& auxprop_values[1].values
&& auxprop_values[1].values[0]) {
-@@ -1095,3 +1173,37 @@
+@@ -1105,3 +1183,37 @@ struct sasl_verify_password_s _sasl_veri
#endif
{ NULL, NULL }
};
diff --git a/cyrus-sasl-nagios-plugin.patch b/cyrus-sasl-nagios-plugin.patch
index f266268..f70aaea 100644
--- a/cyrus-sasl-nagios-plugin.patch
+++ b/cyrus-sasl-nagios-plugin.patch
@@ -1,5 +1,6 @@
---- cyrus-sasl-2.1.22-nagios/saslauthd/Makefile.am 2009-01-30 18:09:01.984198032 +0200
-+++ cyrus-sasl-2.1.22/saslauthd/Makefile.am 2009-01-30 18:43:20.796560455 +0200
+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
@@ -1,5 +1,7 @@
AUTOMAKE_OPTIONS = 1.7
sbin_PROGRAMS = saslauthd testsaslauthd
@@ -7,8 +8,8 @@
+nagiosdir = @libdir@/nagios/plugins
EXTRA_PROGRAMS = saslcache
- saslauthd_SOURCES = mechanisms.c globals.h \
-@@ -21,6 +23,10 @@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -30,6 +32,10 @@ saslauthd_LDADD = @SASL_KRB_LIB@ \
testsaslauthd_SOURCES = testsaslauthd.c utils.c
testsaslauthd_LDADD = @LIB_SOCKET@
@@ -18,10 +19,11 @@
+
saslcache_SOURCES = saslcache.c
- EXTRA_DIST = saslauthd.8 saslauthd.mdoc config include \
---- cyrus-sasl-2.1.22/saslauthd/testsaslauthd.c 2004-01-21 21:54:53.000000000 +0200
-+++ cyrus-sasl-2.1.22-nagios/saslauthd/testsaslauthd.c 2009-01-30 18:36:26.070737112 +0200
-@@ -57,6 +57,13 @@
+ EXTRA_DIST = saslauthd.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
+@@ -58,6 +58,13 @@
#endif
#include <assert.h>
@@ -35,7 +37,7 @@
#include "globals.h"
#include "utils.h"
-@@ -243,7 +250,11 @@
+@@ -244,7 +251,11 @@ static int saslauthd_verify_password(con
}
printf("NO \"authentication failed\"\n");
@@ -47,7 +49,7 @@
}
int
-@@ -293,7 +304,11 @@
+@@ -291,7 +302,11 @@ main(int argc, char *argv[])
" [-r realm] [-s servicename]\n"
" [-f socket path] [-R repeatnum]\n",
argv[0], argv[0]);
@@ -59,7 +61,7 @@
}
if (!repeat) repeat = 1;
-@@ -302,7 +317,23 @@
+@@ -300,7 +315,23 @@ main(int argc, char *argv[])
printf("%d: ", c);
result = saslauthd_verify_password(path, user, password, service, realm);
}
diff --git a/cyrus-sasl-saslauthd-httpform-urlescape.patch b/cyrus-sasl-saslauthd-httpform-urlescape.patch
index 6b09ea3..f44a4c8 100644
--- a/cyrus-sasl-saslauthd-httpform-urlescape.patch
+++ b/cyrus-sasl-saslauthd-httpform-urlescape.patch
@@ -1,6 +1,7 @@
---- saslauthd/auth_httpform.c~ 2009-02-16 22:59:05.000000000 +0200
-+++ saslauthd/auth_httpform.c 2009-02-16 23:00:16.765691380 +0200
-@@ -176,7 +176,7 @@
+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) {
@@ -8,4 +9,4 @@
+ unsigned char in = string[inidx];
if (!(in >= 'a' && in <= 'z') &&
!(in >= 'A' && in <= 'Z') &&
- !(in >= '0' && in <= '9') &&
+ !(in >= '0' && in <= '9')) {
diff --git a/cyrus-sasl-split-sql.patch b/cyrus-sasl-split-sql.patch
index 408ad23..7707138 100644
--- a/cyrus-sasl-split-sql.patch
+++ b/cyrus-sasl-split-sql.patch
@@ -1,6 +1,7 @@
---- cyrus-sasl-2.1.27/configure.ac.orig 2012-11-23 18:23:10.112077685 +0100
-+++ cyrus-sasl-2.1.27/configure.ac 2012-11-23 18:29:29.238736454 +0100
-@@ -691,10 +691,7 @@
+diff -urNp -x '*.orig' cyrus-sasl-2.1.27.org/configure.ac cyrus-sasl-2.1.27/configure.ac
+--- cyrus-sasl-2.1.27.org/configure.ac 2021-09-28 23:58:29.385997985 +0200
++++ cyrus-sasl-2.1.27/configure.ac 2021-09-28 23:58:29.489331023 +0200
+@@ -752,10 +752,7 @@ AC_ARG_ENABLE(sql, [ --enable-sql
AC_MSG_CHECKING(SQL)
if test "$sql" != no; then
AC_MSG_RESULT(enabled)
@@ -11,7 +12,7 @@
AC_DEFINE(STATIC_SQL,[],[Link SQL plugin statically])
fi
else
-@@ -741,6 +738,8 @@
+@@ -813,6 +810,8 @@ case "$with_mysql" in
CMU_ADD_LIBPATH_TO(${with_mysql}, LIB_MYSQL)
fi
@@ -20,7 +21,7 @@
LIB_MYSQL_DIR=$LIB_MYSQL
LIB_MYSQL="$LIB_MYSQL -lmysqlclient"
-@@ -805,6 +804,8 @@
+@@ -889,6 +888,8 @@ case "$with_pgsql" in
CMU_ADD_LIBPATH_TO(${with_pgsql}, LIB_PGSQL)
fi
@@ -29,8 +30,8 @@
LIB_PGSQL_DIR=$LIB_PGSQL
LIB_PGSQL="$LIB_PGSQL -lpq"
-@@ -866,6 +867,8 @@
- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
+@@ -952,6 +953,8 @@ case "$with_sqlite" in
+ CMU_ADD_LIBPATH_TO(${with_sqlite}, LIB_SQLITE)
fi
+ SASL_MECHS="$SASL_MECHS libsqlite.la"
@@ -38,8 +39,8 @@
LIB_SQLITE_DIR=$LIB_SQLITE
LIB_SQLITE="$LIB_SQLITE -lsqlite"
-@@ -918,6 +921,8 @@
- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
+@@ -1004,6 +1007,8 @@ case "$with_sqlite3" in
+ CMU_ADD_LIBPATH_TO(${with_sqlite3}, LIB_SQLITE3)
fi
+ SASL_MECHS="$SASL_MECHS libsqlite3.la"
@@ -47,9 +48,10 @@
LIB_SQLITE3_DIR=$LIB_SQLITE3
LIB_SQLITE3="$LIB_SQLITE3 -lsqlite3"
---- cyrus-sasl-2.1.27/plugins/Makefile.am.orig 2018-10-05 16:40:16.000000000 +0200
-+++ cyrus-sasl-2.1.27/plugins/Makefile.am 2018-11-24 10:25:07.244949119 +0100
-@@ -68,7 +68,7 @@
+diff -urNp -x '*.orig' cyrus-sasl-2.1.27.org/plugins/Makefile.am cyrus-sasl-2.1.27/plugins/Makefile.am
+--- cyrus-sasl-2.1.27.org/plugins/Makefile.am 2018-10-05 16:40:16.000000000 +0200
++++ cyrus-sasl-2.1.27/plugins/Makefile.am 2021-09-28 23:58:29.489331023 +0200
+@@ -68,7 +68,7 @@ plugin_LTLIBRARIES = @SASL_MECHS@
EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
libgs2.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
@@ -58,7 +60,7 @@
libplain_la_SOURCES = plain.c plain_init.c
libplain_la_DEPENDENCIES = $(COMPAT_OBJS) $(PLUGIN_COMMON_OBJS)
-@@ -131,18 +131,51 @@
+@@ -131,18 +131,51 @@ libldapdb_la_SOURCES = ldapdb.c ldapdb_i
libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) $(PLUGIN_COMMON_OBJS)
libldapdb_la_LIBADD = $(LIB_LDAP) $(COMPAT_OBJS) $(PLUGIN_COMMON_OBJS)
@@ -117,9 +119,10 @@
CLEANFILES=$(init_src)
---- cyrus-sasl-2.1.27/plugins/makeinit.sh.orig 2018-11-24 09:27:31.358321911 +0100
-+++ cyrus-sasl-2.1.27/plugins/makeinit.sh 2018-11-24 10:25:38.331615427 +0100
-@@ -51,7 +51,7 @@
+diff -urNp -x '*.orig' cyrus-sasl-2.1.27.org/plugins/makeinit.sh cyrus-sasl-2.1.27/plugins/makeinit.sh
+--- cyrus-sasl-2.1.27.org/plugins/makeinit.sh 2018-09-20 17:44:51.000000000 +0200
++++ cyrus-sasl-2.1.27/plugins/makeinit.sh 2021-09-28 23:58:29.489331023 +0200
+@@ -51,7 +51,7 @@ SASL_SERVER_PLUG_INIT( $mech )
done
# auxprop plugins
diff --git a/sphinx.patch b/sphinx.patch
new file mode 100644
index 0000000..e701b6a
--- /dev/null
+++ b/sphinx.patch
@@ -0,0 +1,10 @@
+--- 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/b0aee5d17ee469e8ee5544b1a294ecc82c4cb431
More information about the pld-cvs-commit
mailing list