From 57ced04c780a1a1a59561f90917b6b469fdc8d9e0644512330adff143d8a4c3e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 24 Oct 2016 13:30:35 +0000 Subject: [PATCH 1/5] 047cacb1dba516ca902b36a290f2b81555658c1e [0.9.2~g500] OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=6 --- libvmime.changes | 2 +- libvmime.spec | 4 ++-- vmime-0.9.2~g490.tar.xz | 3 --- vmime-0.9.2~g500.tar.xz | 3 +++ 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 vmime-0.9.2~g490.tar.xz create mode 100644 vmime-0.9.2~g500.tar.xz diff --git a/libvmime.changes b/libvmime.changes index 327eb69..7ae21fb 100644 --- a/libvmime.changes +++ b/libvmime.changes @@ -2,7 +2,7 @@ Wed Jun 22 17:05:17 UTC 2016 - jengelh@inai.de - Update to new git snapshot - 4d1a6ad2f267e3b83f7c04122af8d8e7ee9a2113 [0.9.2~g490] + 047cacb1dba516ca902b36a290f2b81555658c1e [0.9.2~g500] * handle "x-uuencode" type * Skip word on unexpected error when fixing broken words. * XOAUTH2 auth mechanism support diff --git a/libvmime.spec b/libvmime.spec index c3c1fac..2c59dc7 100644 --- a/libvmime.spec +++ b/libvmime.spec @@ -16,14 +16,14 @@ # -%define version_unconverted 0.9.2~g490 +%define version_unconverted 0.9.2~g500 Name: libvmime %define lname libvmime-suse3 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~g490 +Version: 0.9.2~g500 Release: 0 Url: http://vmime.org/ diff --git a/vmime-0.9.2~g490.tar.xz b/vmime-0.9.2~g490.tar.xz deleted file mode 100644 index c4533af..0000000 --- a/vmime-0.9.2~g490.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b65eefc5214938a01c9a4082060b3b8251a8e9a64b538cb996ac4a92edf5515 -size 391000 diff --git a/vmime-0.9.2~g500.tar.xz b/vmime-0.9.2~g500.tar.xz new file mode 100644 index 0000000..08d8fcf --- /dev/null +++ b/vmime-0.9.2~g500.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df76ff3097ac2bdee5c7d5549e950a3f709c19135b79c173b3a0f1ef948c8860 +size 390976 From 3276254e0c4416d2d20c1af291e623135563302ea77253e7b77d20b833381438 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 24 Oct 2016 13:38:51 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=7 --- libvmime.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libvmime.spec b/libvmime.spec index 2c59dc7..817f3b7 100644 --- a/libvmime.spec +++ b/libvmime.spec @@ -41,7 +41,9 @@ BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: inkscape BuildRequires: libgnutls-devel +%if 0%{?is_opensuse} BuildRequires: libgsasl-devel +%endif BuildRequires: libopenssl-devel BuildRequires: pkg-config BuildRequires: postfix @@ -113,7 +115,9 @@ cf="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1" export PATH="$PATH:/usr/sbin" cmake . \ -DVMIME_BUILD_SAMPLES:BOOL=OFF \ +%if 0%{?is_opensuse} -DVMIME_HAVE_SASL_SUPPORT:BOOL=ON \ +%endif -DVMIME_HAVE_TLS_SUPPORT:BOOL=ON \ -DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \ -DCMAKE_RELEASE_TYPE:STRING="RelWithDebInfo" \ From 9e1e7648d5596ea4bd2ca9adab6f653039ca27c08a2757d732f4689484f3d284 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 24 Oct 2016 23:00:10 +0000 Subject: [PATCH 3/5] drop postfix require OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=8 --- libvmime.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libvmime.spec b/libvmime.spec index 817f3b7..70cea46 100644 --- a/libvmime.spec +++ b/libvmime.spec @@ -46,7 +46,6 @@ BuildRequires: libgsasl-devel %endif BuildRequires: libopenssl-devel BuildRequires: pkg-config -BuildRequires: postfix %if 0%{?suse_version} >= 1130 %define with_pdf 1 %if 0%{?suse_version} < 1300 @@ -111,9 +110,8 @@ popd %endif cf="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1" -# sendmail's awesome location. -export PATH="$PATH:/usr/sbin" cmake . \ + -DVMIME_SENDMAIL_PATH:STRING="%_sbindir/sendmail" \ -DVMIME_BUILD_SAMPLES:BOOL=OFF \ %if 0%{?is_opensuse} -DVMIME_HAVE_SASL_SUPPORT:BOOL=ON \ From 6f17748848c67fd93ee3c3228e176bbaeebc318d5c8160cd2bd718eb0a095e4e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 30 Oct 2016 18:36:53 +0000 Subject: [PATCH 4/5] - Add dont-fixup.diff OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=9 --- dont-fixup.diff | 20 ++++++++++++++++++++ libvmime.changes | 5 +++++ libvmime.spec | 5 +++-- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 dont-fixup.diff diff --git a/dont-fixup.diff b/dont-fixup.diff new file mode 100644 index 0000000..11d2b2d --- /dev/null +++ b/dont-fixup.diff @@ -0,0 +1,20 @@ +References: https://github.com/kisli/vmime/issues/149 + +libkcinetmapi does a much better fixup on its own. +--- + src/vmime/text.cpp | 2 -- + 1 file changed, 2 deletions(-) + +Index: vmime-0.9.2.g500/src/vmime/text.cpp +=================================================================== +--- vmime-0.9.2.g500.orig/src/vmime/text.cpp ++++ vmime-0.9.2.g500/src/vmime/text.cpp +@@ -401,8 +401,6 @@ text* text::decodeAndUnfold(const parsin + out->removeAllWords(); + + std::vector > words = word::parseMultiple(ctx, in, 0, in.length(), NULL); +- fixBrokenWords(words); +- + copy_vector(words, out->m_words); + + return (out); diff --git a/libvmime.changes b/libvmime.changes index 7ae21fb..50f1fb4 100644 --- a/libvmime.changes +++ b/libvmime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 30 18:36:29 UTC 2016 - jengelh@inai.de + +- Add dont-fixup.diff + ------------------------------------------------------------------- Wed Jun 22 17:05:17 UTC 2016 - jengelh@inai.de diff --git a/libvmime.spec b/libvmime.spec index 70cea46..3e489ec 100644 --- a/libvmime.spec +++ b/libvmime.spec @@ -31,6 +31,7 @@ Url: http://vmime.org/ Source: vmime-%version.tar.xz Patch1: libvmime-nodatetime.diff Patch2: libvmime-sotag.diff +Patch3: dont-fixup.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ImageMagick %if 0%{?suse_version} < 1310 @@ -100,7 +101,7 @@ complete mail client. %prep %setup -qn vmime-%version -%patch -P 1 -P 2 -p1 +%patch -P 1 -P 2 -P 3 -p1 %build %if 0%{?with_pdf} @@ -120,7 +121,7 @@ cmake . \ -DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \ -DCMAKE_RELEASE_TYPE:STRING="RelWithDebInfo" \ -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ - -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g" \ + -DCMAKE_CXX_FLAGS_DEBUG:STRING="-ggdb3 -O0" \ %if 0%{?suse_version} >= 1310 -DCMAKE_CXX_FLAGS:STRING="$cf -std=gnu++11" \ %else From 159115bb425d1762f5c759677bee5cbe3a8e7e5ea13087ada36811d867f1a872 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 30 Oct 2016 19:18:26 +0000 Subject: [PATCH 5/5] - Update to new git snapshot 047cacb1dba516ca902b36a290f2b81555658c1e [0.9.2~g500] * Skip multiple (bogus) colons after header field name 4d1a6ad2f267e3b83f7c04122af8d8e7ee9a2113 [0.9.2~g490] OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=10 --- libvmime.changes | 5 ++++- libvmime.spec | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libvmime.changes b/libvmime.changes index 50f1fb4..8fb6310 100644 --- a/libvmime.changes +++ b/libvmime.changes @@ -1,13 +1,16 @@ ------------------------------------------------------------------- Sun Oct 30 18:36:29 UTC 2016 - jengelh@inai.de +- Update to new git snapshot + 047cacb1dba516ca902b36a290f2b81555658c1e [0.9.2~g500] +* Skip multiple (bogus) colons after header field name - Add dont-fixup.diff ------------------------------------------------------------------- Wed Jun 22 17:05:17 UTC 2016 - jengelh@inai.de - Update to new git snapshot - 047cacb1dba516ca902b36a290f2b81555658c1e [0.9.2~g500] + 4d1a6ad2f267e3b83f7c04122af8d8e7ee9a2113 [0.9.2~g490] * handle "x-uuencode" type * Skip word on unexpected error when fixing broken words. * XOAUTH2 auth mechanism support diff --git a/libvmime.spec b/libvmime.spec index 3e489ec..c08bc42 100644 --- a/libvmime.spec +++ b/libvmime.spec @@ -121,7 +121,7 @@ cmake . \ -DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \ -DCMAKE_RELEASE_TYPE:STRING="RelWithDebInfo" \ -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ - -DCMAKE_CXX_FLAGS_DEBUG:STRING="-ggdb3 -O0" \ + -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g" \ %if 0%{?suse_version} >= 1310 -DCMAKE_CXX_FLAGS:STRING="$cf -std=gnu++11" \ %else