Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (e3c6e6b305ece91d753910b6e1480ea262daa449)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (e3c6e6b305ece91d753910b6e1480ea262daa449)
  • Date: Mon, 7 Feb 2011 02:58:43 -0600

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

dev/null
|binary
gnome2-libs/evolution-data-server/DETAILS |
2
gnome2-libs/evolution-data-server/HISTORY |
4
gnome2-libs/evolution-data-server/PRE_BUILD |
5
gnome2-libs/evolution-data-server/evolution-data-server-2.32.1.tar.bz2.sig |
0
gnome2-libs/evolution-data-server/evolution-data-server-2.32.2.tar.bz2.sig
|binary
gnome2-libs/evolution-data-server/krb5.patch |
126 ----------
7 files changed, 5 insertions(+), 132 deletions(-)

New commits:
commit e3c6e6b305ece91d753910b6e1480ea262daa449
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

evolution-data-server 2.32.2

diff --git a/gnome2-libs/evolution-data-server/DETAILS
b/gnome2-libs/evolution-data-server/DETAILS
index 3d6d29f..6f17727 100755
--- a/gnome2-libs/evolution-data-server/DETAILS
+++ b/gnome2-libs/evolution-data-server/DETAILS
@@ -1,5 +1,5 @@
SPELL=evolution-data-server
- VERSION=2.32.1
+ VERSION=2.32.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/evolution-data-server/HISTORY
b/gnome2-libs/evolution-data-server/HISTORY
index e228926..c862263 100644
--- a/gnome2-libs/evolution-data-server/HISTORY
+++ b/gnome2-libs/evolution-data-server/HISTORY
@@ -1,3 +1,7 @@
+2011-02-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.32.2
+ * PRE_BUILD, krb5.patch: removed
+
2010-11-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.32.1

diff --git a/gnome2-libs/evolution-data-server/PRE_BUILD
b/gnome2-libs/evolution-data-server/PRE_BUILD
deleted file mode 100755
index c3f1070..0000000
--- a/gnome2-libs/evolution-data-server/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-
-cd $SOURCE_DIRECTORY &&
-
-patch -p1 < $SPELL_DIRECTORY/krb5.patch
diff --git
a/gnome2-libs/evolution-data-server/evolution-data-server-2.32.1.tar.bz2.sig
b/gnome2-libs/evolution-data-server/evolution-data-server-2.32.1.tar.bz2.sig
deleted file mode 100644
index 4626e34..0000000
Binary files
a/gnome2-libs/evolution-data-server/evolution-data-server-2.32.1.tar.bz2.sig
and /dev/null differ
diff --git
a/gnome2-libs/evolution-data-server/evolution-data-server-2.32.2.tar.bz2.sig
b/gnome2-libs/evolution-data-server/evolution-data-server-2.32.2.tar.bz2.sig
new file mode 100644
index 0000000..711e02c
Binary files /dev/null and
b/gnome2-libs/evolution-data-server/evolution-data-server-2.32.2.tar.bz2.sig
differ
diff --git a/gnome2-libs/evolution-data-server/krb5.patch
b/gnome2-libs/evolution-data-server/krb5.patch
deleted file mode 100644
index e34816e..0000000
--- a/gnome2-libs/evolution-data-server/krb5.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-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 Ladislav Hagara (e3c6e6b305ece91d753910b6e1480ea262daa449), Ladislav Hagara, 02/07/2011

Archive powered by MHonArc 2.6.24.

Top of Page