From c457fe9a480d81d472d43ebea08200edbf446f93 Mon Sep 17 00:00:00 2001
From: smb <smb@pkgsrc.org>
Date: Sun, 5 Oct 2008 22:42:36 +0000
Subject: Update to 0.56: 	>> libetpan 0.55/0.56  released. 	better
 support for client certificates

	>> libetpan 0.53/0.54 released.
	IPv6 issue
	gmail issues
	mingw32 build
---
 mail/libetpan/Makefile         |  7 +++--
 mail/libetpan/PLIST            |  3 +-
 mail/libetpan/buildlink3.mk    |  3 +-
 mail/libetpan/distinfo         |  9 +++---
 mail/libetpan/patches/patch-af | 66 ------------------------------------------
 5 files changed, 11 insertions(+), 77 deletions(-)
 delete mode 100644 mail/libetpan/patches/patch-af

(limited to 'mail/libetpan')

diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index f8e703aceb3..facddf4d48c 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2008/09/06 20:54:33 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2008/10/05 22:42:36 smb Exp $
 #
 
-DISTNAME=		libetpan-0.52
-PKGREVISION=		4
+DISTNAME=		libetpan-0.56
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libetpan/}
 
@@ -14,6 +13,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
+USE_LANGUAGES+=		c++
+USE_LANGUAGES+=		c
 
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-configure
diff --git a/mail/libetpan/PLIST b/mail/libetpan/PLIST
index 6d46fb81b58..a84c0a4172c 100644
--- a/mail/libetpan/PLIST
+++ b/mail/libetpan/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/10/27 13:55:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/10/05 22:42:36 smb Exp $
 bin/libetpan-config
 include/libetpan/acl.h
 include/libetpan/acl_types.h
@@ -7,7 +7,6 @@ include/libetpan/annotatemore_types.h
 include/libetpan/carray.h
 include/libetpan/charconv.h
 include/libetpan/chash.h
-include/libetpan/cinthash.h
 include/libetpan/clist.h
 include/libetpan/data_message_driver.h
 include/libetpan/dbdriver.h
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
index 1d74c5ad1c0..5ceecbe3d4e 100644
--- a/mail/libetpan/buildlink3.mk
+++ b/mail/libetpan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2008/09/06 20:54:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2008/10/05 22:42:36 smb Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBETPAN_BUILDLINK3_MK:=	${LIBETPAN_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libetpan
 .if !empty(LIBETPAN_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libetpan+=	libetpan>=0.38nb1
 BUILDLINK_ABI_DEPENDS.libetpan?=	libetpan>=0.52nb4
+BUILDLINK_ABI_DEPENDS.libetpan?=	libetpan>=0.56
 BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 .endif	# LIBETPAN_BUILDLINK3_MK
 
diff --git a/mail/libetpan/distinfo b/mail/libetpan/distinfo
index 50993edbe52..20d675af845 100644
--- a/mail/libetpan/distinfo
+++ b/mail/libetpan/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.9 2008/01/25 18:26:32 smb Exp $
+$NetBSD: distinfo,v 1.10 2008/10/05 22:42:36 smb Exp $
 
-SHA1 (libetpan-0.52.tar.gz) = e2fdf76b471e57a153bad4c4def7fde512385021
-RMD160 (libetpan-0.52.tar.gz) = 3e826d57987780b204c9074a9c225e960f214d66
-Size (libetpan-0.52.tar.gz) = 1611405 bytes
+SHA1 (libetpan-0.56.tar.gz) = b75a493f6f6a82bd19acb41e459f76dc6c27e2c8
+RMD160 (libetpan-0.56.tar.gz) = 0605da03c1601eb1696254341e30ac97e226228c
+Size (libetpan-0.56.tar.gz) = 1676426 bytes
 SHA1 (patch-aa) = e783adf544c9a63df584815ee4b033249cecf0ff
-SHA1 (patch-af) = f7f6977a0bdd709eaba1efed216eee6a3a0f542b
diff --git a/mail/libetpan/patches/patch-af b/mail/libetpan/patches/patch-af
deleted file mode 100644
index 2eaec72d53f..00000000000
--- a/mail/libetpan/patches/patch-af
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-af,v 1.1 2008/01/25 18:26:32 smb Exp $
-
---- src/data-types/connect.c.orig	2007-08-06 17:32:30.000000000 -0400
-+++ src/data-types/connect.c	2008-01-25 13:15:13.000000000 -0500
-@@ -88,6 +88,21 @@
-   return 0;
- }
- 
-+#ifdef HAVE_IPV6
-+static int verify_sock_errors(int s)
-+{
-+  uint len;
-+  int val;
-+  len = sizeof(val);
-+  if (getsockopt(s, SOL_SOCKET, SO_ERROR, &val, &len) < 0) {
-+    return -1;
-+  } else if (val != 0) {
-+    return -1;
-+  }
-+  return 0;
-+}
-+#endif
-+
- static int wait_connect(int s, int r)
- {
-   fd_set fds;
-@@ -206,6 +221,7 @@
- 
-   for (ai = res; ai != NULL; ai = ai->ai_next) {
-     s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-+
-     if (s == -1)
-       continue;
-     
-@@ -239,9 +255,23 @@
-     
-     r = connect(s, ai->ai_addr, ai->ai_addrlen);
-     r = wait_connect(s, r);
-+    
-+    if (r != -1) {
-+      r = verify_sock_errors(s);
-+    }
-+
-     if (r == -1) {
-+      if (ai->ai_next) {
-+#ifdef WIN32
-+	  closesocket(s);
-+#else
-+	  close(s);
-+#endif
-+	  continue;
-+      } else {
-       goto close_socket;
-     }
-+    }
-     /* if we're here, we're good */
-     break;
-   }
-@@ -252,7 +282,6 @@
-   if (ai == NULL)
-     goto err;
- #endif
--  
-   return s;
-   
-  close_socket:
-- 
cgit v1.2.3