Mailinglist Archive: opensuse-commit (1649 mails)
| < Previous | Next > |
commit gmime
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 22 Oct 2008 17:56:30 +0200
- Message-id: <20081022155630.7E6A1678166@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package gmime
checked in at Wed Oct 22 17:56:30 CEST 2008.
--------
--- GNOME/gmime/gmime.changes 2008-08-15 14:57:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/gmime/gmime.changes 2008-10-17
13:35:15.506903000 +0200
@@ -1,0 +2,11 @@
+Fri Oct 17 13:04:04 CEST 2008 - sbrabec@xxxxxxx
+
+- Updated to version 2.2.23:
+ * documentation updated
+ * New faster method for calculating nearest power of 2.
+ * New functions backported from 2.3.x:
+ g_mime_parser_get_headers_begin, g_mime_parser_get_headers_end
+ * Only ref the message if it is non-NULL.
+- Fixed failure in mono binding installation.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gmime-2.2.22.tar.bz2
New:
----
gmime-2.2.23.tar.bz2
gmime-gacutil-bootstrap.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gmime.spec ++++++
--- /var/tmp/diff_new_pack.v11145/_old 2008-10-22 17:56:06.000000000 +0200
+++ /var/tmp/diff_new_pack.v11145/_new 2008-10-22 17:56:06.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gmime (Version 2.2.22)
+# spec file for package gmime (Version 2.2.23)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,7 +20,7 @@
Name: gmime
BuildRequires: glib-sharp2 glib2-devel gtk-doc gtk-sharp2 gtk-sharp2-gapi
mono-devel zlib-devel
-Version: 2.2.22
+Version: 2.2.23
Release: 1
Url: http://spruce.sourceforge.net/gmime/
Group: Productivity/Networking/Email/Utilities
@@ -31,6 +31,7 @@
# PATCH-FIX-OPENSUSE gmime-no-off_t.patch bnc344662 bgo501830
Patch: gmime-no-off_t.patch
Patch3: gmime-monoreq.patch
+Patch4: gmime-gacutil-bootstrap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libgmime-2_0-3 = %{version}
@@ -124,6 +125,7 @@
%patch
# fix requires for sharp bindings (GMIME_VERSION != SONAME_VERSION)
%patch3
+%patch4
%build
cp /usr/share/gettext/config.rpath .
@@ -136,7 +138,7 @@
make %{?jobs:-j%jobs}
%install
-%makeinstall
+%makeinstall GACUTIL_FLAGS="/package gtk-sharp /root -bootstrap
$RPM_BUILD_ROOT%{_prefix}/lib"
# rename to prevent conflict with uu* utils from sharutils
mv $RPM_BUILD_ROOT%{_bindir}/uuencode $RPM_BUILD_ROOT%{_bindir}/gmime-uuencode
mv $RPM_BUILD_ROOT%{_bindir}/uudecode $RPM_BUILD_ROOT%{_bindir}/gmime-uudecode
@@ -192,6 +194,14 @@
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Oct 17 2008 sbrabec@xxxxxxx
+- Updated to version 2.2.23:
+ * documentation updated
+ * New faster method for calculating nearest power of 2.
+ * New functions backported from 2.3.x:
+ g_mime_parser_get_headers_begin, g_mime_parser_get_headers_end
+ * Only ref the message if it is non-NULL.
+- Fixed failure in mono binding installation.
* Fri Aug 15 2008 sbrabec@xxxxxxx
- Updated to version 2.2.22:
* Bug fixes.
++++++ gmime-2.2.22.tar.bz2 -> gmime-2.2.23.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/ChangeLog new/gmime-2.2.23/ChangeLog
--- old/gmime-2.2.22/ChangeLog 2008-07-20 01:48:56.000000000 +0200
+++ new/gmime-2.2.23/ChangeLog 2008-09-14 17:29:02.000000000 +0200
@@ -1,3 +1,26 @@
+2008-09-14 Jeffrey Stedfast <fejj@xxxxxxxxxx>
+
+ * README: Bumped version
+
+ * configure.in: Bumped version to 2.2.23
+
+2008-09-13 Jeffrey Stedfast <fejj@xxxxxxxxxx>
+
+ * docs/reference/gmime-sections.txt: Updated.
+
+ * gmime/gmime-parser.c (nearest_pow): New faster method for
+ calculating nearest power of 2, rather than an expensive
+ while-loop.
+ (g_mime_parser_get_headers_begin): New function backported from
+ 2.3.x
+ (g_mime_parser_get_headers_end): Same.
+
+2008-08-07 Jeffrey Stedfast <fejj@xxxxxxxxxx>
+
+ * gmime/gmime-message-part.c (g_mime_message_part_get_message):
+ Only ref the message if it is non-NULL. Thanks to Peter Bloomfield
+ for this fix.
+
2008-07-19 Jeffrey Stedfast <fejj@xxxxxxxxxx>
* README: Bumped version
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/configure new/gmime-2.2.23/configure
--- old/gmime-2.2.22/configure 2008-07-15 05:07:55.000000000 +0200
+++ new/gmime-2.2.23/configure 2008-09-14 17:31:14.000000000 +0200
@@ -2011,7 +2011,7 @@
GMIME_MAJOR_VERSION=2
GMIME_MINOR_VERSION=2
-GMIME_MICRO_VERSION=22
+GMIME_MICRO_VERSION=23
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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/configure.in new/gmime-2.2.23/configure.in
--- old/gmime-2.2.22/configure.in 2008-07-15 05:07:32.000000000 +0200
+++ new/gmime-2.2.23/configure.in 2008-09-14 17:28:35.000000000 +0200
@@ -12,7 +12,7 @@
GMIME_MAJOR_VERSION=2
GMIME_MINOR_VERSION=2
-GMIME_MICRO_VERSION=22
+GMIME_MICRO_VERSION=23
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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/docs/reference/gmime-sections.txt
new/gmime-2.2.23/docs/reference/gmime-sections.txt
--- old/gmime-2.2.22/docs/reference/gmime-sections.txt 2008-07-20
01:58:48.000000000 +0200
+++ new/gmime-2.2.23/docs/reference/gmime-sections.txt 2008-09-14
17:40:41.000000000 +0200
@@ -967,6 +967,8 @@
g_mime_parser_construct_message
g_mime_parser_get_from
g_mime_parser_get_from_offset
+g_mime_parser_get_headers_begin
+g_mime_parser_get_headers_end
<SUBSECTION Private>
g_mime_parser_get_type
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/docs/reference/html/gmime.devhelp
new/gmime-2.2.23/docs/reference/html/gmime.devhelp
--- old/gmime-2.2.22/docs/reference/html/gmime.devhelp 2008-07-20
01:58:48.000000000 +0200
+++ new/gmime-2.2.23/docs/reference/html/gmime.devhelp 2008-09-14
17:40:41.000000000 +0200
@@ -506,6 +506,8 @@
<function name="g_mime_parser_construct_message ()"
link="gmime-gmime-parser.html#g-mime-parser-construct-message"/>
<function name="g_mime_parser_get_from ()"
link="gmime-gmime-parser.html#g-mime-parser-get-from"/>
<function name="g_mime_parser_get_from_offset ()"
link="gmime-gmime-parser.html#g-mime-parser-get-from-offset"/>
+ <function name="g_mime_parser_get_headers_begin ()"
link="gmime-gmime-parser.html#g-mime-parser-get-headers-begin"/>
+ <function name="g_mime_parser_get_headers_end ()"
link="gmime-gmime-parser.html#g-mime-parser-get-headers-end"/>
<function name="enum GMimeCipherHash"
link="gmime-gmime-cipher-context.html#GMimeCipherHash"/>
<function name="GMimeCipherContext"
link="gmime-gmime-cipher-context.html#GMimeCipherContext-struct"/>
<function name="GMimeCipherValidity"
link="gmime-gmime-cipher-context.html#GMimeCipherValidity"/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/docs/reference/html/gmime.devhelp2
new/gmime-2.2.23/docs/reference/html/gmime.devhelp2
--- old/gmime-2.2.22/docs/reference/html/gmime.devhelp2 2008-07-20
01:58:48.000000000 +0200
+++ new/gmime-2.2.23/docs/reference/html/gmime.devhelp2 2008-09-14
17:40:41.000000000 +0200
@@ -506,6 +506,8 @@
<keyword type="function" name="g_mime_parser_construct_message ()"
link="gmime-gmime-parser.html#g-mime-parser-construct-message"/>
<keyword type="function" name="g_mime_parser_get_from ()"
link="gmime-gmime-parser.html#g-mime-parser-get-from"/>
<keyword type="function" name="g_mime_parser_get_from_offset ()"
link="gmime-gmime-parser.html#g-mime-parser-get-from-offset"/>
+ <keyword type="function" name="g_mime_parser_get_headers_begin ()"
link="gmime-gmime-parser.html#g-mime-parser-get-headers-begin" since="2.2.23"/>
+ <keyword type="function" name="g_mime_parser_get_headers_end ()"
link="gmime-gmime-parser.html#g-mime-parser-get-headers-end" since="2.2.23"/>
<keyword type="enum" name="enum GMimeCipherHash"
link="gmime-gmime-cipher-context.html#GMimeCipherHash"/>
<keyword type="struct" name="GMimeCipherContext"
link="gmime-gmime-cipher-context.html#GMimeCipherContext-struct"/>
<keyword type="typedef" name="GMimeCipherValidity"
link="gmime-gmime-cipher-context.html#GMimeCipherValidity" deprecated=""/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/gmime-2.2.22/docs/reference/html/gmime-gmime-parser.html
new/gmime-2.2.23/docs/reference/html/gmime-gmime-parser.html
--- old/gmime-2.2.22/docs/reference/html/gmime-gmime-parser.html
2008-07-20 01:58:48.000000000 +0200
+++ new/gmime-2.2.23/docs/reference/html/gmime-gmime-parser.html
2008-09-14 17:40:41.000000000 +0200
@@ -101,6 +101,8 @@
<a class="link" href="gmime-gmime-message.html#GMimeMessage">GMimeMessage</a>*
<a class="link"
href="gmime-gmime-parser.html#g-mime-parser-construct-message"
title="g_mime_parser_construct_message ()">g_mime_parser_construct_message</a>
(<a class="link" href="gmime-gmime-parser.html#GMimeParser">GMimeParser</a>
*parser);
char* <a class="link"
href="gmime-gmime-parser.html#g-mime-parser-get-from"
title="g_mime_parser_get_from ()">g_mime_parser_get_from</a> (<a
class="link" href="gmime-gmime-parser.html#GMimeParser">GMimeParser</a>
*parser);
off_t <a class="link"
href="gmime-gmime-parser.html#g-mime-parser-get-from-offset"
title="g_mime_parser_get_from_offset ()">g_mime_parser_get_from_offset</a>
(<a class="link" href="gmime-gmime-parser.html#GMimeParser">GMimeParser</a>
*parser);
+off_t <a class="link"
href="gmime-gmime-parser.html#g-mime-parser-get-headers-begin"
title="g_mime_parser_get_headers_begin ()">g_mime_parser_get_headers_begin</a>
(<a class="link" href="gmime-gmime-parser.html#GMimeParser">GMimeParser</a>
*parser);
+off_t <a class="link"
href="gmime-gmime-parser.html#g-mime-parser-get-headers-end"
title="g_mime_parser_get_headers_end ()">g_mime_parser_get_headers_end</a>
(<a class="link" href="gmime-gmime-parser.html#GMimeParser">GMimeParser</a>
*parser);
</pre>
</div>
<div class="refsect1" lang="en">
@@ -681,6 +683,66 @@
</tbody>
</table></div>
</div>
+<hr>
+<div class="refsect2" lang="en">
+<a
name="g-mime-parser-get-headers-begin"></a><h3>g_mime_parser_get_headers_begin
()</h3>
+<pre class="programlisting">off_t
g_mime_parser_get_headers_begin (<a class="link"
href="gmime-gmime-parser.html#GMimeParser">GMimeParser</a> *parser);</pre>
+<p>
+Gets the stream offset of the beginning of the headers of the most
+recently parsed message.</p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em
class="parameter"><code>parser</code></em> :</span></p></td>
+<td> a <a class="link" href="gmime-gmime-parser.html#GMimeParser"><span
class="type">GMimeParser</span></a> context
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span
class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the offset of the beginning of the headers of the most
+recently parsed message or <code class="literal">-1</code> on error.
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 2.2.23
+</p>
+</div>
+<hr>
+<div class="refsect2" lang="en">
+<a name="g-mime-parser-get-headers-end"></a><h3>g_mime_parser_get_headers_end
()</h3>
+<pre class="programlisting">off_t g_mime_parser_get_headers_end
(<a class="link"
href="gmime-gmime-parser.html#GMimeParser">GMimeParser</a> *parser);</pre>
+<p>
+Gets the stream offset of the end of the headers of the most
+recently parsed message.</p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em
class="parameter"><code>parser</code></em> :</span></p></td>
+<td> a <a class="link" href="gmime-gmime-parser.html#GMimeParser"><span
class="type">GMimeParser</span></a> context
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span
class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the offset of the end of the headers of the most recently
+parsed message or <code class="literal">-1</code> on error.
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 2.2.23
+</p>
+</div>
</div>
</div>
<div class="footer">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/docs/reference/html/index.sgml
new/gmime-2.2.23/docs/reference/html/index.sgml
--- old/gmime-2.2.22/docs/reference/html/index.sgml 2008-07-20
01:58:48.000000000 +0200
+++ new/gmime-2.2.23/docs/reference/html/index.sgml 2008-09-14
17:40:41.000000000 +0200
@@ -690,6 +690,8 @@
<ANCHOR id="g-mime-parser-construct-message"
href="gmime/gmime-gmime-parser.html#g-mime-parser-construct-message">
<ANCHOR id="g-mime-parser-get-from"
href="gmime/gmime-gmime-parser.html#g-mime-parser-get-from">
<ANCHOR id="g-mime-parser-get-from-offset"
href="gmime/gmime-gmime-parser.html#g-mime-parser-get-from-offset">
+<ANCHOR id="g-mime-parser-get-headers-begin"
href="gmime/gmime-gmime-parser.html#g-mime-parser-get-headers-begin">
+<ANCHOR id="g-mime-parser-get-headers-end"
href="gmime/gmime-gmime-parser.html#g-mime-parser-get-headers-end">
<ANCHOR id="gmime-gmime-cipher-context"
href="gmime/gmime-gmime-cipher-context.html">
<ANCHOR id="gmime-gmime-cipher-context.synopsis"
href="gmime/gmime-gmime-cipher-context.html#gmime-gmime-cipher-context.synopsis">
<ANCHOR id="GMimeCipherContext"
href="gmime/gmime-gmime-cipher-context.html#GMimeCipherContext">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/docs/reference/tmpl/gmime-parser.sgml
new/gmime-2.2.23/docs/reference/tmpl/gmime-parser.sgml
--- old/gmime-2.2.22/docs/reference/tmpl/gmime-parser.sgml 2008-07-20
01:58:48.000000000 +0200
+++ new/gmime-2.2.23/docs/reference/tmpl/gmime-parser.sgml 2008-09-14
17:40:41.000000000 +0200
@@ -180,3 +180,21 @@
@Returns:
+<!-- ##### FUNCTION g_mime_parser_get_headers_begin ##### -->
+<para>
+
+</para>
+
+@parser:
+@Returns:
+
+
+<!-- ##### FUNCTION g_mime_parser_get_headers_end ##### -->
+<para>
+
+</para>
+
+@parser:
+@Returns:
+
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/docs/reference/xml/gmime-parser.xml
new/gmime-2.2.23/docs/reference/xml/gmime-parser.xml
--- old/gmime-2.2.22/docs/reference/xml/gmime-parser.xml 2008-07-20
01:58:48.000000000 +0200
+++ new/gmime-2.2.23/docs/reference/xml/gmime-parser.xml 2008-09-14
17:40:41.000000000 +0200
@@ -46,6 +46,8 @@
<link linkend="GMimeMessage">GMimeMessage</link>* <link
linkend="g-mime-parser-construct-message">g_mime_parser_construct_message</link>
(<link linkend="GMimeParser">GMimeParser</link> *parser);
<link linkend="char">char</link>* <link
linkend="g-mime-parser-get-from">g_mime_parser_get_from</link>
(<link linkend="GMimeParser">GMimeParser</link> *parser);
<link linkend="off-t">off_t</link> <link
linkend="g-mime-parser-get-from-offset">g_mime_parser_get_from_offset</link>
(<link linkend="GMimeParser">GMimeParser</link> *parser);
+<link linkend="off-t">off_t</link> <link
linkend="g-mime-parser-get-headers-begin">g_mime_parser_get_headers_begin</link>
(<link linkend="GMimeParser">GMimeParser</link> *parser);
+<link linkend="off-t">off_t</link> <link
linkend="g-mime-parser-get-headers-end">g_mime_parser_get_headers_end</link>
(<link linkend="GMimeParser">GMimeParser</link> *parser);
</synopsis>
</refsynopsisdiv>
@@ -401,6 +403,42 @@
or -1 on error.
</simpara></listitem></varlistentry>
</variablelist></refsect2>
+<refsect2 id="g-mime-parser-get-headers-begin" role="function"
condition="since:2.2.23">
+<title>g_mime_parser_get_headers_begin ()</title>
+<indexterm zone="g-mime-parser-get-headers-begin"
role="2.2.23"><primary>g_mime_parser_get_headers_begin</primary></indexterm><programlisting><link
linkend="off-t">off_t</link> g_mime_parser_get_headers_begin
(<link linkend="GMimeParser">GMimeParser</link> *parser);</programlisting>
+<para>
+Gets the stream offset of the beginning of the headers of the most
+recently parsed message.</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>parser</parameter> :</term>
+<listitem><simpara> a <link
linkend="GMimeParser"><type>GMimeParser</type></link> context
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
the offset of the beginning of the headers of the most
+recently parsed message or <link linkend="1:CAPS"><literal>-1</literal></link>
on error.
+
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 2.2.23
+</para></refsect2>
+<refsect2 id="g-mime-parser-get-headers-end" role="function"
condition="since:2.2.23">
+<title>g_mime_parser_get_headers_end ()</title>
+<indexterm zone="g-mime-parser-get-headers-end"
role="2.2.23"><primary>g_mime_parser_get_headers_end</primary></indexterm><programlisting><link
linkend="off-t">off_t</link> g_mime_parser_get_headers_end
(<link linkend="GMimeParser">GMimeParser</link> *parser);</programlisting>
+<para>
+Gets the stream offset of the end of the headers of the most
+recently parsed message.</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>parser</parameter> :</term>
+<listitem><simpara> a <link
linkend="GMimeParser"><type>GMimeParser</type></link> context
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
the offset of the end of the headers of the most recently
+parsed message or <link linkend="1:CAPS"><literal>-1</literal></link> on error.
+
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 2.2.23
+</para></refsect2>
</refsect1>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/gmime/gmime-message-part.c
new/gmime-2.2.23/gmime/gmime-message-part.c
--- old/gmime-2.2.22/gmime/gmime-message-part.c 2008-05-24 02:38:27.000000000
+0200
+++ new/gmime-2.2.23/gmime/gmime-message-part.c 2008-08-08 01:49:52.000000000
+0200
@@ -27,7 +27,7 @@
#include "gmime-message-part.h"
-#define d(x) x
+#define d(x)
/**
@@ -303,7 +303,8 @@
{
g_return_val_if_fail (GMIME_IS_MESSAGE_PART (part), NULL);
- g_object_ref (part->message);
+ if (part->message)
+ g_object_ref (part->message);
return part->message;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/gmime/gmime-parser.c
new/gmime-2.2.23/gmime/gmime-parser.c
--- old/gmime-2.2.22/gmime/gmime-parser.c 2008-05-24 02:38:26.000000000
+0200
+++ new/gmime-2.2.23/gmime/gmime-parser.c 2008-09-13 15:24:40.000000000
+0200
@@ -112,8 +112,12 @@
char *rawptr;
size_t rawleft;
- off_t headers_start;
- off_t header_start;
+ /* current message headerblock offsets */
+ off_t headers_begin;
+ off_t headers_end;
+
+ /* current header field offset */
+ off_t header_offset;
short int state;
@@ -125,7 +129,6 @@
unsigned short int persist_stream:1;
unsigned short int respect_content_length:1;
- GMimeContentType *content_type;
struct _header_raw *headers;
struct _boundary_stack *bounds;
@@ -325,8 +328,10 @@
priv->rawptr = priv->rawbuf;
priv->rawleft = SCAN_HEAD;
- priv->headers_start = -1;
- priv->header_start = -1;
+ priv->headers_begin = -1;
+ priv->headers_end = -1;
+
+ priv->header_offset = -1;
priv->midline = FALSE;
priv->seekable = offset != -1;
@@ -741,19 +746,31 @@
return 0;
}
+static inline size_t
+nearest_pow (size_t num)
+{
+ size_t n = num > 0 ? num - 1 : 0;
+
+ n |= n >> 1;
+ n |= n >> 2;
+ n |= n >> 4;
+ n |= n >> 8;
+ n |= n >> 16;
+ n++;
+
+ return n;
+}
+
#define header_append(priv, start, len) G_STMT_START { \
if (priv->headerleft <= len) { \
size_t hlen, hoff; \
\
- hlen = hoff = priv->headerptr - priv->headerbuf; \
- hlen = hlen ? hlen : 1; \
+ hoff = priv->headerptr - priv->headerbuf; \
+ hlen = nearest_pow (hoff + len + 1); \
\
- while (hlen < hoff + len) \
- hlen <<= 1; \
- \
- priv->headerbuf = g_realloc (priv->headerbuf, hlen + 1); \
+ priv->headerbuf = g_realloc (priv->headerbuf, hlen); \
priv->headerptr = priv->headerbuf + hoff; \
- priv->headerleft = hlen - hoff; \
+ priv->headerleft = (hlen - 1) - hoff; \
} \
\
memcpy (priv->headerptr, start, len); \
@@ -765,15 +782,12 @@
if (priv->rawleft <= len) { \
size_t hlen, hoff; \
\
- hlen = hoff = priv->rawptr - priv->rawbuf; \
- hlen = hlen ? hlen : 1; \
- \
- while (hlen < hoff + len) \
- hlen <<= 1; \
+ hoff = priv->rawptr - priv->rawbuf; \
+ hlen = nearest_pow (hoff + len + 1); \
\
- priv->rawbuf = g_realloc (priv->rawbuf, hlen + 1); \
+ priv->rawbuf = g_realloc (priv->rawbuf, hlen); \
priv->rawptr = priv->rawbuf + hoff; \
- priv->rawleft = hlen - hoff; \
+ priv->rawleft = (hlen - 1) - hoff; \
} \
\
memcpy (priv->rawptr, start, len); \
@@ -803,7 +817,7 @@
if (*inptr != ':') {
/* ignore invalid headers */
w(g_warning ("Invalid header at %lld: '%s'",
- (long long) priv->header_start,
+ (long long) priv->header_offset,
priv->headerbuf));
priv->headerleft += priv->headerptr - priv->headerbuf;
@@ -835,7 +849,7 @@
header->value = g_strndup (start, end - start);
- header->offset = priv->header_start;
+ header->offset = priv->header_offset;
(*tail)->next = header;
*tail = header;
@@ -865,8 +879,10 @@
raw_header_reset (priv);
header_raw_clear (&priv->headers);
hend = (struct _header_raw *) &priv->headers;
- priv->headers_start = parser_offset (priv, NULL);
- priv->header_start = parser_offset (priv, NULL);
+ priv->header_offset = parser_offset (priv, NULL);
+
+ if (priv->headers_begin == -1)
+ priv->headers_begin = parser_offset (priv, NULL);
inptr = priv->inptr;
inend = priv->inend;
@@ -889,7 +905,7 @@
/* if we are scanning a new line, check for a folded
header */
if (!priv->midline && continuation && (*inptr != ' ' &&
*inptr != '\t')) {
header_parse (parser, &hend);
- priv->header_start = parser_offset (priv,
inptr);
+ priv->header_offset = parser_offset (priv,
inptr);
continuation = FALSE;
fieldname = TRUE;
valid = TRUE;
@@ -997,6 +1013,9 @@
if (priv->headerptr > priv->headerbuf)
header_parse (parser, &hend);
+ if (priv->headers_end == -1)
+ priv->headers_end = parser_offset (priv, start);
+
priv->state = GMIME_PARSER_STATE_HEADERS_END;
*priv->rawptr = '\0';
priv->inptr = inptr;
@@ -1005,6 +1024,9 @@
next_message:
+ if (priv->headers_end == -1)
+ priv->headers_end = parser_offset (priv, start);
+
priv->state = GMIME_PARSER_STATE_COMPLETE;
*priv->rawptr = '\0';
priv->inptr = start;
@@ -1013,6 +1035,9 @@
content_start:
+ if (priv->headers_end == -1)
+ priv->headers_end = parser_offset (priv, start);
+
priv->state = GMIME_PARSER_STATE_CONTENT;
*priv->rawptr = '\0';
priv->inptr = start;
@@ -1076,12 +1101,16 @@
case GMIME_PARSER_STATE_ERROR:
break;
case GMIME_PARSER_STATE_INIT:
+ parser->priv->headers_begin = -1;
+ parser->priv->headers_end = -1;
if (priv->scan_from)
priv->state = GMIME_PARSER_STATE_FROM;
else
priv->state = GMIME_PARSER_STATE_HEADERS;
break;
case GMIME_PARSER_STATE_FROM:
+ parser->priv->headers_begin = -1;
+ parser->priv->headers_end = -1;
parser_step_from (parser);
break;
case GMIME_PARSER_STATE_HEADERS:
@@ -1735,3 +1764,45 @@
return priv->from_offset;
}
+
+
+/**
+ * g_mime_parser_get_headers_begin:
+ * @parser: a #GMimeParser context
+ *
+ * Gets the stream offset of the beginning of the headers of the most
+ * recently parsed message.
+ *
+ * Returns: the offset of the beginning of the headers of the most
+ * recently parsed message or %-1 on error.
+ *
+ * Since: 2.2.23
+ **/
+off_t
+g_mime_parser_get_headers_begin (GMimeParser *parser)
+{
+ g_return_val_if_fail (GMIME_IS_PARSER (parser), -1);
+
+ return parser->priv->headers_begin;
+}
+
+
+/**
+ * g_mime_parser_get_headers_end:
+ * @parser: a #GMimeParser context
+ *
+ * Gets the stream offset of the end of the headers of the most
+ * recently parsed message.
+ *
+ * Returns: the offset of the end of the headers of the most recently
+ * parsed message or %-1 on error.
+ *
+ * Since: 2.2.23
+ **/
+off_t
+g_mime_parser_get_headers_end (GMimeParser *parser)
+{
+ g_return_val_if_fail (GMIME_IS_PARSER (parser), -1);
+
+ return parser->priv->headers_end;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/gmime/gmime-parser.h
new/gmime-2.2.23/gmime/gmime-parser.h
--- old/gmime-2.2.22/gmime/gmime-parser.h 2008-05-24 02:38:26.000000000
+0200
+++ new/gmime-2.2.23/gmime/gmime-parser.h 2008-09-13 15:24:40.000000000
+0200
@@ -103,6 +103,9 @@
off_t g_mime_parser_get_from_offset (GMimeParser *parser);
+off_t g_mime_parser_get_headers_begin (GMimeParser *parser);
+off_t g_mime_parser_get_headers_end (GMimeParser *parser);
+
G_END_DECLS
#endif /* __GMIME_PARSER_H__ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/gmime.spec new/gmime-2.2.23/gmime.spec
--- old/gmime-2.2.22/gmime.spec 2008-07-20 01:58:54.000000000 +0200
+++ new/gmime-2.2.23/gmime.spec 2008-09-14 17:40:47.000000000 +0200
@@ -1,5 +1,5 @@
# Note that this is NOT a relocatable package
-%define ver 2.2.22
+%define ver 2.2.23
%define prefix /usr
%define enable_mono 0
%define enable_gtk_doc 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/README new/gmime-2.2.23/README
--- old/gmime-2.2.22/README 2008-07-15 05:07:39.000000000 +0200
+++ new/gmime-2.2.23/README 2008-09-14 17:28:25.000000000 +0200
@@ -1,4 +1,4 @@
- GMime, version 2.2.22
+ GMime, version 2.2.23
by Jeffrey Stedfast <fejj@xxxxxxxxx>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/gmime-2.2.22/tests/test-mbox.c
new/gmime-2.2.23/tests/test-mbox.c
--- old/gmime-2.2.22/tests/test-mbox.c 2008-05-24 02:38:27.000000000 +0200
+++ new/gmime-2.2.23/tests/test-mbox.c 2008-09-13 15:24:40.000000000 +0200
@@ -95,9 +95,9 @@
static void
test_parser (GMimeParser *parser, GMimeStream *mbox, GMimeStream *summary)
{
+ off_t headers_begin, headers_end, start, end;
GMimeMessage *message;
const char *exev;
- off_t start, end;
int nmsg = 0;
char *from;
@@ -108,7 +108,12 @@
end = g_mime_parser_tell (parser);
+ headers_begin = g_mime_parser_get_headers_begin (parser);
+ headers_end = g_mime_parser_get_headers_end (parser);
+
g_mime_stream_printf (summary, "message offsets: " OFF_T ", "
OFF_T "\n", start, end);
+ g_mime_stream_printf (summary, "header offsets: " OFF_T ", "
OFF_T "\n",
+ headers_begin, headers_end);
from = g_mime_parser_get_from (parser);
g_mime_stream_printf (summary, "%s\n", from);
++++++ gmime-gacutil-bootstrap.patch ++++++
--- mono/Makefile.am
+++ mono/Makefile.am
@@ -69,22 +69,22 @@
install-data-local:
@if test -n '$(TARGET)'; then
\
if test -n '$(DESTDIR)'; then
\
- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root
$(DESTDIR)$(prefix)/lib"; \
- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root
$(DESTDIR)$(prefix)/lib || exit 1; \
+ echo "$(GACUTIL) /bootstrap /i $(ASSEMBLY) /f /package
$(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib"; \
+ $(GACUTIL) /bootstrap /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP)
/root $(DESTDIR)$(prefix)/lib || exit 1; \
else
\
- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP)
/gacdir $(prefix)/lib"; \
- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir
$(prefix)/lib || exit 1; \
+ echo "$(GACUTIL) /bootstrap /i $(ASSEMBLY) /f /package
$(PACKAGE_SHARP) /gacdir $(prefix)/lib"; \
+ $(GACUTIL) /bootstrap /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP)
/gacdir $(prefix)/lib || exit 1; \
fi;
\
fi
uninstall-local:
@if test -n '$(TARGET)'; then
\
if test -n '$(DESTDIR)'; then
\
- echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP)
/root $(DESTDIR)$(prefix)/lib"; \
- $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root
$(DESTDIR)$(prefix)/lib || exit 1; \
+ echo "$(GACUTIL) /bootstrap /u $(ASSEMBLY_NAME) /package
$(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib"; \
+ $(GACUTIL) /bootstrap /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP)
/root $(DESTDIR)$(prefix)/lib || exit 1; \
else
\
- echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP)
/gacdir $(prefix)/lib"; \
- $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir
$(prefix)/lib || exit 1; \
+ echo "$(GACUTIL) /bootstrap /u $(ASSEMBLY_NAME) /package
$(PACKAGE_SHARP) /gacdir $(prefix)/lib"; \
+ $(GACUTIL) /bootstrap /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP)
/gacdir $(prefix)/lib || exit 1; \
fi;
\
fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |