cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add two patches to fix thread deadlock issue when pgp plugins were loaded.

Browse Source 
Fixes http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1348
Re-enable pgp plugins in PLIST and bump PKGNAME.

additional testing from Pierre Emmanuel André, thanks !
ok ajacoutot@ Andreas Kuhl (MAINTAINER)
This commit is contained in:
landry 2008-01-25 14:20:31 +00:00
parent 107a51e8ea
commit 36b6ab2379
5 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mail/claws-mail/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2008/01/08 23:13:23 landry Exp $
# $OpenBSD: Makefile,v 1.14 2008/01/25 14:20:31 landry Exp $
COMMENT-main= mail and news client
COMMENT-docs= documentation
@ -9,7 +9,8 @@ COMMENT-spamassassin= spamassassin plugin
V= 3.2.0
DISTNAME= claws-mail-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-main= ${DISTNAME}p0
FULLPKGNAME-docs= claws-mail-docs-${V}
FULLPKGNAME-bogofilter= claws-mail-bogofilter-${V}
FULLPKGNAME-clamav= claws-mail-clamav-${V}
@ -71,8 +72,7 @@ LIB_DEPENDS= atk-1.0::devel/atk \
RUN_DEPENDS-main= ${RUN_DEPENDS} \
:desktop-file-utils-*:devel/desktop-file-utils
# at the moment, pgpcore/pgpinline/pgpmime plugins are built but not installed
# http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1348
LIB_DEPENDS-main= ${LIB_DEPENDS} \
gthread-2.0::devel/glib2 \
startup-notification-1::devel/startup-notification \

6
mail/claws-mail/patches/patch-src_common_ssl_certificate_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_common_ssl_certificate_c,v 1.1 2008/01/08 23:13:23 landry Exp $
--- src/common/ssl_certificate.c.orig Tue Dec 18 19:40:50 2007
+++ src/common/ssl_certificate.c Tue Dec 18 20:07:02 2007
$OpenBSD: patch-src_common_ssl_certificate_c,v 1.2 2008/01/25 14:20:31 landry Exp $
--- src/common/ssl_certificate.c.orig Mon Dec 17 06:37:01 2007
+++ src/common/ssl_certificate.c Thu Jan 24 17:54:43 2008
@@ -37,6 +37,9 @@
#include <glib.h>
#include <glib/gi18n.h>

13
mail/claws-mail/patches/patch-src_etpan_imap-thread_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_etpan_imap-thread_c,v 1.1 2008/01/25 14:20:31 landry Exp $
--- src/etpan/imap-thread.c.orig Thu Jan 24 17:55:29 2008
+++ src/etpan/imap-thread.c Thu Jan 24 17:55:56 2008
@@ -288,6 +288,9 @@ void imap_main_set_timeout(int sec)
void imap_main_done(void)
{
etpan_thread_manager_stop(thread_manager);
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+ return;
+#endif
etpan_thread_manager_join(thread_manager);
g_source_remove(thread_manager_signal);

13
mail/claws-mail/patches/patch-src_etpan_nntp-thread_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_etpan_nntp-thread_c,v 1.1 2008/01/25 14:20:31 landry Exp $
--- src/etpan/nntp-thread.c.orig Thu Jan 24 17:55:38 2008
+++ src/etpan/nntp-thread.c Thu Jan 24 17:56:14 2008
@@ -150,6 +150,9 @@ void nntp_main_init(gboolean skip_ssl_cert_check)
void nntp_main_done(void)
{
etpan_thread_manager_stop(thread_manager);
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+ return;
+#endif
etpan_thread_manager_join(thread_manager);
g_source_remove(thread_manager_signal);

18
mail/claws-mail/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.8 2008/01/08 23:13:23 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.9 2008/01/25 14:20:31 landry Exp $
@pkgpath mail/sylpheed-claws,-main${FLAVOR_STRING}
@pkgpath mail/sylpheed-claws${FLAVOR_STRING}
bin/claws-mail
@ -225,14 +225,14 @@ include/claws-mail/vcard.h
include/claws-mail/wizard.h
lib/claws-mail/
lib/claws-mail/plugins/
@comment lib/claws-mail/plugins/pgpcore.la
@comment lib/claws-mail/plugins/pgpcore.so
@comment lib/claws-mail/plugins/pgpinline.deps
@comment lib/claws-mail/plugins/pgpinline.la
@comment lib/claws-mail/plugins/pgpinline.so
@comment lib/claws-mail/plugins/pgpmime.deps
@comment lib/claws-mail/plugins/pgpmime.la
@comment lib/claws-mail/plugins/pgpmime.so
lib/claws-mail/plugins/pgpcore.la
lib/claws-mail/plugins/pgpcore.so
lib/claws-mail/plugins/pgpinline.deps
lib/claws-mail/plugins/pgpinline.la
lib/claws-mail/plugins/pgpinline.so
lib/claws-mail/plugins/pgpmime.deps
lib/claws-mail/plugins/pgpmime.la
lib/claws-mail/plugins/pgpmime.so
lib/claws-mail/plugins/trayicon.la
lib/claws-mail/plugins/trayicon.so
lib/pkgconfig/