On Mon, 28 May 2007 16:20:40 -0400
Brad <[EMAIL PROTECTED]> wrote:
> The following diff fixes an issue with claws mail sometimes crashing
> if you interrupt claws mail in the middle of sending an e-mail.
>
> From claws mail CVS
Here is a newer revision of my diff.
- Adds another crash fix from CVS
- Fixes the autoconf test for LDAP so that the LDAP support is actually built in
- Cleans up some redundant CONFIGURE_ARGS options
- Adds a debug FLAVOR to make it easier to build a debug version of the port
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/claws-mail/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 14 May 2007 22:24:26 -0000 1.6
+++ Makefile 1 Jul 2007 22:35:27 -0000
@@ -9,7 +9,7 @@ COMMENT-spamassassin= "spamassassin plug
V= 2.9.2
DISTNAME= claws-mail-${V}
-PKGNAME-main= ${DISTNAME}p0
+PKGNAME-main= ${DISTNAME}p1
FULLPKGNAME-docs= claws-mail-docs-${V}p0
FULLPKGNAME-bogofilter= claws-mail-bogofilter-${V}p0
FULLPKGNAME-clamav= claws-mail-clamav-${V}p0
@@ -35,7 +35,7 @@ DIST_SUBDIR= claws
MULTI_PACKAGES= -main -docs -bogofilter -clamav -dillo \
-spamassassin
-FLAVORS= jpilot gnomeprint compface ldap
+FLAVORS= jpilot gnomeprint compface ldap debug
FLAVOR?=
FLAVOR_STRING= ${FLAVOR_EXT:S/-/,/g}
@@ -87,22 +87,13 @@ USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
LIBTOOL_FLAGS= --tag=disable-static
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --enable-aspell \
- --enable-bogofilter-plugin \
- --enable-clamav-plugin \
- --enable-dillo-viewer-plugin \
- --enable-pgpcore-plugin \
- --enable-pgpmime-plugin \
- --enable-pgpinline-plugin \
- --enable-spamassassin-plugin
-
+CONFIGURE_STYLE= autoconf
+AUTOCONF_VERSION= 2.61
CONFIGURE_ENV+= OPENSSL_CFLAGS="-I/usr/include/openssl" \
OPENSSL_LIBS="-lssl -lcrypto" \
CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib"
.if ${FLAVOR:L:Mjpilot}
-CONFIGURE_ARGS+= --enable-jpilot
LIB_DEPENDS-main+= pisock::comms/pilot-link
RUN_DEPENDS-main+= ::comms/jpilot
.else
@@ -110,7 +101,6 @@ CONFIGURE_ARGS+= --disable-jpilot
.endif
.if ${FLAVOR:L:Mgnomeprint}
-CONFIGURE_ARGS+= --enable-gnomeprint
WANTLIB-main+= art_lgpl_2 xml2
LIB_DEPENDS-main+= gnomecanvas-2::x11/gnome/libgnomecanvas \
gnomeprint-2-2::x11/gnome/libgnomeprint \
@@ -122,18 +112,21 @@ CONFIGURE_ARGS+= --disable-gnomeprint
.if ${FLAVOR:L:Mcompface}
PERMIT_PACKAGE_CDROM= "No Fee"
PERMIT_DISTFILES_CDROM= "No Fee"
-CONFIGURE_ARGS+= --enable-compface
LIB_DEPENDS-main+= compface.>=1::mail/faces
.else
CONFIGURE_ARGS+= --disable-compface
.endif
.if ${FLAVOR:L:Mldap}
-CONFIGURE_ARGS+= --enable-ldap
WANTLIB-main+= asn1 com_err gssapi krb5
LIB_DEPENDS-main+= lber,ldap:openldap-client-*:databases/openldap
.else
CONFIGURE_ARGS+= --disable-ldap
+.endif
+
+.if ${FLAVOR:L:Mdebug}
+CFLAGS+= -O0 -g
+INSTALL_STRIP=
.endif
TOOLS= OOo2claws-mail.pl \
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 4 May 2007 12:13:14 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2007/05/04 12:13:14 steven Exp $
---- configure.orig Thu Apr 19 03:11:30 2007
-+++ configure Thu Apr 19 19:48:15 2007
-@@ -27930,7 +27930,7 @@ echo $ECHO_N "checking for GNU/aspell - version >= $mi
- use_aspell=no ac_cv_enable_aspell=no
- else
- ASPELL_CFLAGS="-I$aspell_includes"
-- ASPELL_LIBS="-L$aspell_libs -laspell"
-+ ASPELL_LIBS="-L$aspell_libs -laspell -lstdc++ -lm"
- aspell_version=`$ASPELL version|sed -e "s/\(@(#) International Ispell
Version 3.1.20 (but really Aspell \)\(.*\))/\2/"`
- rm -f conf.aspelltest
- if test "$cross_compiling" = yes; then
-@@ -29651,7 +29651,7 @@ if test "${ac_cv_lib_pisock_unpack_Address+set}" = set
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpisock $LIBS"
-+LIBS="-lpisock -pthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -29707,7 +29707,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_pisock_unpack_Address" >&5
- echo "${ECHO_T}$ac_cv_lib_pisock_unpack_Address" >&6; }
- if test $ac_cv_lib_pisock_unpack_Address = yes; then
-- JPILOT_LIBS="-lpisock"
-+ JPILOT_LIBS="-lpisock -pthread"
- else
- JPILOT_LIBS="" ac_cv_enable_jpilot="no"
- fi
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 1 Jul 2007 23:04:58 -0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- configure.ac.orig Tue May 8 04:03:10 2007
++++ configure.ac Sun Jul 1 19:04:48 2007
+@@ -548,6 +548,7 @@ else
+ AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv")
+ AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
+ AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
++ AC_CHECK_LIB(sasl2, sasl_version, LDAP_LIBS="$LDAP_LIBS -lsasl2")
+ AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="$LDAP_LIBS -llber",,
+ $LDAP_LIBS)
+
+@@ -563,7 +564,8 @@ else
+
+ AC_CHECK_LIB(ldap, ldap_start_tls_s,
+ [ ac_cv_have_tls=yes ],
+- [ ac_cv_have_tls=no ])
++ [ ac_cv_have_tls=no ],
++ $LDAP_LIBS)
+
+ fi
+
+@@ -600,7 +602,7 @@ if test "$ac_cv_enable_jpilot" = yes; then
+ AC_DEFINE(USE_JPILOT, 1, Define if you want
JPilot support in addressbook.) ])
+ fi
+
+- AC_CHECK_LIB(pisock, unpack_Address, [JPILOT_LIBS="-lpisock"],
[JPILOT_LIBS="" ac_cv_enable_jpilot="no"])
++ AC_CHECK_LIB(pisock, unpack_Address, [JPILOT_LIBS="-lpisock -pthread"],
[JPILOT_LIBS="" ac_cv_enable_jpilot="no"], -pthread)
+ if test x"$ac_cv_enable_jpilot" = xyes; then
+ AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in
addressbook.)
+ else
Index: patches/patch-m4_aspell_m4
===================================================================
RCS file: patches/patch-m4_aspell_m4
diff -N patches/patch-m4_aspell_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-m4_aspell_m4 1 Jul 2007 22:50:19 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- m4/aspell.m4.orig Sun Jul 1 18:36:54 2007
++++ m4/aspell.m4 Sun Jul 1 18:38:05 2007
+@@ -70,7 +70,7 @@ dnl
+ ifelse([$3], , :, [$3])
+ else
+ ASPELL_CFLAGS="-I$aspell_includes"
+- ASPELL_LIBS="-L$aspell_libs -laspell"
++ ASPELL_LIBS="-L$aspell_libs -laspell -lstdc++ -lm"
+ aspell_version=`$ASPELL version|sed -e "s/\(@(#) International Ispell
Version 3.1.20 (but really Aspell \)\(.*\))/\2/"`
+ rm -f conf.aspelltest
+ AC_TRY_RUN([
Index: patches/patch-src_common_socket_c
===================================================================
RCS file: patches/patch-src_common_socket_c
diff -N patches/patch-src_common_socket_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_common_socket_c 24 Jun 2007 23:48:44 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+--- src/common/socket.c.orig Tue May 8 03:59:21 2007
++++ src/common/socket.c Sun Jun 24 19:48:34 2007
+@@ -447,6 +447,9 @@ static gboolean sock_watch_cb(GIOChannel *source, GIOC
+ guint sock_add_watch(SockInfo *sock, GIOCondition condition, SockFunc func,
+ gpointer data)
+ {
++ if (!sock)
++ return FALSE;
++
+ sock->callback = func;
+ sock->condition = condition;
+ sock->data = data;
+@@ -808,10 +811,11 @@ static gint sock_connect_async_get_address_info_cb(GLi
+
+ conn_data->addr_list = addr_list;
+ conn_data->cur_addr = addr_list;
+- conn_data->canonical_name = conn_data->lookup_data->canonical_name;
+- conn_data->lookup_data->canonical_name = NULL;
+- conn_data->lookup_data = NULL;
+-
++ if (conn_data->lookup_data) {
++ conn_data->canonical_name =
conn_data->lookup_data->canonical_name;
++ conn_data->lookup_data->canonical_name = NULL;
++ conn_data->lookup_data = NULL;
++ }
+ return sock_connect_address_list_async(conn_data);
+ }
+
