r28414 - in /packages/unstable/gmime2.4: ./ build/vs2008/ docs/reference/html/ gmime/
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Mon Jun 13 22:18:14 UTC 2011
Author: meebey
Date: Mon Jun 13 22:18:14 2011
New Revision: 28414
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28414
Log:
Merge commit 'upstream/2.4.25'
Modified:
packages/unstable/gmime2.4/ChangeLog
packages/unstable/gmime2.4/README
packages/unstable/gmime2.4/build/vs2008/gmime.vcproj
packages/unstable/gmime2.4/configure
packages/unstable/gmime2.4/configure.in
packages/unstable/gmime2.4/docs/reference/html/ch01.html
packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html
packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html
packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html
packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html
packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html
packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html
packages/unstable/gmime2.4/docs/reference/html/index.html
packages/unstable/gmime2.4/gmime.spec
packages/unstable/gmime2.4/gmime/gmime-gpg-context.c
packages/unstable/gmime2.4/gmime/gmime-session.c
Modified: packages/unstable/gmime2.4/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/ChangeLog?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/ChangeLog [utf-8] (original)
+++ packages/unstable/gmime2.4/ChangeLog [utf-8] Mon Jun 13 22:18:14 2011
@@ -1,3 +1,20 @@
+2011-06-08 Jeffrey Stedfast <fejj at gnome.org>
+
+ * README: Bumped version
+
+ * configure.in: Bumped version to 2.4.25
+
+ * build/vs2008/gmime.vcproj: Bumped version.
+
+ * gmime/gmime-session.c: Don't crash if the request_passwd()
+ virtual method is set to NULL. Fixes bug #651825.
+
+2011-06-08 Jeffrey Stedfast <fejj at gnome.org>
+
+ * gmime/gmime-gpg-context.c: If building on Apple, force the use
+ of our own implementation of poll() because Apple's poll() is
+ broken on some versions of MacOS.
+
2011-03-26 Jeffrey Stedfast <fejj at novell.com>
* README: Bumped version
Modified: packages/unstable/gmime2.4/README
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/README?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/README [utf-8] (original)
+++ packages/unstable/gmime2.4/README [utf-8] Mon Jun 13 22:18:14 2011
@@ -1,4 +1,4 @@
- GMime, version 2.4.24
+ GMime, version 2.4.25
by Jeffrey Stedfast <fejj at gnome.org>
Modified: packages/unstable/gmime2.4/build/vs2008/gmime.vcproj
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/build/vs2008/gmime.vcproj?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/build/vs2008/gmime.vcproj [utf-8] (original)
+++ packages/unstable/gmime2.4/build/vs2008/gmime.vcproj [utf-8] Mon Jun 13 22:18:14 2011
@@ -41,7 +41,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/D "GMIME_MAJOR_VERSION"="2" /D "GMIME_MINOR_VERSION"="4" /D "GMIME_MICRO_VERSION"="24""
+ AdditionalOptions="/D "GMIME_MAJOR_VERSION"="2" /D "GMIME_MINOR_VERSION"="4" /D "GMIME_MICRO_VERSION"="25""
Optimization="0"
AdditionalIncludeDirectories=""..\..\"; "..\..\util""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GMIME_EXPORTS;HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_LOG_DOMAIN=\"GMime\""
@@ -106,7 +106,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/D "GMIME_MAJOR_VERSION"="2" /D "GMIME_MINOR_VERSION"="4" /D "GMIME_MICRO_VERSION"="24""
+ AdditionalOptions="/D "GMIME_MAJOR_VERSION"="2" /D "GMIME_MINOR_VERSION"="4" /D "GMIME_MICRO_VERSION"="25""
AdditionalIncludeDirectories=""..\..\"; "..\..\util""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GMIME_EXPORTS;HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_LOG_DOMAIN=\"GMime\""
RuntimeLibrary="2"
Modified: packages/unstable/gmime2.4/configure
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/configure?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/configure [utf-8] (original)
+++ packages/unstable/gmime2.4/configure [utf-8] Mon Jun 13 22:18:14 2011
@@ -2671,7 +2671,7 @@
GMIME_MAJOR_VERSION=2
GMIME_MINOR_VERSION=4
-GMIME_MICRO_VERSION=24
+GMIME_MICRO_VERSION=25
GMIME_VERSION=$GMIME_MAJOR_VERSION.$GMIME_MINOR_VERSION.$GMIME_MICRO_VERSION
GMIME_VERSION_INFO=`expr $GMIME_MAJOR_VERSION + $GMIME_MINOR_VERSION`:$GMIME_MICRO_VERSION:$GMIME_MINOR_VERSION
Modified: packages/unstable/gmime2.4/configure.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/configure.in?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/configure.in [utf-8] (original)
+++ packages/unstable/gmime2.4/configure.in [utf-8] Mon Jun 13 22:18:14 2011
@@ -12,7 +12,7 @@
GMIME_MAJOR_VERSION=2
GMIME_MINOR_VERSION=4
-GMIME_MICRO_VERSION=24
+GMIME_MICRO_VERSION=25
GMIME_VERSION=$GMIME_MAJOR_VERSION.$GMIME_MINOR_VERSION.$GMIME_MICRO_VERSION
GMIME_VERSION_INFO=`expr $GMIME_MAJOR_VERSION + $GMIME_MINOR_VERSION`:$GMIME_MICRO_VERSION:$GMIME_MINOR_VERSION
Modified: packages/unstable/gmime2.4/docs/reference/html/ch01.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/ch01.html?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/ch01.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/ch01.html [utf-8] Mon Jun 13 22:18:14 2011
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter" title="Class hierarchy">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id2593065"></a>Class hierarchy</h2></div></div></div>
+<a name="id2593271"></a>Class hierarchy</h2></div></div></div>
<pre class="screen">
GMimeHeader
<a class="link" href="gmime-GMimeParam.html#GMimeParam" title="GMimeParam">GMimeParam</a>
Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html [utf-8] Mon Jun 13 22:18:14 2011
@@ -31,7 +31,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1" title="Incompatible changes from 1.0 to 2.0">
-<a name="id2563507"></a><h2>Incompatible changes from 1.0 to 2.0</h2>
+<a name="id2563710"></a><h2>Incompatible changes from 1.0 to 2.0</h2>
<p>
See also the PORTING document in the toplevel GMime source directory.
</p>
Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html [utf-8] Mon Jun 13 22:18:14 2011
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1" title="Incompatible changes from 2.0 to 2.2">
-<a name="id2563665"></a><h2>Incompatible changes from 2.0 to 2.2</h2>
+<a name="id2563868"></a><h2>Incompatible changes from 2.0 to 2.2</h2>
<p>See also the PORTING document in the toplevel GMime source directory.</p>
<p>There are no incompatible changes between 2.0 and 2.2.</p>
<p>GMime 2.2 is both API and ABI compatible with GMime 2.0 meaning
@@ -41,7 +41,7 @@
be deprecated in some future version, probably 3.0).</p>
</div>
<div class="refsect1" title="Replacement interfaces from 2.0 to 2.2">
-<a name="id2563865"></a><h2>Replacement interfaces from 2.0 to 2.2</h2>
+<a name="id2564069"></a><h2>Replacement interfaces from 2.0 to 2.2</h2>
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
<li class="listitem"><p>
<code class="function">g_mime_utils_8bit_header_decode()</code> has been split
Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html [utf-8] Mon Jun 13 22:18:14 2011
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1" title="Changes from 2.2 to 2.4">
-<a name="id2564713"></a><h2>Changes from 2.2 to 2.4</h2>
+<a name="id2564916"></a><h2>Changes from 2.2 to 2.4</h2>
<p>GMime 2.4 has had a number of API changes since GMime
2.2. To start, ALL public APIs that used to use off_t in GMime 2.2 now
use gint64 so that the API and ABI do not change based on whether or
Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html [utf-8] Mon Jun 13 22:18:14 2011
@@ -31,7 +31,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1" title="Compiling GMime Applications on UNIX">
-<a name="id2563378"></a><h2>Compiling GMime Applications on UNIX</h2>
+<a name="id2563581"></a><h2>Compiling GMime Applications on UNIX</h2>
<p>
To compile a GMime application, you need to tell the compiler where to
find the GMime header files and libraries. This is done with the
Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html [utf-8] Mon Jun 13 22:18:14 2011
@@ -31,22 +31,22 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1" title="Questions and Answers">
-<a name="id2565350"></a><h2>Questions and Answers</h2>
+<a name="id2565554"></a><h2>Questions and Answers</h2>
<p>This is an "index" of the reference manual
organized by common "How do I..." questions. If you
aren't sure which documentation to read for the question you have,
this list is a good place to start.
</p>
<div class="qandaset" title="Frequently Asked Questions">
-<a name="id2565363"></a><table border="0" width="100%" summary="Q and A Set">
+<a name="id2565566"></a><table border="0" width="100%" summary="Q and A Set">
<col align="left" width="1%">
<col>
<tbody>
<tr class="qandadiv"><td align="left" valign="top" colspan="2"><h5 class="title">
-<a name="id2565365"></a>1. General</h5></td></tr>
+<a name="id2565568"></a>1. General</h5></td></tr>
<tr class="question" title="Question">
<td align="left" valign="top">
-<a name="id2565370"></a><a name="id2565373"></a><p><b>1.1.</b></p>
+<a name="id2565574"></a><a name="id2565576"></a><p><b>1.1.</b></p>
</td>
<td align="left" valign="top"><p>Where can I get help with GMime, submit a bug report, or make a feature request?</p></td>
</tr>
@@ -57,7 +57,7 @@
</tr>
<tr class="question" title="Question">
<td align="left" valign="top">
-<a name="id2566085"></a><a name="id2566088"></a><p><b>1.2.</b></p>
+<a name="id2566288"></a><a name="id2566291"></a><p><b>1.2.</b></p>
</td>
<td align="left" valign="top"><p>How do I port from one GMime version to another?</p></td>
</tr>
@@ -68,7 +68,7 @@
</tr>
<tr class="question" title="Question">
<td align="left" valign="top">
-<a name="id2566106"></a><a name="id2566109"></a><p><b>1.3.</b></p>
+<a name="id2566310"></a><a name="id2566312"></a><p><b>1.3.</b></p>
</td>
<td align="left" valign="top"><p>How does memory management work in GMime? Should I free data returned from functions?</p></td>
</tr>
@@ -88,7 +88,7 @@
</tr>
<tr class="question" title="Question">
<td align="left" valign="top">
-<a name="id2566146"></a><a name="id2566148"></a><p><b>1.4.</b></p>
+<a name="id2566349"></a><a name="id2566351"></a><p><b>1.4.</b></p>
</td>
<td align="left" valign="top"><p>How do I use GMime with threads?</p></td>
</tr>
@@ -110,7 +110,7 @@
</tr>
<tr class="question" title="Question">
<td align="left" valign="top">
-<a name="id2566199"></a><a name="id2566201"></a><p><b>1.5.</b></p>
+<a name="id2566402"></a><a name="id2566404"></a><p><b>1.5.</b></p>
</td>
<td align="left" valign="top"><p>How do I use GMime with C++?</p></td>
</tr>
Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html [utf-8] Mon Jun 13 22:18:14 2011
@@ -31,7 +31,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1" title="Filing a bug report or feature request">
-<a name="id2564891"></a><h2>Filing a bug report or feature request</h2>
+<a name="id2565094"></a><h2>Filing a bug report or feature request</h2>
<p>
If you encounter a bug, misfeature, or missing feature in GMime, please
file a bug report at
@@ -47,7 +47,7 @@
</p>
</div>
<div class="refsect1" title="Submitting Patches">
-<a name="id2564949"></a><h2>Submitting Patches</h2>
+<a name="id2565152"></a><h2>Submitting Patches</h2>
<p>
If you develop a bugfix or enhancement for GMime, please file that in
Bugzilla as well. Bugzilla allows you to attach files; please attach a
@@ -67,7 +67,7 @@
</p>
</div>
<div class="refsect1" title="Mailing lists">
-<a name="id2564995"></a><h2>Mailing lists</h2>
+<a name="id2565198"></a><h2>Mailing lists</h2>
<p>There is currently only one mailing-list devoted to GMime
itself which is for both the development of and development with
GMime. You can subscribe to this list
Modified: packages/unstable/gmime2.4/docs/reference/html/index.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/index.html?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/index.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/index.html [utf-8] Mon Jun 13 22:18:14 2011
@@ -25,7 +25,7 @@
</div></div></div>
<div><p class="copyright">Copyright © 2000-2010 Jeffrey Stedfast</p></div>
<div><div class="legalnotice" title="Legal Notice">
-<a name="id2515070"></a><p>
+<a name="id2515276"></a><p>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
Modified: packages/unstable/gmime2.4/gmime.spec
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime.spec?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime.spec [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime.spec [utf-8] Mon Jun 13 22:18:14 2011
@@ -1,5 +1,5 @@
# Note that this is NOT a relocatable package
-%define ver 2.4.24
+%define ver 2.4.25
%define prefix /usr
%define enable_mono 0
%define enable_gtk_doc 0
Modified: packages/unstable/gmime2.4/gmime/gmime-gpg-context.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-gpg-context.c?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-gpg-context.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-gpg-context.c [utf-8] Mon Jun 13 22:18:14 2011
@@ -21,6 +21,11 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
+#ifdef __APPLE__
+#undef HAVE_POLL_H
+#undef HAVE_POLL
#endif
#include <stdio.h>
@@ -1320,15 +1325,18 @@
FD_ZERO (&xset);
for (i = 0; i < nfds; i++) {
+ pfds[i].revents = 0;
+ if (pfds[i].fd < 0)
+ continue;
+
if (pfds[i].events & POLLIN)
FD_SET (pfds[i].fd, &rset);
if (pfds[i].events & POLLOUT)
FD_SET (pfds[i].fd, &wset);
- if (pfds[i].events & POLLPRI)
+ if (pfds[i].events != 0)
FD_SET (pfds[i].fd, &xset);
- if (pfds[i].fd > maxfd && (pfds[i].events & (POLLIN | POLLOUT | POLLPRI)))
+ if (pfds[i].fd > maxfd)
maxfd = pfds[i].fd;
- pfds[i].revents = 0;
}
/* poll our fds... */
@@ -1336,12 +1344,15 @@
ready = 0;
for (i = 0; i < nfds; i++) {
+ if (pfds[i].fd < 0)
+ continue;
+
if (FD_ISSET (pfds[i].fd, &rset))
pfds[i].revents |= POLLIN;
if (FD_ISSET (pfds[i].fd, &wset))
pfds[i].revents |= POLLOUT;
if (FD_ISSET (pfds[i].fd, &xset))
- pfds[i].revents |= POLLPRI;
+ pfds[i].revents |= POLLERR | POLLHUP;
if (pfds[i].revents != 0)
ready++;
Modified: packages/unstable/gmime2.4/gmime/gmime-session.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-session.c?rev=28414&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-session.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-session.c [utf-8] Mon Jun 13 22:18:14 2011
@@ -160,7 +160,10 @@
{
g_return_val_if_fail (GMIME_IS_SESSION (session), NULL);
- return GMIME_SESSION_GET_CLASS (session)->request_passwd (session, prompt, secret, item, err);
+ if (GMIME_SESSION_GET_CLASS (session)->request_passwd)
+ return GMIME_SESSION_GET_CLASS (session)->request_passwd (session, prompt, secret, item, err);
+ else
+ return session_request_passwd (session, prompt, secret, item, err);
}
@@ -185,5 +188,6 @@
{
g_return_if_fail (GMIME_IS_SESSION (session));
- GMIME_SESSION_GET_CLASS (session)->forget_passwd (session, item, err);
+ if (GMIME_SESSION_GET_CLASS (session)->forget_passwd)
+ GMIME_SESSION_GET_CLASS (session)->forget_passwd (session, item, err);
}
More information about the pkg-gnome-commits
mailing list