diff options
| author | Michael Forney <mforney@mforney.org> | 2020-02-20 20:52:38 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-02-20 20:52:38 -0800 |
| commit | 3502501b404156a146efbe28ee6a787a3856bce3 (patch) | |
| tree | 650565d24586b2d7901ce08c6c433e2fccc665af /pkg/msmtp | |
| parent | 3ff8532c91176013299a22e25af6449c86629f1f (diff) | |
msmtp: Fast-forward one commit to drop patch
Diffstat (limited to 'pkg/msmtp')
| -rw-r--r-- | pkg/msmtp/patch/0002-Explicitly-cast-struct-sockaddr_in-6-to-struct-socka.patch | 39 | ||||
| m--------- | pkg/msmtp/src | 0 | ||||
| -rw-r--r-- | pkg/msmtp/ver | 2 |
3 files changed, 1 insertions, 40 deletions
diff --git a/pkg/msmtp/patch/0002-Explicitly-cast-struct-sockaddr_in-6-to-struct-socka.patch b/pkg/msmtp/patch/0002-Explicitly-cast-struct-sockaddr_in-6-to-struct-socka.patch deleted file mode 100644 index e9c3de7e..00000000 --- a/pkg/msmtp/patch/0002-Explicitly-cast-struct-sockaddr_in-6-to-struct-socka.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c2649a6e9557d23ad8a54c1a4efa585582896529 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Tue, 28 Jan 2020 22:43:16 -0800 -Subject: [PATCH] Explicitly cast `struct sockaddr_in[6] *` to `struct sockaddr - *` - -This prevents a couple warnings due to implicit conversion: - -net.c:336:25: warning: passing argument 2 of 'bind' from incompatible pointer type [-Wincompatible-pointer-types] -net.c:344:29: warning: passing argument 2 of 'bind' from incompatible pointer type [-Wincompatible-pointer-types] ---- - src/net.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/net.c b/src/net.c -index 76191c9..cfba57a 100644 ---- a/src/net.c -+++ b/src/net.c -@@ -333,7 +333,7 @@ int net_bind_source_ip_to_socket(int fd, const char *source_ip) - if (inet_pton(AF_INET6, source_ip, &sa6.sin6_addr) != 0) - { - sa6.sin6_family = AF_INET6; -- return bind(fd, &sa6, sizeof(sa6)); -+ return bind(fd, (struct sockaddr *)&sa6, sizeof(sa6)); - } - else - { -@@ -341,7 +341,7 @@ int net_bind_source_ip_to_socket(int fd, const char *source_ip) - if (inet_pton(AF_INET, source_ip, &sa4.sin_addr) != 0) - { - sa4.sin_family = AF_INET; -- return bind(fd, &sa4, sizeof(sa4)); -+ return bind(fd, (struct sockaddr *)&sa4, sizeof(sa4)); - } - else - { --- -2.25.0 - diff --git a/pkg/msmtp/src b/pkg/msmtp/src -Subproject 32e0c511b6530bc38ed8867f4fc258d9ccf8591 +Subproject 3224e894c52ade1b7eb0d2d9bad094c505521a8 diff --git a/pkg/msmtp/ver b/pkg/msmtp/ver index 69948dbb..10b20301 100644 --- a/pkg/msmtp/ver +++ b/pkg/msmtp/ver @@ -1 +1 @@ -1.8.7 r1 +1.8.7 r2 |