From 460ece994ab6a8c115dfa7386c6e5ff2bd58c000 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 28 Apr 2006 11:00:37 +0000 Subject: packages/sylpheed/files/* : remove old unused patches --- .../sylpheed/files/sylpheed-gnutls-extra.patch | 37 --------- packages/sylpheed/files/sylpheed-gnutls.patch | 96 ---------------------- .../files/sylpheed-gnutls_2.0.0beta6.patch | 92 --------------------- .../sylpheed/files/sylpheed-gnutls_2.0.0rc.patch | 92 --------------------- 4 files changed, 317 deletions(-) delete mode 100644 packages/sylpheed/files/sylpheed-gnutls-extra.patch delete mode 100644 packages/sylpheed/files/sylpheed-gnutls.patch delete mode 100644 packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch delete mode 100644 packages/sylpheed/files/sylpheed-gnutls_2.0.0rc.patch diff --git a/packages/sylpheed/files/sylpheed-gnutls-extra.patch b/packages/sylpheed/files/sylpheed-gnutls-extra.patch deleted file mode 100644 index ba24b5a1d7..0000000000 --- a/packages/sylpheed/files/sylpheed-gnutls-extra.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- sylpheed-2.0.0beta6/src/ssl.c.orig 2005-07-20 15:45:12.882201824 +0100 -+++ sylpheed-2.0.0beta6/src/ssl.c 2005-07-20 16:10:04.006516472 +0100 -@@ -54,9 +54,9 @@ - debug_print(_("SSLv23 not available\n")); - } else { - debug_print(_("SSLv23 available\n")); -- if (certs_dir && -+ if (certs_dir /*&& - !SSL_CTX_load_verify_locations(ssl_ctx_SSLv23, NULL, -- certs_dir)) -+ certs_dir)*/) - g_warning("SSLv23 SSL_CTX_load_verify_locations failed.\n"); - } - -@@ -65,9 +65,9 @@ - debug_print(_("TLSv1 not available\n")); - } else { - debug_print(_("TLSv1 available\n")); -- if (certs_dir && -+ if (certs_dir /*&& - !SSL_CTX_load_verify_locations(ssl_ctx_TLSv1, NULL, -- certs_dir)) -+ certs_dir)*/) - g_warning("TLSv1 SSL_CTX_load_verify_locations failed.\n"); - } - -@@ -151,8 +151,8 @@ - g_free(str); - } - -- verify_result = SSL_get_verify_result(sockinfo->ssl); -- if (verify_result == X509_V_OK) -+ verify_result = 0; /*SSL_get_verify_result(sockinfo->ssl);*/ -+ if (verify_result == 1) - debug_print("SSL verify OK\n"); - else - g_warning("%s: SSL certificate verify failed (%ld: %s)\n", diff --git a/packages/sylpheed/files/sylpheed-gnutls.patch b/packages/sylpheed/files/sylpheed-gnutls.patch deleted file mode 100644 index a5be3f9b10..0000000000 --- a/packages/sylpheed/files/sylpheed-gnutls.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -upr --exclude='*.o' --exclude='*~' --exclude=configure clean/sylpheed-1.0.0-gtk2-20041224/config.h.in sylpheed-1.0.0-gtk2-20041224/config.h.in ---- clean/sylpheed-1.0.0-gtk2-20041224/config.h.in 2004-12-24 06:17:08.000000000 +0000 -+++ sylpheed-1.0.0-gtk2-20041224/config.h.in 2005-01-02 18:22:27.000000000 +0000 -@@ -260,6 +260,9 @@ - /* Define to 1 if your declares `struct tm'. */ - #undef TM_IN_SYS_TIME - -+/* Define if you use GnuTLS to support SSL. */ -+#undef USE_GNUTLS -+ - /* Define if you use GPGME to support OpenPGP. */ - #undef USE_GPGME - -@@ -270,6 +273,9 @@ - #undef USE_LDAP - - /* Define if you use OpenSSL to support SSL. */ -+#undef USE_OPENSSL -+ -+/* Define if SSL is supported. */ - #undef USE_SSL - - /* Whether to use multithread or not */ -diff -upr --exclude='*.o' --exclude='*~' --exclude=configure clean/sylpheed-1.0.0-gtk2-20041224/configure.in sylpheed-1.0.0-gtk2-20041224/configure.in ---- clean/sylpheed-1.0.0-gtk2-20041224/configure.in 2004-12-24 05:39:37.000000000 +0000 -+++ sylpheed-1.0.0-gtk2-20041224/configure.in 2005-01-02 18:23:11.000000000 +0000 -@@ -265,7 +265,8 @@ if test $ac_cv_enable_ssl = yes; then - #include - ], [ return OPENSSL_VERSION_NUMBER; ], - [ AC_MSG_RESULT(yes) -- AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ], -+ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.) -+ AC_DEFINE(USE_OPENSSL, 1, Define if you use OpenSSL to support SSL.) ], - [ AC_MSG_RESULT(no) - LIBS="$ac_save_LIBS" - ac_cv_enable_ssl=no ]) -@@ -273,6 +274,27 @@ else - AC_MSG_RESULT(no) - fi - -+AC_ARG_ENABLE(gnutls, -+ [ --enable-gnutls Enable SSL support using GnuTLS [default=no]], -+ [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=no]) -+AC_MSG_CHECKING([whether to use GnuTLS]) -+if test $ac_cv_enable_gnutls = yes; then -+ AC_MSG_RESULT(yes) -+ AC_MSG_CHECKING([if GnuTLS is available]) -+ LIBS="$LIBS -lgnutls-openssl" -+ AC_TRY_LINK([ -+#include -+], [ return OPENSSL_VERSION_NUMBER; ], -+ [ AC_MSG_RESULT(yes) -+ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.) -+ AC_DEFINE(USE_GNUTLS, 1, Define if you use GnuTLS to support SSL.) ], -+ [ AC_MSG_RESULT(no) -+ LIBS="$ac_save_LIBS" -+ ac_cv_enable_gnutls=no ]) -+else -+ AC_MSG_RESULT(no) -+fi -+ - dnl Check for X-Face support - AC_ARG_ENABLE(compface, - [ --disable-compface Do not use compface (X-Face)], -@@ -415,6 +437,7 @@ echo "GnuPG : $ac_cv_enable_gpgm - echo "JPilot : $ac_cv_enable_jpilot" - echo "LDAP : $ac_cv_enable_ldap" - echo "OpenSSL : $ac_cv_enable_ssl" -+echo "GnuTLS : $ac_cv_enable_gnutls" - echo "iconv : $am_cv_func_iconv" - echo "compface : $ac_cv_enable_compface" - echo "IPv6 : $ac_cv_enable_ipv6" -diff -upr --exclude='*.o' --exclude='*~' --exclude=configure clean/sylpheed-1.0.0-gtk2-20041224/src/ssl.h sylpheed-1.0.0-gtk2-20041224/src/ssl.h ---- clean/sylpheed-1.0.0-gtk2-20041224/src/ssl.h 2003-09-06 10:26:34.000000000 +0100 -+++ sylpheed-1.0.0-gtk2-20041224/src/ssl.h 2005-01-02 18:25:00.000000000 +0000 -@@ -27,11 +27,20 @@ - #if USE_SSL - - #include -+ -+#if USE_OPENSSL - #include - #include - #include - #include - #include -+#else -+#if USE_GNUTLS -+#include -+#else -+#error Must select either GnuTLS or OpenSSL -+#endif -+#endif - - #include "socket.h" - diff --git a/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch b/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch deleted file mode 100644 index b0a03c6a32..0000000000 --- a/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- sylpheed-2.0.0beta6/config.h.in.old 2005-07-18 11:57:23.000000000 +0200 -+++ sylpheed-2.0.0beta6/config.h.in 2005-07-18 11:59:57.000000000 +0200 -@@ -263,6 +263,9 @@ - /* Define to 1 if your declares `struct tm'. */ - #undef TM_IN_SYS_TIME - -+/* Define if you use GnuTLS to support SSL. */ -+#undef USE_GNUTLS -+ - /* Define if you use GPGME to support OpenPGP. */ - #undef USE_GPGME - -@@ -273,6 +276,9 @@ - #undef USE_LDAP - - /* Define if you use OpenSSL to support SSL. */ -+#undef USE_OPENSSL -+ -+/* Define if SSL is supported. */ - #undef USE_SSL - - /* Whether to use multithread or not */ ---- sylpheed-2.0.0beta6/configure.in.old 2005-07-18 12:00:24.000000000 +0200 -+++ sylpheed-2.0.0beta6/configure.in 2005-07-18 12:04:33.000000000 +0200 -@@ -202,7 +202,8 @@ - #include - ], [ return OPENSSL_VERSION_NUMBER; ], - [ AC_MSG_RESULT(yes) -- AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ], -+ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.) -+ AC_DEFINE(USE_OPENSSL, 1, Define if you use OpenSSL to support SSL.) ], - [ AC_MSG_RESULT(no) - LIBS="$ac_save_LIBS" - ac_cv_enable_ssl=no ]) -@@ -211,6 +212,27 @@ - AC_MSG_RESULT(no) - fi - -+AC_ARG_ENABLE(gnutls, -+ [ --enable-gnutls Enable SSL support using GnuTLS [default=no]], -+ [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=no]) -+AC_MSG_CHECKING([whether to use GnuTLS]) -+if test $ac_cv_enable_gnutls = yes; then -+ AC_MSG_RESULT(yes) -+ AC_MSG_CHECKING([if GnuTLS is available]) -+ LIBS="$LIBS -lgnutls-openssl" -+ AC_TRY_LINK([ -+#include -+], [ return OPENSSL_VERSION_NUMBER; ], -+ [ AC_MSG_RESULT(yes) -+ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.) -+ AC_DEFINE(USE_GNUTLS, 1, Define if you use GnuTLS to support SSL.) ], -+ [ AC_MSG_RESULT(no) -+ LIBS="$ac_save_LIBS" -+ ac_cv_enable_gnutls=no ]) -+else -+ AC_MSG_RESULT(no) -+fi -+ - dnl Check for X-Face support - AC_ARG_ENABLE(compface, - [ --disable-compface Do not use compface (X-Face)], -@@ -350,6 +372,7 @@ - echo "JPilot : $ac_cv_enable_jpilot" - echo "LDAP : $ac_cv_enable_ldap" - echo "OpenSSL : $ac_cv_enable_ssl" -+echo "GnuTLS : $ac_cv_enable_gnutls" - echo "iconv : $am_cv_func_iconv" - echo "compface : $ac_cv_enable_compface" - echo "IPv6 : $ac_cv_enable_ipv6" ---- sylpheed-2.0.0beta6/src/ssl.h.old 2005-07-18 12:09:35.000000000 +0200 -+++ sylpheed-2.0.0beta6/src/ssl.h 2005-07-18 12:11:15.000000000 +0200 -@@ -27,11 +27,19 @@ - #if USE_SSL - - #include -+#if USE_OPENSSL - #include - #include - #include - #include - #include -+#else -+#if USE_GNUTLS -+#include -+#else -+#error Must select either GnuTLS or OpenSSL -+#endif -+#endif - - #include "socket.h" - diff --git a/packages/sylpheed/files/sylpheed-gnutls_2.0.0rc.patch b/packages/sylpheed/files/sylpheed-gnutls_2.0.0rc.patch deleted file mode 100644 index b0a03c6a32..0000000000 --- a/packages/sylpheed/files/sylpheed-gnutls_2.0.0rc.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- sylpheed-2.0.0beta6/config.h.in.old 2005-07-18 11:57:23.000000000 +0200 -+++ sylpheed-2.0.0beta6/config.h.in 2005-07-18 11:59:57.000000000 +0200 -@@ -263,6 +263,9 @@ - /* Define to 1 if your declares `struct tm'. */ - #undef TM_IN_SYS_TIME - -+/* Define if you use GnuTLS to support SSL. */ -+#undef USE_GNUTLS -+ - /* Define if you use GPGME to support OpenPGP. */ - #undef USE_GPGME - -@@ -273,6 +276,9 @@ - #undef USE_LDAP - - /* Define if you use OpenSSL to support SSL. */ -+#undef USE_OPENSSL -+ -+/* Define if SSL is supported. */ - #undef USE_SSL - - /* Whether to use multithread or not */ ---- sylpheed-2.0.0beta6/configure.in.old 2005-07-18 12:00:24.000000000 +0200 -+++ sylpheed-2.0.0beta6/configure.in 2005-07-18 12:04:33.000000000 +0200 -@@ -202,7 +202,8 @@ - #include - ], [ return OPENSSL_VERSION_NUMBER; ], - [ AC_MSG_RESULT(yes) -- AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ], -+ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.) -+ AC_DEFINE(USE_OPENSSL, 1, Define if you use OpenSSL to support SSL.) ], - [ AC_MSG_RESULT(no) - LIBS="$ac_save_LIBS" - ac_cv_enable_ssl=no ]) -@@ -211,6 +212,27 @@ - AC_MSG_RESULT(no) - fi - -+AC_ARG_ENABLE(gnutls, -+ [ --enable-gnutls Enable SSL support using GnuTLS [default=no]], -+ [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=no]) -+AC_MSG_CHECKING([whether to use GnuTLS]) -+if test $ac_cv_enable_gnutls = yes; then -+ AC_MSG_RESULT(yes) -+ AC_MSG_CHECKING([if GnuTLS is available]) -+ LIBS="$LIBS -lgnutls-openssl" -+ AC_TRY_LINK([ -+#include -+], [ return OPENSSL_VERSION_NUMBER; ], -+ [ AC_MSG_RESULT(yes) -+ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.) -+ AC_DEFINE(USE_GNUTLS, 1, Define if you use GnuTLS to support SSL.) ], -+ [ AC_MSG_RESULT(no) -+ LIBS="$ac_save_LIBS" -+ ac_cv_enable_gnutls=no ]) -+else -+ AC_MSG_RESULT(no) -+fi -+ - dnl Check for X-Face support - AC_ARG_ENABLE(compface, - [ --disable-compface Do not use compface (X-Face)], -@@ -350,6 +372,7 @@ - echo "JPilot : $ac_cv_enable_jpilot" - echo "LDAP : $ac_cv_enable_ldap" - echo "OpenSSL : $ac_cv_enable_ssl" -+echo "GnuTLS : $ac_cv_enable_gnutls" - echo "iconv : $am_cv_func_iconv" - echo "compface : $ac_cv_enable_compface" - echo "IPv6 : $ac_cv_enable_ipv6" ---- sylpheed-2.0.0beta6/src/ssl.h.old 2005-07-18 12:09:35.000000000 +0200 -+++ sylpheed-2.0.0beta6/src/ssl.h 2005-07-18 12:11:15.000000000 +0200 -@@ -27,11 +27,19 @@ - #if USE_SSL - - #include -+#if USE_OPENSSL - #include - #include - #include - #include - #include -+#else -+#if USE_GNUTLS -+#include -+#else -+#error Must select either GnuTLS or OpenSSL -+#endif -+#endif - - #include "socket.h" - -- cgit v1.2.3 From d630f1b78ce8835e50278346dfcaa2d042b88327 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 28 Apr 2006 11:01:57 +0000 Subject: sylpheed_2.2.4.bb : restore SSL functionality with gnuTLS libraries --- .../sylpheed/files/sylpheed-gnutls_2.2.4.patch | 93 ++++++++++++++++++++++ packages/sylpheed/sylpheed_2.2.4.bb | 5 +- 2 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 packages/sylpheed/files/sylpheed-gnutls_2.2.4.patch diff --git a/packages/sylpheed/files/sylpheed-gnutls_2.2.4.patch b/packages/sylpheed/files/sylpheed-gnutls_2.2.4.patch new file mode 100644 index 0000000000..05fbbb63c1 --- /dev/null +++ b/packages/sylpheed/files/sylpheed-gnutls_2.2.4.patch @@ -0,0 +1,93 @@ +--- sylpheed-2.2.4/config.h.in.orig 2005-11-16 10:12:37.000000000 +0000 ++++ sylpheed-2.2.4/config.h.in 2006-04-28 11:36:36.000000000 +0100 +@@ -251,6 +251,9 @@ + /* Define to 1 if your declares `struct tm'. */ + #undef TM_IN_SYS_TIME + ++/* Define if you use GnuTLS to support SSL. */ ++#undef USE_GNUTLS ++ + /* Define if you use GPGME to support OpenPGP. */ + #undef USE_GPGME + +@@ -264,6 +267,9 @@ + #undef USE_LDAP + + /* Define if you use OpenSSL to support SSL. */ ++#undef USE_OPENSSL ++ ++/* Define if SSL is supported. */ + #undef USE_SSL + + /* Whether to use multithread or not */ +--- sylpheed-2.2.4/configure.in.orig 2006-03-24 04:22:10.000000000 +0000 ++++ sylpheed-2.2.4/configure.in 2006-04-28 11:36:36.000000000 +0100 +@@ -231,7 +231,8 @@ + #include + ], [ return OPENSSL_VERSION_NUMBER; ], + [ AC_MSG_RESULT(yes) +- AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ], ++ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.) ++ AC_DEFINE(USE_OPENSSL, 1, Define if you use OpenSSL to support SSL.) ], + [ AC_MSG_RESULT(no) + LIBS="$ac_save_LIBS" + ac_cv_enable_ssl=no ]) +@@ -240,6 +241,27 @@ + AC_MSG_RESULT(no) + fi + ++AC_ARG_ENABLE(gnutls, ++ [ --enable-gnutls Enable SSL support using GnuTLS [default=no]], ++ [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=no]) ++AC_MSG_CHECKING([whether to use GnuTLS]) ++if test $ac_cv_enable_gnutls = yes; then ++ AC_MSG_RESULT(yes) ++ AC_MSG_CHECKING([if GnuTLS is available]) ++ LIBS="$LIBS -lgnutls-openssl" ++ AC_TRY_LINK([ ++#include ++], [ return OPENSSL_VERSION_NUMBER; ], ++ [ AC_MSG_RESULT(yes) ++ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.) ++ AC_DEFINE(USE_GNUTLS, 1, Define if you use GnuTLS to support SSL.) ], ++ [ AC_MSG_RESULT(no) ++ LIBS="$ac_save_LIBS" ++ ac_cv_enable_gnutls=no ]) ++else ++ AC_MSG_RESULT(no) ++fi ++ + dnl Check for X-Face support + AC_ARG_ENABLE(compface, + [ --disable-compface Do not use compface (X-Face)], +@@ -400,6 +422,7 @@ + echo "JPilot : $ac_cv_enable_jpilot" + echo "LDAP : $ac_cv_enable_ldap" + echo "OpenSSL : $ac_cv_enable_ssl" ++echo "GnuTLS : $ac_cv_enable_gnutls" + echo "iconv : $am_cv_func_iconv" + echo "compface : $ac_cv_enable_compface" + echo "IPv6 : $ac_cv_enable_ipv6" +--- sylpheed-2.2.4/libsylph/ssl.h.old 2006-04-28 11:36:10.000000000 +0100 ++++ sylpheed-2.2.4/libsylph/ssl.h 2006-04-28 11:37:03.000000000 +0100 +@@ -27,11 +27,20 @@ + #if USE_SSL + + #include ++#if USE_OPENSSL + #include + #include + #include + #include + #include ++#else ++#if USE_GNUTLS ++#include ++#define X509_V_OK 0 ++#else ++#error Must select either GnuTLS or OpenSSL ++#endif ++#endif + + #include "socket.h" + diff --git a/packages/sylpheed/sylpheed_2.2.4.bb b/packages/sylpheed/sylpheed_2.2.4.bb index 4756bb200d..80ad0b6fe1 100644 --- a/packages/sylpheed/sylpheed_2.2.4.bb +++ b/packages/sylpheed/sylpheed_2.2.4.bb @@ -3,11 +3,12 @@ DESCRIPTION = "Mail user agent" DEPENDS = "gtk+ gpgme gnutls" MAINTAINER = "Graeme Gregory " LICENSE = "GPL" -PR = "r3" +PR = "r4" SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \ file://sylpheed-2.2.2-libsylph-Makefile-am.patch;patch=1 \ - file://sylpheed-2.2.2-src-Makefile-am.patch;patch=1" + file://sylpheed-2.2.2-src-Makefile-am.patch;patch=1 \ + file://sylpheed-gnutls_2.2.4.patch;patch=1" FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" -- cgit v1.2.3