summaryrefslogtreecommitdiff
path: root/pkg/msmtp
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2019-07-17 10:03:09 -0700
committerMichael Forney <mforney@mforney.org>2019-07-17 10:05:44 -0700
commita218279a45d59069fe10531cc8a6d3507e958234 (patch)
tree7bf0ef66977aa5b273c55e0bd3e08ad223e27d3c /pkg/msmtp
parent006eb072abbaa57aaad1c1c573b67b95f72eb273 (diff)
msmtp: Update to 1.8.5
Diffstat (limited to 'pkg/msmtp')
-rw-r--r--pkg/msmtp/config.h6
-rw-r--r--pkg/msmtp/gen.lua3
-rw-r--r--pkg/msmtp/patch/0002-Avoid-unnecessary-VLA.patch27
m---------pkg/msmtp/src0
-rw-r--r--pkg/msmtp/ver2
5 files changed, 6 insertions, 32 deletions
diff --git a/pkg/msmtp/config.h b/pkg/msmtp/config.h
index 091bf118..536461eb 100644
--- 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
index cbe6a224..fbb18c89 100644
--- 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
deleted file mode 100644
index abdcb18b..00000000
--- a/pkg/msmtp/patch/0002-Avoid-unnecessary-VLA.patch
+++ /dev/null
@@ -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/src b/pkg/msmtp/src
-Subproject 176d61a9b3ab8681f4a4b72d70c82d4647e9bd7
+Subproject de1f604d416fd79428bb69eeb724bc296160887
diff --git a/pkg/msmtp/ver b/pkg/msmtp/ver
index 330edc86..3bd5584b 100644
--- a/pkg/msmtp/ver
+++ b/pkg/msmtp/ver
@@ -1 +1 @@
-1.8.4 r1
+1.8.5 r0