Accepting request 246371 from server:mail

- Update to new git snapshot
  30ea54f269efa673a1eb5bc07e71715b67607dbc
* No upstream changelog was provided
- Turn on SASL, TLS support
- Remove vmime-0.9.2-header-value-on-next-line.diff
  (no longer applies)

OBS-URL: https://build.opensuse.org/request/show/246371
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvmime?expand=0&rev=13
This commit is contained in:
Stephan Kulow 2014-09-10 15:02:10 +00:00 committed by Git OBS Bridge
commit d394c6e66f
7 changed files with 52 additions and 91 deletions

BIN
libvmime-0.9.1+git175.tar.xz (Stored with Git LFS)

Binary file not shown.

BIN
libvmime-0.9.1+git432.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -4,14 +4,14 @@ Date: Wed, 27 Mar 2013 17:52:26 +0100
Subject: [PATCH] src: avoid __DATE__ and __TIME__ Subject: [PATCH] src: avoid __DATE__ and __TIME__
--- ---
src/base.cpp | 2 +- src/vmime/base.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/base.cpp b/src/base.cpp Index: vmime/src/vmime/base.cpp
index d5f3e78..74bbba7 100644 ===================================================================
--- a/src/base.cpp --- vmime.orig/src/vmime/base.cpp
+++ b/src/base.cpp +++ vmime/src/vmime/base.cpp
@@ -75,7 +75,7 @@ const string libname() { return (VMIME_PACKAGE); } @@ -75,7 +75,7 @@ const string libname() { return (VMIME_P
* *
* @return library version * @return library version
*/ */
@ -20,6 +20,3 @@ index d5f3e78..74bbba7 100644
/** Return the library API version (eg: "6:1:6"). /** Return the library API version (eg: "6:1:6").
* *
--
1.8.1.4

View File

@ -8,23 +8,23 @@ soversions, hence no trust that it is correct now. Add some suffix
that is unique within our distro and distinguishes itself from that is unique within our distro and distinguishes itself from
upstream. upstream.
--- ---
CMakeLists.txt | 4 ++-- CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt Index: vmime/CMakeLists.txt
index 1c45d89..9760e13 100644 ===================================================================
--- a/CMakeLists.txt --- vmime.orig/CMakeLists.txt
+++ b/CMakeLists.txt +++ vmime/CMakeLists.txt
@@ -50,7 +50,7 @@ SET(VMIME_VERSION_MICRO 2) @@ -52,7 +52,7 @@ SET(VMIME_VERSION_MICRO 2)
# . Interfaces added/removed/changed: CURRENT++, REVISION=0 # . Interfaces added/removed/changed: CURRENT++, REVISION=0
# . Interfaces added (upward-compatible changes): AGE++ # . Interfaces added (upward-compatible changes): AGE++
# . Interfaces removed: AGE=0 # . Interfaces removed: AGE=0
-SET(VMIME_API_VERSION_CURRENT 0) -SET(VMIME_API_VERSION_CURRENT 0)
+SET(VMIME_API_VERSION_CURRENT 1) +SET(VMIME_API_VERSION_CURRENT 2)
SET(VMIME_API_VERSION_REVISION 0) SET(VMIME_API_VERSION_REVISION 0)
SET(VMIME_API_VERSION_AGE 0) SET(VMIME_API_VERSION_AGE 0)
@@ -63,7 +63,7 @@ SET(VMIME_API_VERSION ${VMIME_API_VERSION_CURRENT}.${VMIME_API_VERSION_REVISION} @@ -65,7 +65,7 @@ SET(VMIME_API_VERSION ${VMIME_API_VERSIO
# VMime Library # VMime Library
# Set base name # Set base name
@ -33,6 +33,3 @@ index 1c45d89..9760e13 100644
# Source files # Source files
FILE( FILE(
--
1.8.1.4

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Aug 25 05:27:53 UTC 2014 - dap@open.by, jengelh@inai.de
- Update to new git snapshot
30ea54f269efa673a1eb5bc07e71715b67607dbc
* No upstream changelog was provided
- Turn on SASL, TLS support
- Remove vmime-0.9.2-header-value-on-next-line.diff
(no longer applies)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 19 13:53:29 UTC 2013 - jengelh@inai.de Thu Dec 19 13:53:29 UTC 2013 - jengelh@inai.de

View File

@ -17,7 +17,7 @@
Name: libvmime Name: libvmime
%define lname libvmime-0_9_2-1 %define lname libvmime-0_9_2-2
Summary: Library for working with MIME messages and IMAP/POP/SMTP Summary: Library for working with MIME messages and IMAP/POP/SMTP
License: GPL-3.0+ License: GPL-3.0+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -25,24 +25,28 @@ Version: 0.9.2
Release: 0 Release: 0
Url: http://vmime.org/ Url: http://vmime.org/
#Svn-Clone: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk #Git-Clone: git://github.com/kisli/vmime
#Git-Web: https://github.com/kisli/vmime
#Snapshot: v0.9.1-432-g674c369
#Source: http://downloads.sf.net/vmime/%name-%version.tar.bz2 #Source: http://downloads.sf.net/vmime/%name-%version.tar.bz2
Source: %name-0.9.1+git175.tar.xz Source: %name-0.9.1+git432.tar.xz
Patch1: libvmime-nodatetime.diff Patch1: libvmime-nodatetime.diff
Patch2: libvmime-sotag.diff Patch2: libvmime-sotag.diff
Patch3: vmime-0.9.2-header-value-on-next-line.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ImageMagick BuildRequires: ImageMagick
%if 0%{?suse_version} < 1310
BuildRequires: boost-devel
%endif
BuildRequires: cmake >= 2.8.3 BuildRequires: cmake >= 2.8.3
BuildRequires: doxygen
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: inkscape BuildRequires: inkscape
BuildRequires: libgnutls-devel
BuildRequires: libgsasl-devel BuildRequires: libgsasl-devel
BuildRequires: libopenssl-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: postfix BuildRequires: postfix
%if 0%{?suse_version} >= 1130 && "%_repository" != "devel:libraries:c_c++" %if 0%{?suse_version} >= 1130
# Cannot realistically build because of all the new libs this prj has
# Nothing provides libzzip-0-13 required by texlive
# Nothing provides libMagick++.so.5 required by Inkscape
%define with_pdf 1 %define with_pdf 1
%if 0%{?suse_version} < 1300 %if 0%{?suse_version} < 1300
BuildRequires: texlive-bin-latex BuildRequires: texlive-bin-latex
@ -57,16 +61,6 @@ BuildRequires: tex(ucs.sty)
%endif %endif
%endif %endif
BuildRequires: xz BuildRequires: xz
%if 0%{?suse_version} >= 1100
BuildRequires: libgnutls-devel
%else
%if 0%{?suse_version}
BuildRequires: gnutls-devel
%endif
%endif
%if 0%{?fedora_version} || 0%{?redhat_version} || 0%{?centos_version}
BuildRequires: gnutls-devel
%endif
%description %description
VMime is a powerful C++ class library for working with MIME messages VMime is a powerful C++ class library for working with MIME messages
@ -106,7 +100,7 @@ complete mail client.
%prep %prep
%setup -qn vmime %setup -qn vmime
%patch -P 1 -P 2 -P 3 -p1 %patch -P 1 -P 2 -p1
%build %build
%if 0%{?with_pdf} %if 0%{?with_pdf}
@ -119,10 +113,19 @@ cf="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1"
# sendmail's awesome location. # sendmail's awesome location.
export PATH="$PATH:/usr/sbin"; export PATH="$PATH:/usr/sbin";
cmake . \ cmake . \
-DVMIME_BUILD_SAMPLES:BOOL=OFF \
-DVMIME_HAVE_SASL_SUPPORT:BOOL=ON \
-DVMIME_HAVE_TLS_SUPPORT:BOOL=ON \
-DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \ -DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \
-DCMAKE_RELEASE_TYPE:STRING="Release" \ -DCMAKE_RELEASE_TYPE:STRING="RelWithDebInfo" \
-DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \
-DCMAKE_C_FLAGS:STRING="$cf" -DCMAKE_CXX_FLAGS:STRING="$cf" -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g" \
%if 0%{?suse_version} >= 1310
-DCMAKE_CXX_FLAGS:STRING="$cf -std=gnu++11" \
%else
-DCMAKE_CXX_FLAGS:STRING="$cf" \
%endif
-DCMAKE_C_FLAGS:STRING="$cf"
make %{?_smp_mflags} VERBOSE=1 make %{?_smp_mflags} VERBOSE=1
%install %install
@ -140,7 +143,7 @@ find "$b" -type f -name "*.la" -delete;
%files -n %lname %files -n %lname
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/%name-%version.so.1* %_libdir/%name-%version.so.2*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)

View File

@ -1,46 +0,0 @@
---
src/headerField.cpp | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/src/headerField.cpp b/src/headerField.cpp
index 1d33dac..ec575dc 100644
--- a/src/headerField.cpp
+++ b/src/headerField.cpp
@@ -160,16 +160,14 @@ ref <headerField> headerField::parseNext
{
contentsEnd = pos;
pos += 2;
- break;
}
else if (c == '\n')
{
contentsEnd = pos;
++pos;
- break;
}
- while (pos < end)
+ else while (pos < end)
{
c = buffer[pos];
@@ -195,18 +193,6 @@ ref <headerField> headerField::parseNext
{
// 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
{
--