From 575006e3d7ce2f92e1fb3e75813d144819851922 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 14 Apr 2020 21:37:14 -0700
Subject: msmtp: Update to 1.8.8

---
 pkg/msmtp/config.h                                 |  8 ++---
 ...ve-unnecessary-check-for-sizeof-long-long.patch | 41 ++++++++++++++++++++++
 ..._assert-instead-of-checking-for-size-of-l.patch | 40 ---------------------
 pkg/msmtp/src                                      |  2 +-
 pkg/msmtp/ver                                      |  2 +-
 5 files changed, 47 insertions(+), 46 deletions(-)
 create mode 100644 pkg/msmtp/patch/0001-Remove-unnecessary-check-for-sizeof-long-long.patch
 delete mode 100644 pkg/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch

(limited to 'pkg')

diff --git a/pkg/msmtp/config.h b/pkg/msmtp/config.h
index 0221d6a3..2e0b9402 100644
--- a/pkg/msmtp/config.h
+++ b/pkg/msmtp/config.h
@@ -39,11 +39,11 @@
 #define PACKAGE "msmtp"
 #define PACKAGE_BUGREPORT "marlam@marlam.de"
 #define PACKAGE_NAME "msmtp"
-#define PACKAGE_STRING "msmtp 1.8.7"
+#define PACKAGE_STRING "msmtp 1.8.8"
 #define PACKAGE_TARNAME "msmtp"
 #define PACKAGE_URL "https://marlam.de/msmtp"
-#define PACKAGE_VERSION "1.8.7"
-#define PLATFORM "x86_64-pc-linux-gnu"
+#define PACKAGE_VERSION "1.8.8"
+#define PLATFORM "x86_64-pc-linux-musl"
 #define STDC_HEADERS 1
 #ifndef _ALL_SOURCE
 # define _ALL_SOURCE 1
@@ -60,7 +60,7 @@
 #ifndef __EXTENSIONS__
 # define __EXTENSIONS__ 1
 #endif
-#define VERSION "1.8.7"
+#define VERSION "1.8.8"
 #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
 #define W32_NATIVE 1
 #endif
diff --git a/pkg/msmtp/patch/0001-Remove-unnecessary-check-for-sizeof-long-long.patch b/pkg/msmtp/patch/0001-Remove-unnecessary-check-for-sizeof-long-long.patch
new file mode 100644
index 00000000..eac0fdd4
--- /dev/null
+++ b/pkg/msmtp/patch/0001-Remove-unnecessary-check-for-sizeof-long-long.patch
@@ -0,0 +1,41 @@
+From b6441967d311b6d62f5936ff346293505d5f0261 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Fri, 13 May 2016 23:01:44 -0700
+Subject: [PATCH] Remove unnecessary check for sizeof(long long)
+
+The C standard guarantees that its maximum value is at least 2^63 - 1.
+---
+ configure.ac | 1 -
+ src/conf.c   | 4 ----
+ 2 files changed, 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b3b0fa1..2c1aef7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,7 +50,6 @@ AC_CHECK_HEADERS([sysexits.h netdb.h arpa/inet.h sys/socket.h sys/wait.h netinet
+ AC_CHECK_FUNCS([fmemopen fseeko fseeko64 getpass link signal strndup syslog])
+ AC_SEARCH_LIBS([nanosleep], [rt posix4])
+ AC_SEARCH_LIBS([socket], [socket])
+-AC_CHECK_SIZEOF([long long])
+ 
+ dnl Unfortunately AC_SEARCH_LIBS([res_query], [resolv]) does not work because we
+ dnl apparently need to include the appropriate header files, so we use a double
+diff --git a/src/conf.c b/src/conf.c
+index a0e3eb3..d5c9306 100644
+--- a/src/conf.c
++++ b/src/conf.c
+@@ -36,10 +36,6 @@
+ #include <ctype.h>
+ #include <errno.h>
+ 
+-#if (SIZEOF_LONG_LONG * CHAR_BIT) < 64
+-# error "long long has fewer than 64 bits"
+-#endif
+-
+ #include "gettext.h"
+ #define _(string) gettext(string)
+ 
+-- 
+2.26.0
+
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
deleted file mode 100644
index 3309425c..00000000
--- a/pkg/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f42d6ab0fa846b265b6d96be7db05ddcb7cc30dc 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
-
----
- configure.ac | 1 -
- src/conf.c   | 4 +---
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f3cea01..b177e0e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -50,7 +50,6 @@ AC_CHECK_HEADERS([sysexits.h netdb.h arpa/inet.h sys/socket.h sys/wait.h netinet
- AC_CHECK_FUNCS([fmemopen fseeko fseeko64 getpass link signal strndup syslog])
- AC_SEARCH_LIBS([nanosleep], [rt posix4])
- AC_SEARCH_LIBS([socket], [socket])
--AC_CHECK_SIZEOF([long long])
- 
- dnl Unfortunately AC_SEARCH_LIBS([res_query], [resolv]) does not work because we
- dnl apparently need to include the appropriate header files, so we use a double
-diff --git a/src/conf.c b/src/conf.c
-index ab44daa..8a95f1f 100644
---- a/src/conf.c
-+++ b/src/conf.c
-@@ -36,9 +36,7 @@
- #include <ctype.h>
- #include <errno.h>
- 
--#if (SIZEOF_LONG_LONG * CHAR_BIT) < 64
--# error "long long has fewer than 64 bits"
--#endif
-+_Static_assert(sizeof(long long) * CHAR_BIT >= 64, "long long has fewer than 64 bits");
- 
- #include "gettext.h"
- #define _(string) gettext(string)
--- 
-2.21.0
-
diff --git a/pkg/msmtp/src b/pkg/msmtp/src
index 3224e894..63441f90 160000
--- a/pkg/msmtp/src
+++ b/pkg/msmtp/src
@@ -1 +1 @@
-Subproject commit 3224e894c52ade1b7eb0d2d9bad094c505521a83
+Subproject commit 63441f9011840d28ed8caab217d7a91a988199c0
diff --git a/pkg/msmtp/ver b/pkg/msmtp/ver
index 10b20301..d2afe28b 100644
--- a/pkg/msmtp/ver
+++ b/pkg/msmtp/ver
@@ -1 +1 @@
-1.8.7 r2
+1.8.8 r0
-- 
cgit v1.2.3