[arch-commits] Commit in claws-mail/trunk (4 files)
Date: Monday, May 26, 2014 @ 15:43:12
Author: andyrtr
Revision: 213598
upgpkg: claws-mail 3.10.0-1
upstream update 3.10.0
Modified:
claws-mail/trunk/PKGBUILD
Deleted:
claws-mail/trunk/claws-ssl-1.patch
claws-mail/trunk/claws-ssl-2.patch
claws-mail/trunk/claws-ssl-3.patch
---+
PKGBUILD | 25 --
claws-ssl-1.patch | 494
claws-ssl-2.patch | 139 --
claws-ssl-3.patch | 241 -
4 files changed, 5 insertions(+), 894 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-05-26 11:06:44 UTC (rev 213597)
+++ PKGBUILD2014-05-26 13:43:12 UTC (rev 213598)
@@ -2,8 +2,8 @@
# Maintainer: Andreas Radke andy...@archlinux.org
pkgname=claws-mail
-pkgver=3.9.3
-pkgrel=4
+pkgver=3.10.0
+pkgrel=1
pkgdesc=A GTK+ based e-mail client.
arch=('i686' 'x86_64')
license=('GPL3')
@@ -34,25 +34,10 @@
conflicts=('claws-mail-extra-plugins')
provides=('claws')
install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2{,.asc}
-claws-ssl-1.patch
-claws-ssl-2.patch
-claws-ssl-3.patch)
-md5sums=('0158b5e6b6d6866f9a75fd288a4edf04'
- 'SKIP'
- '02e5fc5dba976208dfabf23d781d'
- 'dd53ff284cf802ef639bf92fac996d12'
- 'e8c2ce77c8df7a2c514a4547337304d8')
+source=(http://downloads.sourceforge.net/sourceforge/claws-mail/${pkgname}-${pkgver}.tar.xz{,.asc})
+sha1sums=('c5e8063ea922b1bd6825f5221347ec8ebfa0ae3b'
+ 'SKIP')
-prepare() {
- cd ${pkgname}-${pkgver}
- # fix ssl certificate verification with libetpan = 1.4
- patch -Np1 ${srcdir}/claws-ssl-1.patch
- patch -Np1 ${srcdir}/claws-ssl-2.patch
- patch -Np1 ${srcdir}/claws-ssl-3.patch
- autoreconf -vfi
-}
-
build() {
cd ${pkgname}-${pkgver}
Deleted: claws-ssl-1.patch
===
--- claws-ssl-1.patch 2014-05-26 11:06:44 UTC (rev 213597)
+++ claws-ssl-1.patch 2014-05-26 13:43:12 UTC (rev 213598)
@@ -1,494 +0,0 @@
-From 35da14ea91d4d32527fbe3293d2ffd26cd642710 Mon Sep 17 00:00:00 2001
-From: Nepu User nepu@localhost.localdomain
-Date: Sun, 27 Apr 2014 14:50:36 +0200
-Subject: [PATCH 1/3] upstream commit b0c17cd08e482dbda407dabdc952dfcf5d8fdb6e
-
- src/etpan/Makefile.am | 6 ++-
- src/etpan/etpan-ssl.c | 121
- src/etpan/etpan-ssl.h | 40
- src/etpan/imap-thread.c | 96 +++---
- src/etpan/nntp-thread.c | 83 ++---
- 5 files changed, 175 insertions(+), 171 deletions(-)
- create mode 100644 src/etpan/etpan-ssl.c
- create mode 100644 src/etpan/etpan-ssl.h
-
-diff --git a/src/etpan/Makefile.am b/src/etpan/Makefile.am
-index b4bfe62..eb343b2 100644
a/src/etpan/Makefile.am
-+++ b/src/etpan/Makefile.am
-@@ -5,7 +5,8 @@ noinst_LTLIBRARIES = libclawsetpan.la
- libclawsetpan_la_SOURCES = \
- etpan-thread-manager.c \
- imap-thread.c \
-- nntp-thread.c
-+ nntp-thread.c \
-+ etpan-ssl.c
-
- clawsetpanincludedir = $(pkgincludedir)/etpan
- clawsetpaninclude_HEADERS = \
-@@ -13,7 +14,8 @@ clawsetpaninclude_HEADERS = \
- etpan-thread-manager.h \
- etpan-errors.h \
- imap-thread.h \
-- nntp-thread.h
-+ nntp-thread.h \
-+ etpan-ssl.h
-
- INCLUDES = \
- -I$(top_srcdir)/src \
-diff --git a/src/etpan/etpan-ssl.c b/src/etpan/etpan-ssl.c
-new file mode 100644
-index 000..6642e40
/dev/null
-+++ b/src/etpan/etpan-ssl.c
-@@ -0,0 +1,121 @@
-+/*
-+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
-+ * Copyright (C) 1999-2012 Colin Leroy co...@colino.net
-+ * and the Claws Mail team
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program. If not, see http://www.gnu.org/licenses/.
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include config.h
-+#include claws-features.h
-+#endif
-+
-+#ifdef USE_GNUTLS
-+#ifdef HAVE_LIBETPAN
-+#include libetpan/libetpan.h
-+#include gnutls/gnutls.h
-+#include gnutls/x509.h
-+#include stdlib.h
-+#include glib.h
-+#include glib/gi18n.h
-+#include errno.h
-+
-+#include ssl_certificate.h
-+#include utils.h
-+#include log.h
-+#include prefs_account.h
-+
-+gboolean etpan_certificate_check(mailstream
[arch-commits] Commit in claws-mail/trunk (4 files)
Date: Sunday, April 27, 2014 @ 18:25:16
Author: andyrtr
Revision: 211817
upgpkg: claws-mail 3.9.3-4
rebuild with git backports for libetpan 1.4.1
Added:
claws-mail/trunk/claws-ssl-1.patch
claws-mail/trunk/claws-ssl-2.patch
claws-mail/trunk/claws-ssl-3.patch
Modified:
claws-mail/trunk/PKGBUILD
---+
PKGBUILD | 23 ++
claws-ssl-1.patch | 494
claws-ssl-2.patch | 139 ++
claws-ssl-3.patch | 241 +
4 files changed, 893 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-04-27 16:17:47 UTC (rev 211816)
+++ PKGBUILD2014-04-27 16:25:16 UTC (rev 211817)
@@ -3,7 +3,7 @@
pkgname=claws-mail
pkgver=3.9.3
-pkgrel=3
+pkgrel=4
pkgdesc=A GTK+ based e-mail client.
arch=('i686' 'x86_64')
license=('GPL3')
@@ -34,13 +34,28 @@
conflicts=('claws-mail-extra-plugins')
provides=('claws')
install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2{,.asc})
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2{,.asc}
+claws-ssl-1.patch
+claws-ssl-2.patch
+claws-ssl-3.patch)
md5sums=('0158b5e6b6d6866f9a75fd288a4edf04'
- 'SKIP')
+ 'SKIP'
+ '02e5fc5dba976208dfabf23d781d'
+ 'dd53ff284cf802ef639bf92fac996d12'
+ 'e8c2ce77c8df7a2c514a4547337304d8')
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # fix ssl certificate verification with libetpan = 1.4
+ patch -Np1 ${srcdir}/claws-ssl-1.patch
+ patch -Np1 ${srcdir}/claws-ssl-2.patch
+ patch -Np1 ${srcdir}/claws-ssl-3.patch
+ autoreconf -vfi
+}
+
build() {
cd ${pkgname}-${pkgver}
-
+
# fixes for python2
export PYTHON=/usr/bin/python2
sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
Added: claws-ssl-1.patch
===
--- claws-ssl-1.patch (rev 0)
+++ claws-ssl-1.patch 2014-04-27 16:25:16 UTC (rev 211817)
@@ -0,0 +1,494 @@
+From 35da14ea91d4d32527fbe3293d2ffd26cd642710 Mon Sep 17 00:00:00 2001
+From: Nepu User nepu@localhost.localdomain
+Date: Sun, 27 Apr 2014 14:50:36 +0200
+Subject: [PATCH 1/3] upstream commit b0c17cd08e482dbda407dabdc952dfcf5d8fdb6e
+
+---
+ src/etpan/Makefile.am | 6 ++-
+ src/etpan/etpan-ssl.c | 121
+ src/etpan/etpan-ssl.h | 40
+ src/etpan/imap-thread.c | 96 +++---
+ src/etpan/nntp-thread.c | 83 ++---
+ 5 files changed, 175 insertions(+), 171 deletions(-)
+ create mode 100644 src/etpan/etpan-ssl.c
+ create mode 100644 src/etpan/etpan-ssl.h
+
+diff --git a/src/etpan/Makefile.am b/src/etpan/Makefile.am
+index b4bfe62..eb343b2 100644
+--- a/src/etpan/Makefile.am
b/src/etpan/Makefile.am
+@@ -5,7 +5,8 @@ noinst_LTLIBRARIES = libclawsetpan.la
+ libclawsetpan_la_SOURCES = \
+ etpan-thread-manager.c \
+ imap-thread.c \
+- nntp-thread.c
++ nntp-thread.c \
++ etpan-ssl.c
+
+ clawsetpanincludedir = $(pkgincludedir)/etpan
+ clawsetpaninclude_HEADERS = \
+@@ -13,7 +14,8 @@ clawsetpaninclude_HEADERS = \
+ etpan-thread-manager.h \
+ etpan-errors.h \
+ imap-thread.h \
+- nntp-thread.h
++ nntp-thread.h \
++ etpan-ssl.h
+
+ INCLUDES = \
+ -I$(top_srcdir)/src \
+diff --git a/src/etpan/etpan-ssl.c b/src/etpan/etpan-ssl.c
+new file mode 100644
+index 000..6642e40
+--- /dev/null
b/src/etpan/etpan-ssl.c
+@@ -0,0 +1,121 @@
++/*
++ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
++ * Copyright (C) 1999-2012 Colin Leroy co...@colino.net
++ * and the Claws Mail team
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program. If not, see http://www.gnu.org/licenses/.
++ *
++ */
++
++#ifdef HAVE_CONFIG_H
++# include config.h
++#include claws-features.h
++#endif
++
++#ifdef USE_GNUTLS
++#ifdef HAVE_LIBETPAN
++#include libetpan/libetpan.h
++#include gnutls/gnutls.h
++#include gnutls/x509.h
++#include stdlib.h
++#include glib.h
++#include glib/gi18n.h
++#include errno.h
++
++#include ssl_certificate.h
++#include utils.h
++#include log.h
++#include prefs_account.h
++
++gboolean
