libetpan: add 0.43, remove 0.36

8 files changed, 21 insertions, 356 deletions

diff --git a/packages/libetpan/libetpan-0.36/.mtn2git_empty b/packages/libetpan/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libetpan/libetpan-0.36/.mtn2git_empty
+++ b/packages/libetpan/files/.mtn2git_empty
diff --git a/packages/libetpan/libetpan-0.38/etpan_suffix.patch b/packages/libetpan/files/etpan_suffix.patch
index 901615c416..901615c416 100644
--- a/packages/libetpan/libetpan-0.38/etpan_suffix.patch
+++ b/packages/libetpan/files/etpan_suffix.patch
diff --git a/packages/libetpan/libetpan-0.36/etpan_configure.patch b/packages/libetpan/libetpan-0.36/etpan_configure.patch
deleted file mode 100644
index 3572339010..0000000000
--- a/packages/libetpan/libetpan-0.36/etpan_configure.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libetpan/configure.in~etpan_configure	2005-03-10 10:11:29.000000000 +0100
-+++ libetpan/configure.in	2005-03-11 13:57:00.232491234 +0100
-@@ -76,6 +76,38 @@
- esac
- fi
- 
-+dnl GNUTLS
-+AC_ARG_WITH(gnutls,    [ --with-gnutls[=DIR]      include GnuTLS support (default=no)],
-+ [], [with_gnutls=no])
-+if test "x$with_gnutls" != "xno"; then
-+  OCPPFLAGS="$CPPFLAGS"
-+  OLDFLAGS="$LDFLAGS"
-+  if test "x$with_gnutls" != "xyes" ; then
-+    CPPFLAGS="CRPPFLAGS -I$with_gnutls/include"
-+    LDFLAGS="$LDFLAGS -L$with_gnutls/lib"
-+  fi
-+  GNUTLSLIBS=""
-+  AC_CHECK_HEADER(gnutls/gnutls.h, [
-+  AC_CHECK_LIB(gnutls, gnutls_global_deinit, with_gnutls=yes,[GNUTLSLIBS="-lgnutls -lgnutls-openssl"])
-+  ])
-+  if test "x$with_gnutls" != "xyes"; then
-+   CPPFLAGS="$OCPPFLAGS"
-+   LDFLAGS="$OLDFLAGS"
-+  else
-+   with_openssl="no"
-+  fi
-+fi
-+
-+if test "x$with_gnutls" = "xyes"; then
-+  AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS])
-+  AC_DEFINE([USE_SSL], 1, [Define to use OpenSSL])
-+  GNUTLSLIBS="-lgnutls -lgnutls-openssl"
-+else
-+  AC_MSG_WARN([GnuTLS support disabled.])
-+  GNUTLSLIBS=""
-+fi
-+AC_SUBST(GNUTLSLIBS)
-+
- dnl OpenSSL -- very primitive right now
- AC_ARG_WITH(openssl,   [  --with-openssl[=DIR]    include OpenSSL support (default=auto)],
-             [], [with_openssl=yes])
-@@ -336,7 +368,7 @@
-   REENTRANT=1
- else
-   REENTRANT=0
--  LIBSUFFIX=-no-mt
-+  LIBSUFFIX=
- fi
- AC_SUBST(LIBSUFFIX)
- AC_SUBST(REENTRANT)
diff --git a/packages/libetpan/libetpan-0.36/gnutls.patch b/packages/libetpan/libetpan-0.36/gnutls.patch
deleted file mode 100644
index d2ccdcf9d0..0000000000
--- a/packages/libetpan/libetpan-0.36/gnutls.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libetpan/src/Makefile.in~gnutls	2005-03-10 10:11:30.000000000 +0100
-+++ libetpan/src/Makefile.in	2005-03-11 21:43:10.975597607 +0100
-@@ -15,7 +15,7 @@
- 
- VERSINFO    = @API_VERSION@
- CC          = @CC@
--LDFLAGS     = @LIBS@ @SSLLIBS@ @LDFLAGS@ @DBLIB@
-+LDFLAGS     = @LIBS@ @SSLLIBS@ @LDFLAGS@ @DBLIB@ @GNUTLSLIBS@
- 
- SUBLIBS = data-types/libdata-types.la \
- 	low-level/liblow-level.la \
---- libetpan/src/data-types/mailstream_ssl.c~gnutls	2005-03-10 10:11:30.000000000 +0100
-+++ libetpan/src/data-types/mailstream_ssl.c	2005-03-11 21:44:56.373673788 +0100
-@@ -61,7 +61,12 @@
- /* mailstream_low, ssl */
- 
- #ifdef USE_SSL
-+#ifndef USE_GNUTLS
- #include <openssl/ssl.h>
-+#else
-+#include <errno.h>
-+#include <gnutls/openssl.h>
-+#endif
- #ifdef LIBETPAN_REENTRANT
- #include <pthread.h>
- #endif
-@@ -85,9 +90,9 @@
- #ifdef USE_SSL
- static int mailstream_low_ssl_close(mailstream_low * s);
- static ssize_t mailstream_low_ssl_read(mailstream_low * s,
--				       void * buf, size_t count);
-+                       void * buf, size_t count);
- static ssize_t mailstream_low_ssl_write(mailstream_low * s,
--					const void * buf, size_t count);
-+                    const void * buf, size_t count);
- static void mailstream_low_ssl_free(mailstream_low * s);
- static int mailstream_low_ssl_get_fd(mailstream_low * s);
- 
-@@ -113,10 +118,10 @@
-   SSL_CTX * tmp_ctx;
-   int fd_flags;
-   int old_fd_flags;
--  
-+
- #ifdef LIBETPAN_REENTRANT
-   pthread_mutex_lock(&ssl_lock);
--#endif  
-+#endif
-   if (!ssl_init_done) {
-     SSL_library_init();
-     ssl_init_done = 1;
-@@ -124,35 +129,37 @@
- #ifdef LIBETPAN_REENTRANT
-   pthread_mutex_unlock(&ssl_lock);
- #endif
--  
-+
-   tmp_ctx = SSL_CTX_new(TLSv1_client_method());
-   if (tmp_ctx == NULL)
-     goto err;
--  
-+
-   ssl_conn = (SSL *) SSL_new(tmp_ctx);
-   if (ssl_conn == NULL)
-     goto free_ctx;
--  
-+
-   if (SSL_set_fd(ssl_conn, fd) == 0)
-     goto free_ssl_conn;
--  
-+
-+#ifndef USE_GNUTLS
-   SSL_set_read_ahead(ssl_conn, 1);
--  
-+#endif
-+
-   r = SSL_connect(ssl_conn);
-   if (r <= 0)
-     goto free_ssl_conn;
--  
-+
-   fd_flags = fcntl(fd, F_GETFL, 0);
-   old_fd_flags = fd_flags;
-   fd_flags |= O_NDELAY;
-   r = fcntl(fd, F_SETFL, fd_flags);
-   if (r < 0)
-     goto free_ssl_conn;
--  
-+
-   ssl_data = malloc(sizeof(* ssl_data));
-   if (ssl_data == NULL)
-     goto reset_fd_flags;
--  
-+
-   ssl_data->fd = fd;
-   ssl_data->ssl_conn = ssl_conn;
-   ssl_data->ssl_ctx = tmp_ctx;
-@@ -241,52 +248,101 @@
- }
- 
- static ssize_t mailstream_low_ssl_read(mailstream_low * s,
--				       void * buf, size_t count)
-+                       void * buf, size_t count)
- {
-   struct mailstream_ssl_data * ssl_data;
-   int r;
- 
-   ssl_data = (struct mailstream_ssl_data *) s->data;
--  
-+
-   while (1) {
-     int ssl_r;
-     fd_set fds_read;
-+#ifndef USE_GNUTLS
-     struct timeval timeout;
--    
-+#else
-+    fd_set fds_excp;
-+
-+    {
-+        struct timeval timeout2;
-+        timeout2 = mailstream_network_delay;
-+
-+        FD_ZERO(&fds_read);
-+        FD_SET(ssl_data->fd, &fds_read);
-+        FD_ZERO(&fds_excp);
-+        FD_SET(ssl_data->fd, &fds_excp);
-+        r = select(ssl_data->fd + 1, &fds_read, NULL, &fds_excp, &timeout2);
-+        if (r==0) {
-+            return -1;
-+        }
-+        if (FD_ISSET(ssl_data->fd, &fds_excp))
-+            return -1;
-+        if (!FD_ISSET(ssl_data->fd, &fds_read))
-+            return 0;
-+    }
-+#endif
-     r = SSL_read(ssl_data->ssl_conn, buf, count);
--    if (r > 0)
-+    if (r > 0) {
-       return r;
--    
-+    }
-+#ifdef USE_GNUTLS
-+    if (errno!=EAGAIN&&errno!=EWOULDBLOCK) {
-+        return r;
-+    }
-+#else
-     ssl_r = SSL_get_error(ssl_data->ssl_conn, r);
-     switch (ssl_r) {
-     case SSL_ERROR_NONE:
-       return r;
--      
-+
-     case SSL_ERROR_ZERO_RETURN:
-       return r;
--      
-+
-     case SSL_ERROR_WANT_READ:
-       timeout = mailstream_network_delay;
--      
-+
-       FD_ZERO(&fds_read);
-       FD_SET(ssl_data->fd, &fds_read);
-       r = select(ssl_data->fd + 1, &fds_read, NULL, NULL, &timeout);
-       if (r == 0)
-         return -1;
-       break;
--      
-+
-     default:
-       return r;
-     }
-+#endif
-   }
- }
- 
- static ssize_t mailstream_low_ssl_write(mailstream_low * s,
--					const void * buf, size_t count)
-+                    const void * buf, size_t count)
- {
-   struct mailstream_ssl_data * ssl_data;
- 
-   ssl_data = (struct mailstream_ssl_data *) s->data;
-+#ifdef USE_GNUTLS
-+  {
-+    fd_set fds_write;
-+    fd_set fds_excp;
-+    struct timeval timeout;
-+    int r;
-+
-+    timeout = mailstream_network_delay;
-+
-+    FD_ZERO(&fds_write);
-+    FD_SET(ssl_data->fd, &fds_write);
-+    FD_ZERO(&fds_excp);
-+    FD_SET(ssl_data->fd, &fds_excp);
-+    r = select(ssl_data->fd + 1, NULL, &fds_write, &fds_excp, &timeout);
-+    if (r == 0)
-+      return -1;
-+    if (FD_ISSET(ssl_data->fd, &fds_excp))
-+      return -1;
-+    if (!FD_ISSET(ssl_data->fd, &fds_write))
-+      return 0;
-+  }
-+#endif
-   return SSL_write(ssl_data->ssl_conn, buf, count);
- }
- #endif
diff --git a/packages/libetpan/libetpan-0.36/reentrant.patch b/packages/libetpan/libetpan-0.36/reentrant.patch
deleted file mode 100644
index eaf1edfe22..0000000000
--- a/packages/libetpan/libetpan-0.36/reentrant.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libetpan/src/data-types/mailsem.c~reentrant	2005-01-28 02:43:11.000000000 +0100
-+++ libetpan/src/data-types/mailsem.c	2005-03-10 14:32:31.717000768 +0100
-@@ -34,7 +34,9 @@
-  */
- 
- #include "mailsem.h"
-+#ifdef LIBETPAN_REENTRANT
- #include <semaphore.h>
-+#endif
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/stat.h>
-@@ -50,6 +52,7 @@
- 
- struct mailsem * mailsem_new(void)
- {
-+#ifdef LIBETPAN_REENTRANT
-   struct mailsem * sem;
-   int r;
-   
-@@ -82,11 +85,13 @@
-   return sem;
-   
-  err:
-+#endif
-   return NULL;
- }
- 
- void mailsem_free(struct mailsem * sem)
- {
-+#ifdef LIBETPAN_REENTRANT
-   if (sem->sem_kind == SEMKIND_SEMOPEN) {
-     char name[SEMNAME_LEN];
-     
-@@ -101,14 +106,23 @@
-     free(sem->sem_sem);
-   }
-   free(sem);
-+#endif
- }
- 
- int mailsem_up(struct mailsem * sem)
- {
-+#ifdef LIBETPAN_REENTRANT
-   return sem_wait((sem_t *) sem->sem_sem);
-+#else
-+  return 0;
-+#endif
- }
- 
- int mailsem_down(struct mailsem * sem)
- {
-+#ifdef LIBETPAN_REENTRANT
-   return sem_post((sem_t *) sem->sem_sem);
-+#else
-+  return 0;
-+#endif
- }
diff --git a/packages/libetpan/libetpan-0.38/.mtn2git_empty b/packages/libetpan/libetpan-0.38/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libetpan/libetpan-0.38/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libetpan/libetpan_0.36.bb b/packages/libetpan/libetpan_0.36.bb
deleted file mode 100644
index 1a6c989d5a..0000000000
--- a/packages/libetpan/libetpan_0.36.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "libetpan is a library for communicating with mail and news servers using \
-SMTP, POP, IMAP and NNTP"
-SECTION = "libs"
-DEPENDS = "openssl"
-PV = "0.36"
-PR = "r3"
-S = "${WORKDIR}/libetpan"
-TAG="rel-0-36"
-LICENSE = "BSD"
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/libetpan;tag=${TAG};module=libetpan \
-          file://etpan_configure.patch;patch=1 \
-          file://reentrant.patch;patch=1 \
-          file://gnutls.patch;patch=1 "
-
-inherit autotools pkgconfig gettext
-
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. --disable-db --disable-threads"
-
-do_stage () {
-	oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR}
-}
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
diff --git a/packages/libetpan/libetpan_0.43.bb b/packages/libetpan/libetpan_0.43.bb
new file mode 100644
index 0000000000..51757a7265
--- /dev/null
+++ b/packages/libetpan/libetpan_0.43.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \
+It supports the protocols SMTP, POP3, IMAP and NNTP."
+HOMEPAGE = "http://www.etpan.org"
+SECTION = "libs"
+DEPENDS = "gnutls"
+LICENSE = "BSD"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
+          file://etpan_suffix.patch;patch=1 "
+
+inherit autotools pkgconfig gettext
+
+EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db --disable-threads"
+
+do_stage() {
+	oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR}
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"