[Commits] [SCM] claws-win32-installer branch, master, updated. 3.18.0-2-63-g7cc160a
jonathan at claws-mail.org
jonathan at claws-mail.org
Sun Mar 6 02:06:45 UTC 2022
The branch, master has been updated
via 7cc160a73a24afae0d75a3f68515a33c956e33e6 (commit)
from 47b5bca8814261eb19bfbd2c173f99644aab15b8 (commit)
Summary of changes:
packages/packages.current | 2 +-
patches/cyrus_sasl-2.1.27/03-exports.patch | 37 ------
.../01-md5-typedef.patch | 0
.../02-tchar.patch | 0
.../cyrus_sasl-2.1.28/03-fix-time.h-check.patch | 60 +++++++++
.../90-paths-relocation.patch} | 138 +++++++++++++--------
.../99-reautomagic.sh | 0
7 files changed, 146 insertions(+), 91 deletions(-)
delete mode 100644 patches/cyrus_sasl-2.1.27/03-exports.patch
rename patches/{cyrus_sasl-2.1.27 => cyrus_sasl-2.1.28}/01-md5-typedef.patch (100%)
rename patches/{cyrus_sasl-2.1.27 => cyrus_sasl-2.1.28}/02-tchar.patch (100%)
create mode 100644 patches/cyrus_sasl-2.1.28/03-fix-time.h-check.patch
rename patches/{cyrus_sasl-2.1.27/04-paths-relocation.patch => cyrus_sasl-2.1.28/90-paths-relocation.patch} (89%)
rename patches/{cyrus_sasl-2.1.27 => cyrus_sasl-2.1.28}/99-reautomagic.sh (100%)
- Log -----------------------------------------------------------------
commit 7cc160a73a24afae0d75a3f68515a33c956e33e6
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Mar 4 19:13:14 2022 -0700
update to cyrus-sasl-2.1.28
diff --git a/packages/packages.current b/packages/packages.current
index 93df994..81476e5 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -8,7 +8,7 @@ bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee
cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
certdata,20211215,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/d7c8bc02bda4c5cbeacf2b165e24db7e0ba345c2/security/nss/lib/ckfw/builtins/certdata.txt,187ef9dc231135324fe78830cf4462f1ecdeab3e6c9d5e38d623391e88dc5d3c,,
curl,7.81.0,file,https://curl.se/download/curl-7.81.0.tar.xz,a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3,,
-cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
+cyrus_sasl,2.1.28,file,https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz,7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c,,
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
expat,2.4.7,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_7/expat-2.4.7.tar.xz,9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d,,
fontconfig,2.13.96,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.96.tar.xz,d816a920384aa91bc0ebf20c3b51c59c2153fdf65de0b5564bf9e8473443d637,,
diff --git a/patches/cyrus_sasl-2.1.27/03-exports.patch b/patches/cyrus_sasl-2.1.27/03-exports.patch
deleted file mode 100644
index 88ee01c..0000000
--- a/patches/cyrus_sasl-2.1.27/03-exports.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urN a/plugins/Makefile.am b/plugins/Makefile.am
---- a/plugins/Makefile.am 2020-10-10 00:14:17.294172264 -0700
-+++ b/plugins/Makefile.am 2020-10-10 00:10:34.080155060 -0700
-@@ -49,7 +49,7 @@
- # CURRENT:REVISION:AGE
- plugin_version = 3:0:0
-
--AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_srcdir)/common -I$(top_builddir)/include
-+AM_CPPFLAGS=-DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_srcdir)/common -I$(top_builddir)/include
- AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version) -no-undefined
-
- if BUILD_LIBOBJ
-
-diff -urN a/sasldb/Makefile.am b/sasdb/Makefile.am
---- a/sasldb/Makefile.am 2020-10-10 00:14:30.421916638 -0700
-+++ b/sasldb/Makefile.am 2020-10-10 00:12:35.972446463 -0700
-@@ -44,7 +44,7 @@
- # Note that this doesn't necessaraly follow the libsasl2 verison info
- sasl_version = 1:25:0
-
--AM_CPPFLAGS=-fPIC -I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
-+AM_CPPFLAGS=-fPIC -DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
-
- extra_common_sources = db_none.c db_lmdb.c db_ndbm.c db_gdbm.c db_berkeley.c
-
-diff -urN a/utils/Makefile.am b/utils/Makefile.am
---- a/utils/Makefile.am 2020-10-10 00:14:44.173656942 -0700
-+++ b/utils/Makefile.am 2020-10-10 00:13:20.103384196 -0700
-@@ -89,7 +89,7 @@
- libsfsasl2_la_LIBADD = sfsasl.lo
- libsfsasl2_la_LDFLAGS = -version-info 1:0:0 -export-dynamic -rpath $(libdir)
-
--AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@ -DPLUGINDIR='"${plugindir}"'
-+AM_CPPFLAGS=-DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@ -DPLUGINDIR='"${plugindir}"'
-
- EXTRA_DIST = saslpasswd2.8 sasldblistusers2.8 pluginviewer.8 sfsasl.h sfsasl.c smtptest.c testsuite.c pluginviewer.c NTMakefile
-
diff --git a/patches/cyrus_sasl-2.1.27/01-md5-typedef.patch b/patches/cyrus_sasl-2.1.28/01-md5-typedef.patch
similarity index 100%
rename from patches/cyrus_sasl-2.1.27/01-md5-typedef.patch
rename to patches/cyrus_sasl-2.1.28/01-md5-typedef.patch
diff --git a/patches/cyrus_sasl-2.1.27/02-tchar.patch b/patches/cyrus_sasl-2.1.28/02-tchar.patch
similarity index 100%
rename from patches/cyrus_sasl-2.1.27/02-tchar.patch
rename to patches/cyrus_sasl-2.1.28/02-tchar.patch
diff --git a/patches/cyrus_sasl-2.1.28/03-fix-time.h-check.patch b/patches/cyrus_sasl-2.1.28/03-fix-time.h-check.patch
new file mode 100644
index 0000000..90693b6
--- /dev/null
+++ b/patches/cyrus_sasl-2.1.28/03-fix-time.h-check.patch
@@ -0,0 +1,60 @@
+From 266f0acf7f5e029afbb3e263437039e50cd6c262 Mon Sep 17 00:00:00 2001
+From: Sam James <sam at gentoo.org>
+Date: Wed, 23 Feb 2022 00:45:15 +0000
+Subject: [PATCH] Fix <time.h> check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We're conditionally including based on HAVE_TIME_H in a bunch of places,
+but we're not actually checking for time.h, so that's never going to be defined.
+
+While at it, add in a missing include in the cram plugin.
+
+This fixes a bunch of implicit declaration warnings:
+```
+ * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+```
+
+Signed-off-by: Sam James <sam at gentoo.org>
+---
+ configure.ac | 2 +-
+ plugins/cram.c | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e1bf53b6..ad781830 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1290,7 +1290,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h])
+
+ AC_HEADER_DIRENT
+ AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h)
++AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h time.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h)
+
+ IPv6_CHECK_SS_FAMILY()
+ IPv6_CHECK_SA_LEN()
+diff --git a/plugins/cram.c b/plugins/cram.c
+index d02e9baa..695aaa91 100644
+--- a/plugins/cram.c
++++ b/plugins/cram.c
+@@ -53,6 +53,10 @@
+ #endif
+ #include <fcntl.h>
+
++#ifdef HAVE_TIME_H
++#include <time.h>
++#endif
++
+ #include <sasl.h>
+ #include <saslplug.h>
+ #include <saslutil.h>
+--
+2.30.2
+
diff --git a/patches/cyrus_sasl-2.1.27/04-paths-relocation.patch b/patches/cyrus_sasl-2.1.28/90-paths-relocation.patch
similarity index 89%
rename from patches/cyrus_sasl-2.1.27/04-paths-relocation.patch
rename to patches/cyrus_sasl-2.1.28/90-paths-relocation.patch
index afae2d7..c32cbdf 100644
--- a/patches/cyrus_sasl-2.1.27/04-paths-relocation.patch
+++ b/patches/cyrus_sasl-2.1.28/90-paths-relocation.patch
@@ -1,32 +1,41 @@
-diff -Naur a/m4/varexpand.m4 b/m4/varexpand.m4
---- a/m4/varexpand.m4 1970-01-01 03:00:00.000000000 +0300
-+++ b/m4/varexpand.m4 2014-12-16 00:22:11.487600000 +0300
-@@ -0,0 +1,8 @@
-+AC_DEFUN([FULL_EXPAND_VARIABLE], [
-+ $1=$2
-+ $1=`(
-+ test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-+ test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
-+ eval echo \""[$]$1"\"
-+ )`
-+])
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac 2020-10-14 00:27:40.365807986 -0700
-+++ b/configure.ac 2020-10-14 00:28:44.526450417 -0700
-@@ -1103,6 +1103,9 @@
+From 929dea0603335b519d0812c84893dc847544e89c Mon Sep 17 00:00:00 2001
+From: Jonathan Boeing <jonathan at claws-mail.org>
+Date: Fri, 4 Mar 2022 19:34:26 -0700
+Subject: [PATCH] Recreate paths-relocation patch against cyrus-sasl-2.1.28
+
+---
+ configure.ac | 3 +
+ include/sasl.h | 2 +
+ lib/Makefile.am | 4 +-
+ lib/common.c | 48 ++++
+ lib/pathtools.c | 538 +++++++++++++++++++++++++++++++++++++++++++
+ lib/pathtools.h | 53 +++++
+ m4/varexpand.m4 | 8 +
+ utils/pluginviewer.c | 2 +-
+ 8 files changed, 655 insertions(+), 3 deletions(-)
+ create mode 100644 lib/pathtools.c
+ create mode 100644 lib/pathtools.h
+ create mode 100644 m4/varexpand.m4
+
+diff --git a/configure.ac b/configure.ac
+index 2d89fdaa..307a430b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1054,6 +1054,9 @@ AC_ARG_WITH(configdir, [ --with-configdir=DIR set the directory where confi
configdir='${plugindir}:${sysconfdir}/sasl2')
AC_SUBST(configdir)
+FULL_EXPAND_VARIABLE(sasl_bindir, "$bindir")
+AC_DEFINE_UNQUOTED(BINDIR, "$sasl_bindir", [Runtime executables location])
+
- dnl look for rc4 libraries. we accept the CMU one or one from openSSL
- AC_ARG_WITH(rc4, [ --with-rc4 use internal rc4 routines [[yes]] ],
+ AC_ARG_WITH(rc4, [ --with-rc4 use rc4 routines [[yes]] ],
with_rc4=$withval,
-diff -Naur a/include/sasl.h b/include/sasl.h
---- a/include/sasl.h 2014-12-15 23:10:22.454600000 +0300
-+++ b/include/sasl.h 2014-12-15 23:43:10.374600000 +0300
-@@ -669,6 +669,8 @@
+ with_rc4=yes)
+diff --git a/include/sasl.h b/include/sasl.h
+index dc04ca47..aa7f935e 100755
+--- a/include/sasl.h
++++ b/include/sasl.h
+@@ -676,6 +676,8 @@ typedef int sasl_canon_user_t(sasl_conn_t *conn,
#define SASL_PATH_TYPE_PLUGIN 0
#define SASL_PATH_TYPE_CONFIG 1
@@ -35,10 +44,26 @@ diff -Naur a/include/sasl.h b/include/sasl.h
/* a simpler way to set plugin path or configuration file path
* without the need to set sasl_getpath_t callback.
*
-diff -Naur a/lib/common.c b/lib/common.c
---- a/lib/common.c 2014-12-15 23:10:22.953800000 +0300
-+++ b/lib/common.c 2014-12-15 23:46:29.514400000 +0300
-@@ -62,6 +62,7 @@
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 9a43ae0d..4590ceb1 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -62,8 +62,8 @@ else
+ DLOPEN_C = dlopen.c
+ endif
+
+-common_headers = saslint.h
+-common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c $(DLOPEN_C)
++common_headers = saslint.h pathtools.h
++common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c pathtools.c saslutil.c server.c seterror.c $(DLOPEN_C)
+
+ LTLIBOBJS = @LTLIBOBJS@
+ LIB_DOOR= @LIB_DOOR@
+diff --git a/lib/common.c b/lib/common.c
+index d9104c89..b86df732 100644
+--- a/lib/common.c
++++ b/lib/common.c
+@@ -59,6 +59,7 @@
#include <saslutil.h>
#include <saslplug.h>
#include "saslint.h"
@@ -46,7 +71,7 @@ diff -Naur a/lib/common.c b/lib/common.c
#ifdef HAVE_UNISTD_H
#include <unistd.h>
-@@ -89,6 +90,45 @@
+@@ -86,6 +87,45 @@ static char * _sasl_get_default_win_path(void *context __attribute__((unused)),
#endif
@@ -92,7 +117,7 @@ diff -Naur a/lib/common.c b/lib/common.c
/* It turns out to be convenient to have a shared sasl_utils_t */
const sasl_utils_t *sasl_global_utils = NULL;
-@@ -1589,9 +1629,13 @@
+@@ -1586,9 +1626,13 @@ _sasl_getpath(void *context __attribute__((unused)),
#if defined(WIN32)
/* NB: On Windows platforms this value is always allocated */
@@ -106,7 +131,7 @@ diff -Naur a/lib/common.c b/lib/common.c
#else
/* NB: On Unix platforms this value is never allocated */
path = _sasl_get_default_unix_path(context,
-@@ -1644,9 +1688,13 @@
+@@ -1641,9 +1685,13 @@ _sasl_getconfpath(void *context __attribute__((unused)),
#if defined(WIN32)
/* NB: On Windows platforms this value is always allocated */
@@ -120,23 +145,11 @@ diff -Naur a/lib/common.c b/lib/common.c
#else
/* NB: On Unix platforms this value is never allocated */
path = _sasl_get_default_unix_path(context,
-diff -Naur a/lib/Makefile.am b/lib/Makefile.am
---- a/lib/Makefile.am 2014-12-15 23:10:23.094200000 +0300
-+++ b/lib/Makefile.am 2020-10-14 01:24:27.604686796 -0700
-@@ -62,8 +62,8 @@
- DLOPEN_C = dlopen.c
- endif
-
--common_headers = saslint.h
--common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c $(DLOPEN_C)
-+common_headers = saslint.h pathtools.h
-+common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c pathtools.c saslutil.c server.c seterror.c $(DLOPEN_C)
-
- LTLIBOBJS = @LTLIBOBJS@
- LIB_DOOR= @LIB_DOOR@
-diff -Naur a/lib/pathtools.c b/lib/pathtools.c
---- a/lib/pathtools.c 1970-01-01 03:00:00.000000000 +0300
-+++ b/lib/pathtools.c 1970-01-01 03:00:00.000000000 +0300
+diff --git a/lib/pathtools.c b/lib/pathtools.c
+new file mode 100644
+index 00000000..9291ffd8
+--- /dev/null
++++ b/lib/pathtools.c
@@ -0,0 +1,538 @@
+/*
+ .Some useful path tools.
@@ -676,9 +689,11 @@ diff -Naur a/lib/pathtools.c b/lib/pathtools.c
+ return (to_path_list);
+#endif
+}
-diff -Naur a/lib/pathtools.h b/lib/pathtools.h
---- a/lib/pathtools.h 1970-01-01 03:00:00.000000000 +0300
-+++ b/lib/pathtools.h 1970-01-01 03:00:00.000000000 +0300
+diff --git a/lib/pathtools.h b/lib/pathtools.h
+new file mode 100644
+index 00000000..139b7c20
+--- /dev/null
++++ b/lib/pathtools.h
@@ -0,0 +1,53 @@
+/*
+ .Some useful path tools.
@@ -733,10 +748,25 @@ diff -Naur a/lib/pathtools.h b/lib/pathtools.h
+char * pathlist_relocation(const char *from_path, const char *to_path_list);
+
+#endif /* PATHTOOLS_H */
-diff -Naur a/utils/pluginviewer.c b/utils/pluginviewer.c
---- a/utils/pluginviewer.c 2014-12-15 23:10:22.407800000 +0300
-+++ b/utils/pluginviewer.c 2014-12-15 23:45:36.037600000 +0300
-@@ -197,7 +197,7 @@
+diff --git a/m4/varexpand.m4 b/m4/varexpand.m4
+new file mode 100644
+index 00000000..b8303a46
+--- /dev/null
++++ b/m4/varexpand.m4
+@@ -0,0 +1,8 @@
++AC_DEFUN([FULL_EXPAND_VARIABLE], [
++ $1=$2
++ $1=`(
++ test "x$prefix" = xNONE && prefix="$ac_default_prefix"
++ test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
++ eval echo \""[$]$1"\"
++ )`
++])
+diff --git a/utils/pluginviewer.c b/utils/pluginviewer.c
+index f8ae7c09..8805b26a 100644
+--- a/utils/pluginviewer.c
++++ b/utils/pluginviewer.c
+@@ -197,7 +197,7 @@ getpath(void *context,
if (searchpath) {
*path = searchpath;
} else {
@@ -745,4 +775,6 @@ diff -Naur a/utils/pluginviewer.c b/utils/pluginviewer.c
}
return SASL_OK;
+--
+2.30.2
diff --git a/patches/cyrus_sasl-2.1.27/99-reautomagic.sh b/patches/cyrus_sasl-2.1.28/99-reautomagic.sh
similarity index 100%
rename from patches/cyrus_sasl-2.1.27/99-reautomagic.sh
rename to patches/cyrus_sasl-2.1.28/99-reautomagic.sh
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list