Hello community, here is the log from the commit of package libvmime for openSUSE:Factory checked in at 2012-03-22 12:34:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvmime (Old) and /work/SRC/openSUSE:Factory/.libvmime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvmime", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libvmime/libvmime.changes 2012-03-06 13:38:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvmime.new/libvmime.changes 2012-03-22 12:35:49.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 16 12:33:11 UTC 2012 - jeng...@medozas.de + +- Update to new SVN snapshot rev 603 (ZCP 7.0.6 dependency) +* Set Diffie-Hellman prime size (bug SF#3434852) + +------------------------------------------------------------------- Old: ---- libvmime-0.9.1+.tar.bz2 libvmime-libgnutls28.diff New: ---- libvmime-0.9.1+svn603.tar.bz2 vmime-0.9.2-header-value-on-next-line.diff vmime-0.9.2-qp-in-buffers.diff vmime-mixed-qp-in-parameter.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvmime.spec ++++++ --- /var/tmp/diff_new_pack.v67J9C/_old 2012-03-22 12:36:08.000000000 +0100 +++ /var/tmp/diff_new_pack.v67J9C/_new 2012-03-22 12:36:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libvmime # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,38 +15,51 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libvmime %define lname libvmime-0_9_2-0 Summary: Library for working with MIME messages and IMAP/POP/SMTP +License: GPL-3.0+ +Group: Development/Libraries/C and C++ Version: 0.9.2 Release: 0 -Group: Development/Libraries/C and C++ -URL: http://vmime.sf.net/ -License: GPL-3.0+ +Url: http://vmime.sf.net/ +#Svn-Clone: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk #Source: http://downloads.sf.net/vmime/%name-%version.tar.bz2 -Source: %name-0.9.1+.tar.bz2 +Source: %name-0.9.1+svn603.tar.bz2 Source2: spice_source.sh -#Svn-Clone: https://vmime.svn.sourceforge.net/svnroot/vmime Patch1: libvmime-nodatetime.diff # PATCH-WORKAROUND-UPSTREAM libvmime-sotag.diff Patch2: libvmime-sotag.diff # PATCH-FEATURE-UPSTREAM vmime-0.8.1-charset-catch.diff x -- ZCP team will deal with this in time Patch3: vmime-0.8.1-charset-catch.diff -# PATCH-FIX-UPSTREAM libvmime-libgnutls28.diff -Patch4: libvmime-libgnutls28.diff -BuildRoot: %_tmppath/%name-%version-build -BuildRequires: autoconf, automake, gcc-c++, libgsasl-devel, libtool -BuildRequires: libgcrypt-devel, pkgconfig, postfix, scons, xz +Patch4: vmime-0.9.2-header-value-on-next-line.diff +Patch5: vmime-mixed-qp-in-parameter.diff +Patch6: vmime-0.9.2-qp-in-buffers.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc-c++ +BuildRequires: libgcrypt-devel +BuildRequires: libgsasl-devel +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: postfix +BuildRequires: scons +BuildRequires: xz %if 0%{?suse_version} >= 1100 -BuildRequires: gettext-tools, libgnutls-devel, libselinux-devel +BuildRequires: gettext-tools +BuildRequires: libgnutls-devel +BuildRequires: libselinux-devel %else %if 0%{?suse_version} > 0 BuildRequires: gnutls-devel %endif %endif %if 0%{?fedora_version} > 0 -BuildRequires: gettext, gnutls-devel +BuildRequires: gettext +BuildRequires: gnutls-devel %endif %description @@ -87,7 +100,7 @@ %prep %setup -qn vmime -%patch -P 1 -P 2 -P 3 -P 4 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1 %build # sendmail's awesome location. ++++++ vmime-0.9.2-header-value-on-next-line.diff ++++++ diff -Nurb libvmime-0.9.2.orig/src/headerField.cpp libvmime-0.9.2.patched/src/headerField.cpp --- libvmime-0.9.2.orig/src/headerField.cpp 2010-05-20 05:33:45.000000000 -0700 +++ libvmime-0.9.2.patched/src/headerField.cpp 2011-08-29 12:10:08.438497914 -0700 @@ -157,14 +157,12 @@ { contentsEnd = pos; pos += 2; - break; } else if (c == '\n') { contentsEnd = pos; ++pos; - break; - } + } else { while (pos < end) { @@ -186,24 +184,13 @@ ++pos; } + } // Handle the case of folded lines if (buffer[pos] == ' ' || buffer[pos] == '\t') { // This is a folding white-space: we keep it as is and // we continue with contents parsing... - - // If the line contains only space characters, we assume it is - // the end of the headers. This is not strictly standard-compliant - // but, hey, we can't fail when parsing some malformed mails... - while (pos < end && (buffer[pos] == ' ' || buffer[pos] == '\t')) - ++pos; - - if ((pos < end && buffer[pos] == '\n') || - (pos + 1 < end && buffer[pos] == '\r' && buffer[pos + 1] == '\n')) - { - break; - } } else { ++++++ vmime-0.9.2-qp-in-buffers.diff ++++++ --- svn/src/wordEncoder.cpp (revision 603) +++ svn/src/wordEncoder.cpp (working copy) @@ -239,6 +239,13 @@ if (buffer.find_first_of("\n\r") != string::npos) return true; + // If the string contains a QP string, we need to encode this. + // Not a 100% check, but we'd only get more encoded strings. + std::string::size_type pos = buffer.find("=?"); + std::string::size_type end = buffer.find("?="); + if (pos != string::npos && end != string::npos && end > pos) + return true; + return false; } ++++++ vmime-mixed-qp-in-parameter.diff ++++++ Index: svn/src/parameter.cpp =================================================================== --- svn/src/parameter.cpp (revision 597) +++ svn/src/parameter.cpp (working copy) @@ -239,8 +239,21 @@ { value << t.getWholeBuffer(); - if (!foundCharsetChunk) - ch = t.getWordAt(0)->getCharset(); + if (!foundCharsetChunk) { + // this is still wrong. each word can have it's + // own charset, and can be mixed (eg. iso-8859-1 + // and iso-2022-jp), but very unlikely. + // real fix is to have parameters store a + // vmime::text in stead of a vmime::word in + // m_value. but that changes the interface + for (size_t i = 0; i < t.getWordCount(); i++) { + if (t.getWordAt(i)->getCharset() != ch && ch == charsets::US_ASCII) { + ch = t.getWordAt(i)->getCharset(); + break; + } + } + + } } } } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
