[asterisk-commits] pabelanger: branch 1.8 r319085 - in /branches/1.8: ./ include/asterisk/ res/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon May 16 09:35:28 CDT 2011
Author: pabelanger
Date: Mon May 16 09:35:21 2011
New Revision: 319085
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319085
Log:
Support gmime-2.4
(closes issue #18863)
Reported by: tzafrir
Patches:
gmime-2.4-18.diff uploaded by tzafrir (license 46)
Tested by: tzafrir
Review: https://reviewboard.asterisk.org/r/1213/
Modified:
branches/1.8/configure
branches/1.8/configure.ac
branches/1.8/include/asterisk/autoconfig.h.in
branches/1.8/res/res_http_post.c
Modified: branches/1.8/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configure.ac?view=diff&rev=319085&r1=319084&r2=319085
==============================================================================
--- branches/1.8/configure.ac (original)
+++ branches/1.8/configure.ac Mon May 16 09:35:21 2011
@@ -1995,18 +1995,17 @@
AST_EXT_TOOL_CHECK([GMIME], [gmime-config], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
if test "x${PBX_GMIME}" = "x0"; then
# Later versions of GMime use pkg-config
- if test "x${PKGCONFIG}" = xNo; then :; else
- GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.0 --cflags 2>/dev/null)
- GMIME_LIB=$(${PKGCONFIG} gmime-2.0 --libs)
- if test "x${GMIME_INCLUDE}${GMIME_LIB}" = "x"; then
- GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.2 --cflags 2>/dev/null)
- GMIME_LIB=$(${PKGCONFIG} gmime-2.2 --libs)
+ for ver in 2.0 2.2 2.4; do
+ if ! ${PKGCONFIG} --exists gmime-$ver; then
+ continue
fi
- if test "x${GMIME_INCLUDE}${GMIME_LIB}" != "x"; then
- PBX_GMIME=1
- AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.])
- fi
- fi
+ # If we got here, we have this version:
+ GMIME_INCLUDE=$(${PKGCONFIG} gmime-$ver --cflags 2>/dev/null)
+ GMIME_LIB=$(${PKGCONFIG} gmime-$ver --libs)
+ PBX_GMIME=1
+ AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.])
+ break;
+ done
fi
AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
Modified: branches/1.8/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/include/asterisk/autoconfig.h.in?view=diff&rev=319085&r1=319084&r2=319085
==============================================================================
--- branches/1.8/include/asterisk/autoconfig.h.in (original)
+++ branches/1.8/include/asterisk/autoconfig.h.in Mon May 16 09:35:21 2011
@@ -819,16 +819,16 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
-/* Define to 1 if `ifr_ifru.ifru_hwaddr' is member of `struct ifreq'. */
+/* Define to 1 if `ifr_ifru.ifru_hwaddr' is a member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
-/* Define to 1 if `cr_uid' is member of `struct ucred'. */
+/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_CR_UID
-/* Define to 1 if `uid' is member of `struct ucred'. */
+/* Define to 1 if `uid' is a member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_UID
/* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1103,11 +1103,11 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -1127,11 +1127,6 @@
/* Define to the type of arg 5 for `select'. */
#undef SELECT_TYPE_ARG5
-
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
- second argument and the buffer pointer as the third, as on System V before
- release 3. */
-#undef SETVBUF_REVERSED
/* The size of `char *', as computed by sizeof. */
#undef SIZEOF_CHAR_P
@@ -1168,23 +1163,33 @@
/* Define to a type of the same size as fd_set.fds_bits[[0]] */
#undef TYPEOF_FD_SET_FDS_BITS
-/* Define to 1 if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
+/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-
-/* Define to 1 if running on Darwin. */
-#undef _DARWIN_UNLIMITED_SELECT
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Define to 1 if running on Darwin. */
+#undef _DARWIN_UNLIMITED_SELECT
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
#undef _LARGEFILE_SOURCE
@@ -1201,20 +1206,6 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
-
-/* Enable extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
Modified: branches/1.8/res/res_http_post.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_http_post.c?view=diff&rev=319085&r1=319084&r2=319085
==============================================================================
--- branches/1.8/res/res_http_post.c (original)
+++ branches/1.8/res/res_http_post.c Mon May 16 09:35:21 2011
@@ -52,6 +52,11 @@
#define MAX_PREFIX 80
+/* gmime 2.4 provides a newer interface. */
+#ifdef GMIME_TYPE_CONTENT_TYPE
+#define AST_GMIME_VER_24
+#endif
+
/* just a little structure to hold callback info for gmime */
struct mime_cbinfo {
int count;
@@ -84,7 +89,9 @@
g_mime_data_wrapper_write_to_stream(content, stream);
g_mime_stream_flush(stream);
+#ifndef AST_GMIME_VER_24
g_object_unref(content);
+#endif
g_object_unref(stream);
}
@@ -108,7 +115,11 @@
return message;
}
+#ifdef AST_GMIME_VER_24
+static void process_message_callback(GMimeObject *parent, GMimeObject *part, gpointer user_data)
+#else
static void process_message_callback(GMimeObject *part, gpointer user_data)
+#endif
{
struct mime_cbinfo *cbinfo = user_data;
@@ -122,6 +133,7 @@
ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n");
return;
} else if (GMIME_IS_MULTIPART(part)) {
+#ifndef AST_GMIME_VER_24
GList *l;
ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n");
@@ -130,6 +142,9 @@
process_message_callback(l->data, cbinfo);
l = l->next;
}
+#else
+ ast_log(LOG_WARNING, "Got unexpected MIME subpart.\n");
+#endif
} else if (GMIME_IS_PART(part)) {
const char *filename;
@@ -151,7 +166,11 @@
.post_dir = post_dir,
};
+#ifdef AST_GMIME_VER_24
+ g_mime_message_foreach(message, process_message_callback, &cbinfo);
+#else
g_mime_message_foreach_part(message, process_message_callback, &cbinfo);
+#endif
return cbinfo.count;
}
More information about the asterisk-commits
mailing list