diff options
| author | Michael Forney <mforney@mforney.org> | 2020-12-13 00:52:31 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-12-13 01:39:41 -0800 |
| commit | b127bffb6cf5d9abe06c97307504211ce7cc7f35 (patch) | |
| tree | 5f38b85cf33860b5867d8a28e9c5d5c994c70276 /pkg/msmtp | |
| parent | f5f043f7cb37ac9a43db37cdee901d686ff78eba (diff) | |
msmtp: Switch to libtls-bearssl
Diffstat (limited to 'pkg/msmtp')
| -rw-r--r-- | pkg/msmtp/config.h | 5 | ||||
| -rw-r--r-- | pkg/msmtp/gen.lua | 13 | ||||
| m--------- | pkg/msmtp/src | 0 | ||||
| -rw-r--r-- | pkg/msmtp/ver | 2 |
4 files changed, 13 insertions, 7 deletions
diff --git a/pkg/msmtp/config.h b/pkg/msmtp/config.h index 52dfd7ca..ffd87cc1 100644 --- a/pkg/msmtp/config.h +++ b/pkg/msmtp/config.h @@ -1,6 +1,6 @@ /* #undef ENABLE_NLS */ #define HAVE_ARPA_INET_H 1 -/* #undef HAVE_CFLOCALECOPYCURRENT */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ /* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ /* #undef HAVE_DCGETTEXT */ #define HAVE_FMEMOPEN 1 @@ -16,7 +16,8 @@ /* #undef HAVE_LIBIDN */ #define HAVE_LIBRESOLV 1 /* #undef HAVE_LIBSECRET */ -#define HAVE_LIBSSL 1 +/* #undef HAVE_LIBSSL */ +#define HAVE_LIBTLS 1 #define HAVE_LINK 1 /* #undef HAVE_MACOSXKEYRING */ #define HAVE_MEMORY_H 1 diff --git a/pkg/msmtp/gen.lua b/pkg/msmtp/gen.lua index bef69650..cedf5362 100644 --- a/pkg/msmtp/gen.lua +++ b/pkg/msmtp/gen.lua @@ -2,7 +2,11 @@ cflags{ '-D HAVE_CONFIG_H', string.format([[-D 'SYSCONFDIR="%s/etc"']], config.prefix), '-I $dir', - '-isystem $builddir/pkg/libressl/include', + '-isystem $builddir/pkg/libtls-bearssl/include', +} + +pkg.deps = { + 'pkg/libtls-bearssl/headers', } exe('msmtp', [[ @@ -21,12 +25,13 @@ exe('msmtp', [[ password.c base64.c - tls.c + mtls.c + mtls-libtls.c md5.c md5-apps.c ) - $builddir/pkg/libressl/(libssl.a.d libcrypto.a.d) -]], {'pkg/libressl/headers'}) + $builddir/pkg/libtls-bearssl/libtls.a.d +]]) file('bin/msmtp', '755', '$outdir/msmtp') man{'doc/msmtp.1'} diff --git a/pkg/msmtp/src b/pkg/msmtp/src -Subproject 72975cea6b8401d58169c56409eebca1d1f62be +Subproject d9f30b5005cac0e17ed9ce1650d44d124d40651 diff --git a/pkg/msmtp/ver b/pkg/msmtp/ver index 9d6400c4..6f17480c 100644 --- a/pkg/msmtp/ver +++ b/pkg/msmtp/ver @@ -1 +1 @@ -1.8.13 r0 +1.8.13-8-gd9f30b5 r0 |