commit: fffc779c0ef4d7f265d2f102b29772cb72f9acda
parent 730754edf6b5ea869904ca5e666489eb1c0f9ecc
Author: Michael Forney <mforney@mforney.org>
Date: Thu, 30 Aug 2018 13:31:25 -0700
msmtp: Update to 1.6.8
Diffstat:
4 files changed, 68 insertions(+), 33 deletions(-)
diff --git a/pkg/msmtp/config.h b/pkg/msmtp/config.h
@@ -1,39 +1,75 @@
-#include <config-posix.h>
-
-/* features */
-#define HAVE_LIBSSL 1
-#define HAVE_TLS 1
/* #undef ENABLE_NLS */
+#define HAVE_ARPA_INET_H 1
+/* #undef HAVE_CFLOCALECOPYCURRENT */
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
+/* #undef HAVE_DCGETTEXT */
+#define HAVE_FMEMOPEN 1
+#define HAVE_FSEEKO 1
+#define HAVE_FSEEKO64 1
/* #undef HAVE_GAI_IDN */
+#define HAVE_GETPASS 1
+#define HAVE_GETSERVBYNAME 1
+/* #undef HAVE_GETTEXT */
+/* #undef HAVE_ICONV */
+#define HAVE_INTTYPES_H 1
/* #undef HAVE_LIBGNUTLS */
/* #undef HAVE_LIBGSASL */
/* #undef HAVE_LIBIDN */
/* #undef HAVE_LIBSECRET */
+#define HAVE_LIBSSL 1
+#define HAVE_LINK 1
/* #undef HAVE_MACOSXKEYRING */
-
-/* headers */
-#define HAVE_MEMORY_H
+#define HAVE_MEMORY_H 1
+#define HAVE_MKSTEMP 1
+#define HAVE_NETDB_H 1
+#define HAVE_SIGNAL 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRNDUP 1
#define HAVE_SYSEXITS_H 1
-
-/* types */
-/* #undef SIZEOF_LONG_LONG */ /* not needed after _Static_assert patch */
-
-/* functions */
-#define HAVE_DCGETTEXT 1
-#define HAVE_GETPASS 1
-#define HAVE_GETTEXT 1
+#define HAVE_SYSLOG 1
+#define HAVE_SYS_SOCKET_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_WAIT_H 1
+#define HAVE_TLS 1
+#define HAVE_UNISTD_H 1
#define HAVE_VASPRINTF 1
-/* #undef HAVE_CFLOCALECOPYCURRENT */
-/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
-/* #undef HAVE_FSEEKO64 */
-
-/* misc */
#define PACKAGE "msmtp"
#define PACKAGE_BUGREPORT "marlam@marlam.de"
#define PACKAGE_NAME "msmtp"
-#define PACKAGE_STRING "msmtp 1.6.6"
+#define PACKAGE_STRING "msmtp 1.6.8"
#define PACKAGE_TARNAME "msmtp"
-#define PACKAGE_URL "http://msmtp.sourceforge.net/"
-#define PACKAGE_VERSION "1.6.6"
-#define PLATFORM "linux"
-#define VERSION "1.6.6"
+#define PACKAGE_URL "https://marlam.de/msmtp"
+#define PACKAGE_VERSION "1.6.8"
+#define PLATFORM "x86_64-pc-linux-gnu"
+#define STDC_HEADERS 1
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+#define VERSION "1.6.8"
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+#define W32_NATIVE 1
+#endif
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+/* #undef _FILE_OFFSET_BITS */
+/* #undef _LARGE_FILES */
+/* #undef _MINIX */
+/* #undef _POSIX_1_SOURCE */
+/* #undef _POSIX_SOURCE */
diff --git a/pkg/msmtp/gen.lua b/pkg/msmtp/gen.lua
@@ -1,7 +1,6 @@
cflags{
'-D HAVE_CONFIG_H',
[[-D 'SYSCONFDIR="/etc"']],
- '-I include',
'-I $dir',
'-I $builddir/pkg/libressl/include',
}
diff --git a/pkg/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch b/pkg/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch
@@ -1,4 +1,4 @@
-From 5384637142de4c43b19ff069248f95e4b4d0ed8d Mon Sep 17 00:00:00 2001
+From a92fb00546be6f4c4421c9746f1f15a0ae1ae776 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 13 May 2016 23:01:44 -0700
Subject: [PATCH] Use _Static_assert instead of checking for size of long long
@@ -9,11 +9,11 @@ Subject: [PATCH] Use _Static_assert instead of checking for size of long long
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 33ae887..db4b59c 100644
+index 74597e6..2f794bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,6 @@ AC_CHECK_HEADERS([sysexits.h netdb.h arpa/inet.h sys/socket.h sys/wait.h])
- AC_CHECK_FUNCS([fmemopen fseeko fseeko64 getpass getservbyname link mkstemp strndup syslog vasprintf])
+ AC_CHECK_FUNCS([fmemopen fseeko fseeko64 getpass getservbyname link mkstemp signal strndup syslog vasprintf])
AC_SEARCH_LIBS([nanosleep], [rt posix4])
AC_SEARCH_LIBS([socket], [socket])
-AC_CHECK_SIZEOF([long long])
@@ -21,7 +21,7 @@ index 33ae887..db4b59c 100644
dnl pkg-config (required to detect libraries)
PKG_PROG_PKG_CONFIG([])
diff --git a/src/conf.c b/src/conf.c
-index 875e51e..e471bea 100644
+index fb20ae1..fd8e55c 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -36,9 +36,7 @@
@@ -36,5 +36,5 @@ index 875e51e..e471bea 100644
#include "gettext.h"
#define _(string) gettext(string)
--
-2.10.2
+2.18.0
diff --git a/pkg/msmtp/rev b/pkg/msmtp/rev
@@ -1 +1 @@
-2
+3
