main/libetpan: upgrade to 1.2

3 files changed, 82 insertions, 5 deletions

diff --git a/main/libetpan/APKBUILD b/main/libetpan/APKBUILD
index a5516dc5d6..9c0277d8b8 100644
--- a/main/libetpan/APKBUILD
+++ b/main/libetpan/APKBUILD
@@ -1,17 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libetpan
-pkgver=1.1
-pkgrel=4
+pkgver=1.2
+pkgrel=0
 pkgdesc="a portable middleware for email access"
 url="http://www.etpan.org/"
 arch="all"
 license="custom:etpan"
 subpackages="$pkgname-dev $pkgname-doc"
 makedepends="db-dev cyrus-sasl-dev curl-dev expat-dev gnutls-dev libgcrypt-dev
-	libgpg-error-dev"
+	libgpg-error-dev autoconf automake libtool"
 depends=
 depends_dev="cyrus-sasl-dev db-dev"
-source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+source="libetpan-$pkgver.tar.gz::https://github.com/dinhviethoa/libetpan/archive/$pkgver.tar.gz
+	gnutls-fix-1.patch
+	gnutls-fix-2.patch
+	"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
@@ -21,6 +24,7 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	./autogen.sh || return 1
 }
 
 build ()
@@ -45,4 +49,12 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la || return 1
 	install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/license.txt
 }
-md5sums="6fee60d08506e941642b8fa087e60b07  libetpan-1.1.tar.gz"
+md5sums="c15905ebc2ec620afb8bcca7b9d9c232  libetpan-1.2.tar.gz
+ecffad61f4f45a56fb9e957c26eeed1b  gnutls-fix-1.patch
+3df35b893ab0b85ae8918847fe9ff5f0  gnutls-fix-2.patch"
+sha256sums="8a4a56474b5eada66475179bdb88734ddf658a5e3661c89043f4abdd571d6600  libetpan-1.2.tar.gz
+9870859e9cdb5cb4a5500f2d93c87797307b65d6cfc33a9619c9c4e61311912e  gnutls-fix-1.patch
+0a8be906a75427e1bac9ea7a69102069d0f65c069bec2882ad31db8cdcedaff2  gnutls-fix-2.patch"
+sha512sums="d50050823c11d32a31adc00201a160268a09f138d54f0ac20c62f0d86d9cf1a96cc6ba50d6212fdc56181a681056ac2a52a8d9544588cdf39d07ab73c80e8b65  libetpan-1.2.tar.gz
+70baaa0b8f1d0bb4b126cbde36630fea1b7e5041d61877d85c87a81c8efbb5da378d3e447c47bbeba26ec093285c751c67b33242a6c1d5f8d6779ea0fcf658af  gnutls-fix-1.patch
+61db1bd97e49aa817c919c226e9d6c1b08e370e46e422d47e87c3cf79448f5b3a5c7c6078d3df1c2c9ad9301c988748bc43e369b14546be72425d0d0357bcda1  gnutls-fix-2.patch"
diff --git a/main/libetpan/gnutls-fix-1.patch b/main/libetpan/gnutls-fix-1.patch
new file mode 100644
index 0000000000..a707452341
--- /dev/null
+++ b/main/libetpan/gnutls-fix-1.patch
@@ -0,0 +1,32 @@
+From b375332c53dea84d32f42c785e96352aacb79513 Mon Sep 17 00:00:00 2001
+From: "Hoa V. DINH" <dinh.viet.hoa@gmail.com>
+Date: Wed, 20 Nov 2013 21:48:44 -0800
+Subject: [PATCH] Fixed #86: Fixed build for GnuTLS
+
+---
+ src/data-types/mailstream_ssl.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/data-types/mailstream_ssl.c b/src/data-types/mailstream_ssl.c
+index d0ef259..6002421 100644
+--- a/src/data-types/mailstream_ssl.c
++++ b/src/data-types/mailstream_ssl.c
+@@ -154,6 +154,7 @@ struct mailstream_ssl_data {
+ #endif
+ 
+ // Used to make OpenSSL thread safe
++#ifndef USE_GNUTLS
+ #if defined (HAVE_PTHREAD_H) && !defined (WIN32) && defined (USE_SSL) && defined (LIBETPAN_REENTRANT)
+   struct CRYPTO_dynlock_value
+   {
+@@ -224,6 +225,7 @@ struct mailstream_ssl_data {
+     CRYPTO_set_dynlock_destroy_callback(dyn_destroy_function);
+   }
+ #endif
++#endif
+ 
+ void mailstream_ssl_init_lock(void)
+ {
+-- 
+1.8.5.5
+
diff --git a/main/libetpan/gnutls-fix-2.patch b/main/libetpan/gnutls-fix-2.patch
new file mode 100644
index 0000000000..cf1983c2eb
--- /dev/null
+++ b/main/libetpan/gnutls-fix-2.patch
@@ -0,0 +1,33 @@
+From c4443cd85d708f1a6c3e6c249e4acda2029863f2 Mon Sep 17 00:00:00 2001
+From: "Hoa V. DINH" <dinh.viet.hoa@gmail.com>
+Date: Mon, 25 Nov 2013 20:40:48 -0800
+Subject: [PATCH] Fixed #86: fixed build for GnuTLS
+
+---
+ src/data-types/mailstream_ssl.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/data-types/mailstream_ssl.c b/src/data-types/mailstream_ssl.c
+index 6002421..b4c0c70 100644
+--- a/src/data-types/mailstream_ssl.c
++++ b/src/data-types/mailstream_ssl.c
+@@ -521,6 +521,7 @@ static struct mailstream_ssl_data * ssl_data_new(int fd, time_t timeout,
+   gnutls_certificate_credentials_t xcred;
+   int r;
+   struct mailstream_ssl_context * ssl_context = NULL;
++  unsigned int timeout_value;
+   
+   mailstream_ssl_init();
+   
+@@ -552,7 +553,7 @@ static struct mailstream_ssl_data * ssl_data_new(int fd, time_t timeout,
+   gnutls_dh_set_prime_bits(session, 512);
+   
+   if (timeout == 0) {
+-		timeout_value = mailstream_network_delay.tv_sec * 1000 + timeout.tv_usec / 1000;
++		timeout_value = mailstream_network_delay.tv_sec * 1000 + mailstream_network_delay.tv_usec / 1000;
+   }
+   else {
+ 		timeout_value = timeout;
+-- 
+1.8.5.5
+