Fix errno.

7 files changed, 85 insertions, 9 deletions

diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index a7de6ee494c..eef9379e5b4 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.11 2006/01/01 18:59:04 ben Exp $
+$NetBSD: distinfo,v 1.12 2006/01/08 16:38:41 joerg Exp $
 
 SHA1 (msmtp-1.4.4.tar.bz2) = 2b8437bb613a4054f51e94f4a6a4784b2abe3458
 RMD160 (msmtp-1.4.4.tar.bz2) = c83018a31815e031cd1b34bceb71862fb7a5399f
 Size (msmtp-1.4.4.tar.bz2) = 480904 bytes
-SHA1 (patch-aa) = bd0cb9fe4282b6a8193b38c883d7f7b1b46cd222
-SHA1 (patch-ab) = edabddfcc3f904b5519dfa339c219b55b067168b
+SHA1 (patch-aa) = 30be9810fdbdd1de0c4727c94d5c799317548bdb
+SHA1 (patch-ab) = 9ce732fb3258f0b5fcafaabaa92960489a62124e
+SHA1 (patch-ac) = 54b47760510320c08cf9703ce79ea431a69115e4
+SHA1 (patch-ad) = 1191e01ccad89532badb4240cb1e190965f1ed40
+SHA1 (patch-ae) = 1d5c4ece937ce23580ab2aef3d9362925023d7ad
+SHA1 (patch-af) = 3810dba45fdf83a8534fdac118b9da66db5bafc8
diff --git a/mail/msmtp/patches/patch-aa b/mail/msmtp/patches/patch-aa
index 8e9285b956a..3cc143e26cd 100644
--- a/mail/msmtp/patches/patch-aa
+++ b/mail/msmtp/patches/patch-aa
@@ -1,8 +1,24 @@
-$NetBSD: patch-aa,v 1.3 2006/01/01 17:02:21 ben Exp $
+$NetBSD: patch-aa,v 1.4 2006/01/08 16:38:41 joerg Exp $
 
---- src/net.c.orig	Sun Aug 14 13:13:06 2005
+--- src/net.c.orig	2005-08-14 20:13:06.000000000 +0000
 +++ src/net.c
-@@ -325,7 +325,7 @@ void net_set_io_timeout(int socket, int 
+@@ -43,7 +43,6 @@
+ #define NI_MAXHOST 1025
+ #endif
+ #include <errno.h>
+-extern int errno;
+ #else /* UNIX */
+ #include <unistd.h>
+ #include <fcntl.h>
+@@ -57,7 +56,6 @@ extern int h_errno;
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <errno.h>
+-extern int errno;
+ #endif /* UNIX */
+ 
+ #include "gettext.h"
+@@ -325,7 +323,7 @@ void net_set_io_timeout(int socket, int 
       * en-us/winsock/winsock/setsockopt_2.asp
       * We activate these timeouts only for Windows systems that also have
       * getaddrinfo(), which means XP or newer, to work around this problem. */
diff --git a/mail/msmtp/patches/patch-ab b/mail/msmtp/patches/patch-ab
index b59dcc9924b..8afc1019b12 100644
--- a/mail/msmtp/patches/patch-ab
+++ b/mail/msmtp/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2006/01/01 18:59:04 ben Exp $
+$NetBSD: patch-ab,v 1.2 2006/01/08 16:38:41 joerg Exp $
 
---- src/msmtp.c.orig	Sun Aug 14 13:13:02 2005
+--- src/msmtp.c.orig	2005-08-14 20:13:02.000000000 +0000
 +++ src/msmtp.c
-@@ -3382,5 +3382,5 @@ exit:
+@@ -31,7 +31,6 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <errno.h>
+-extern int errno;
+ #include <time.h>
+ #include <getopt.h>
+ extern char *optarg;
+@@ -3382,5 +3381,5 @@ exit:
  	list_xfree(errmsg, free);
      }
  
diff --git a/mail/msmtp/patches/patch-ac b/mail/msmtp/patches/patch-ac
new file mode 100644
index 00000000000..47bfe850211
--- /dev/null
+++ b/mail/msmtp/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2006/01/08 16:38:41 joerg Exp $
+
+--- src/conf.c.orig	2006-01-08 16:30:23.000000000 +0000
++++ src/conf.c
+@@ -31,7 +31,6 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <errno.h>
+-extern int errno;
+ 
+ #include "gettext.h"
+ #include "xalloc.h"
diff --git a/mail/msmtp/patches/patch-ad b/mail/msmtp/patches/patch-ad
new file mode 100644
index 00000000000..a3c83eabd70
--- /dev/null
+++ b/mail/msmtp/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2006/01/08 16:38:41 joerg Exp $
+
+--- src/tls.c.orig	2006-01-08 16:34:02.000000000 +0000
++++ src/tls.c
+@@ -33,7 +33,6 @@
+ #include <limits.h>
+ #include <time.h>
+ #include <errno.h>
+-extern int errno;
+ 
+ #ifdef HAVE_GNUTLS
+ #include <gnutls/gnutls.h>
diff --git a/mail/msmtp/patches/patch-ae b/mail/msmtp/patches/patch-ae
new file mode 100644
index 00000000000..34f7f8202ac
--- /dev/null
+++ b/mail/msmtp/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2006/01/08 16:38:41 joerg Exp $
+
+--- src/os_env.c.orig	2006-01-08 16:32:07.000000000 +0000
++++ src/os_env.c
+@@ -29,7 +29,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+-extern int errno;
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/mail/msmtp/patches/patch-af b/mail/msmtp/patches/patch-af
new file mode 100644
index 00000000000..b925836c6af
--- /dev/null
+++ b/mail/msmtp/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2006/01/08 16:38:41 joerg Exp $
+
+--- src/smtp.c.orig	2006-01-08 16:33:04.000000000 +0000
++++ src/smtp.c
+@@ -33,7 +33,6 @@
+ #include <strings.h>
+ #include <ctype.h>
+ #include <errno.h>
+-extern int errno;
+ 
+ #ifdef USE_GSASL
+ #include <gsasl.h>