Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (1ea93f6dfb55bff1982b32f5cf288466758273d4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (1ea93f6dfb55bff1982b32f5cf288466758273d4)
  • Date: Sun, 31 Oct 2010 17:08:59 -0500

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

gnome2-libs/evolution-data-server/HISTORY | 5
gnome2-libs/evolution-data-server/PRE_BUILD | 5
gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS | 2
gnome2-libs/evolution-data-server/krb5.patch | 126
++++++++++++++++++++++
4 files changed, 137 insertions(+), 1 deletion(-)

New commits:
commit 1ea93f6dfb55bff1982b32f5cf288466758273d4
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

evolution-data-server: added patch to build without krb5, fixed
PRE_SUB_DEPENDS

diff --git a/gnome2-libs/evolution-data-server/HISTORY
b/gnome2-libs/evolution-data-server/HISTORY
index d9143c8..020fddd 100644
--- a/gnome2-libs/evolution-data-server/HISTORY
+++ b/gnome2-libs/evolution-data-server/HISTORY
@@ -1,3 +1,8 @@
+2010-10-31 Robin Cook <rcook AT wyrms.net>
+ * PRE_SUB_DEPENDS: corrected persistent_read on CC
+ * PRE_BUILD: added to apply krb5.patch
+
http://mail.gnome.org/archives/commits-list/2010-October/msg04908.html
+
2010-10-23 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: added libgdata

diff --git a/gnome2-libs/evolution-data-server/PRE_BUILD
b/gnome2-libs/evolution-data-server/PRE_BUILD
new file mode 100755
index 0000000..c3f1070
--- /dev/null
+++ b/gnome2-libs/evolution-data-server/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/krb5.patch
diff --git a/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
b/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
index bcea801..3164e3e 100755
--- a/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
+++ b/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
@@ -2,7 +2,7 @@ case $THIS_SUB_DEPENDS in
LDAP) persistent_read openldap OPENLDAP_NTLM OPENLDAP_NTLM &&
is_depends_enabled $SPELL openldap &&
[[ OPENLDAP_NTLM == "y" ]] &&return 0;;
- CC) persistent_read CAL &&
+ CC) persistent_read evolution-data-server CAL CAL &&
if [[ $CAL == "--enable-calendar=yes" ]]; then return 0; fi ;;
esac
return 1
diff --git a/gnome2-libs/evolution-data-server/krb5.patch
b/gnome2-libs/evolution-data-server/krb5.patch
new file mode 100644
index 0000000..e34816e
--- /dev/null
+++ b/gnome2-libs/evolution-data-server/krb5.patch
@@ -0,0 +1,126 @@
+diff -urN evolution-data-server-orig/camel/camel-sasl-gssapi.c
evolution-data-server-mod/camel/camel-sasl-gssapi.c
+--- evolution-data-server-orig/camel/camel-sasl-gssapi.c 2010-10-31
15:35:47.816000023 -0500
++++ evolution-data-server-mod/camel/camel-sasl-gssapi.c 2010-10-31
16:09:17.160000024 -0500
+@@ -20,54 +20,61 @@
+ *
+ */
+
++/* If building without Kerberos support, this class is an empty shell. */
++
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+
+ #include <errno.h>
+
+-#ifdef HAVE_KRB5
+ #include <netdb.h>
+ #include <string.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
++
++#include <gio/gio.h>
++#include <glib/gi18n-lib.h>
++
++#include "camel-net-utils.h"
++#include "camel-sasl-gssapi.h"
++#include "camel-session.h"
++
++#ifdef HAVE_KRB5
++
+ #ifdef HAVE_HEIMDAL_KRB5
+ #include <krb5.h>
+ #else
+ #include <krb5/krb5.h>
+-#endif
++#endif /* HAVE_HEIMDAL_KRB5 */
++
+ #ifdef HAVE_ET_COM_ERR_H
+ #include <et/com_err.h>
+ #else
+ #ifdef HAVE_COM_ERR_H
+ #include <com_err.h>
+-#endif
+-#endif
++#endif /* HAVE_COM_ERR_H */
++#endif /* HAVE_ET_COM_ERR_H */
++
+ #ifdef HAVE_MIT_KRB5
+ #include <gssapi/gssapi.h>
+ #include <gssapi/gssapi_generic.h>
+-#endif
++#endif /* HAVE_MIT_KRB5 */
++
+ #ifdef HAVE_HEIMDAL_KRB5
+ #include <gssapi.h>
+ #else
+-#ifdef HAVE_SUN_KRB5
++#ifdef HAVE_SUN_KRB5
+ #include <gssapi/gssapi.h>
+ #include <gssapi/gssapi_ext.h>
+ extern gss_OID gss_nt_service_name;
+-#endif
+-#endif
++#endif /* HAVE_SUN_KRB5 */
++#endif /* HAVE_HEIMDAL_KRB5 */
+
+ #ifndef GSS_C_OID_KRBV5_DES
+ #define GSS_C_OID_KRBV5_DES GSS_C_NO_OID
+ #endif
+
+-#include <glib/gi18n-lib.h>
+-#include <gio/gio.h>
+-
+-#include "camel-net-utils.h"
+-#include "camel-sasl-gssapi.h"
+-#include "camel-session.h"
+-
+ #define DBUS_PATH "/org/gnome/KrbAuthDialog"
+ #define DBUS_INTERFACE "org.gnome.KrbAuthDialog"
+ #define DBUS_METHOD "org.gnome.KrbAuthDialog.acquireTgt"
+@@ -105,8 +112,12 @@
+ gss_name_t target;
+ };
+
++#endif /* HAVE_KRB5 */
++
+ G_DEFINE_TYPE (CamelSaslGssapi, camel_sasl_gssapi, CAMEL_TYPE_SASL)
+
++#ifdef HAVE_KRB5
++
+ static void
+ gssapi_set_exception (OM_uint32 major,
+ OM_uint32 minor,
+@@ -409,9 +420,12 @@
+ return challenge;
+ }
+
++#endif /* HAVE_KRB5 */
++
+ static void
+ camel_sasl_gssapi_class_init (CamelSaslGssapiClass *class)
+ {
++#ifdef HAVE_KRB5
+ GObjectClass *object_class;
+ CamelSaslClass *sasl_class;
+
+@@ -422,16 +436,17 @@
+
+ sasl_class = CAMEL_SASL_CLASS (class);
+ sasl_class->challenge = sasl_gssapi_challenge;
++#endif /* HAVE_KRB5 */
+ }
+
+ static void
+ camel_sasl_gssapi_init (CamelSaslGssapi *sasl)
+ {
++#ifdef HAVE_KRB5
+ sasl->priv = CAMEL_SASL_GSSAPI_GET_PRIVATE (sasl);
+
+ sasl->priv->state = GSSAPI_STATE_INIT;
+ sasl->priv->ctx = GSS_C_NO_CONTEXT;
+ sasl->priv->target = GSS_C_NO_NAME;
+-}
+-
+ #endif /* HAVE_KRB5 */
++}



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (1ea93f6dfb55bff1982b32f5cf288466758273d4), Robin Cook, 10/31/2010

Archive powered by MHonArc 2.6.24.

Top of Page