oasis

commit: a218279a45d59069fe10531cc8a6d3507e958234
parent 006eb072abbaa57aaad1c1c573b67b95f72eb273
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 17 Jul 2019 10:03:09 -0700

msmtp: Update to 1.8.5

Diffstat:
M
pkg/msmtp/config.h
6
+++---
M
pkg/msmtp/gen.lua
3
++-
D
pkg/msmtp/patch/0002-Avoid-unnecessary-VLA.patch
27
---------------------------
M
pkg/msmtp/ver
2
+-

4 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/pkg/msmtp/config.h b/pkg/msmtp/config.h
@@ -39,10 +39,10 @@
 #define PACKAGE "msmtp"
 #define PACKAGE_BUGREPORT "marlam@marlam.de"
 #define PACKAGE_NAME "msmtp"
-#define PACKAGE_STRING "msmtp 1.8.4"
+#define PACKAGE_STRING "msmtp 1.8.5"
 #define PACKAGE_TARNAME "msmtp"
 #define PACKAGE_URL "https://marlam.de/msmtp"
-#define PACKAGE_VERSION "1.8.4"
+#define PACKAGE_VERSION "1.8.5"
 #define PLATFORM "x86_64-pc-linux-gnu"
 #define STDC_HEADERS 1
 #ifndef _ALL_SOURCE
@@ -60,7 +60,7 @@
 #ifndef __EXTENSIONS__
 # define __EXTENSIONS__ 1
 #endif
-#define VERSION "1.8.4"
+#define VERSION "1.8.5"
 #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
 #define W32_NATIVE 1
 #endif
diff --git a/pkg/msmtp/gen.lua b/pkg/msmtp/gen.lua
@@ -19,10 +19,11 @@ exe('msmtp', [[
 		xalloc.c
 		aliases.c
 		password.c
+		base64.c
 
 		tls.c
 
-		base64.c md5.c md5-apps.c
+		md5.c md5-apps.c
 	)
 	$builddir/pkg/libressl/(libssl.a.d libcrypto.a.d)
 ]], {'pkg/libressl/headers'})
diff --git a/pkg/msmtp/patch/0002-Avoid-unnecessary-VLA.patch b/pkg/msmtp/patch/0002-Avoid-unnecessary-VLA.patch
@@ -1,27 +0,0 @@
-From 7bf99273fd40bdf3efd9aa40b473610d07faeeed Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 4 Jun 2019 14:15:55 -0700
-Subject: [PATCH] Avoid unnecessary VLA
-
-We know the size statically, and VLAs are an optional feature in C11.
----
- src/net.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/net.c b/src/net.c
-index a1666ab..314ff98 100644
---- a/src/net.c
-+++ b/src/net.c
-@@ -515,8 +515,7 @@ void net_set_io_timeout(int socket, int seconds)
- int net_socks5_connect(int fd, const char *hostname, int port, char **errstr)
- {
-     /* maximum size of a SOCKS5 message (send or receive) */
--    const size_t required_buffer_size = 1 + 1 + 1 + 1 + 1 + 255 + 2;
--    unsigned char buffer[required_buffer_size];
-+    unsigned char buffer[1 + 1 + 1 + 1 + 1 + 255 + 2];
-     size_t hostname_len = strlen(hostname);
-     uint16_t nport = htons(port);
-     size_t len;
--- 
-2.20.1
-
diff --git a/pkg/msmtp/ver b/pkg/msmtp/ver
@@ -1 +1 @@
-1.8.4 r1
+1.8.5 r0