Hello community,

here is the log from the commit of package libvmime_zarafa7 for 
openSUSE:Factory checked in at 2016-06-19 10:50:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvmime_zarafa7 (Old)
 and      /work/SRC/openSUSE:Factory/.libvmime_zarafa7.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libvmime_zarafa7"

Changes:
--------
--- /work/SRC/openSUSE:Factory/libvmime_zarafa7/libvmime_zarafa7.changes        
2015-10-02 09:23:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libvmime_zarafa7.new/libvmime_zarafa7.changes   
2016-06-19 10:50:16.000000000 +0200
@@ -2 +2 @@
-Mon Sep 28 13:42:17 UTC 2015 - [email protected]
+Fri Jun 17 06:26:14 UTC 2016 - [email protected]
@@ -4,7 +4,3 @@
-- Add 09-vmime-phf-stop-on-whitespace.diff,
-  10-vmime-backport-mailboxList-parser-29954e5.diff,
-  11-vmime-disable-rfc2231.diff,
-  12-vmime-ignore-multiple-colons-in-headers.diff,
-  13-vmime-ignore-newlines.diff, 14-vmime-remove-setlocale.diff,
-  15-vmime-wrongly-padded-B64-words.diff, 16-vmime-x-uuencode.diff,
-  17-vmime-avoid-unneeded-conversion.diff, vmime-all4debian.diff
+- Add 18-vmime-gcc6.diff to work with gcc6 changed parser behavior.
+  Rename libvmime-sotag.diff to libvmime-sotag.xdiff since it is
+  only used as a reference.

Old:
----
  libvmime-sotag.diff

New:
----
  18-vmime-gcc6.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libvmime_zarafa7.spec ++++++
--- /var/tmp/diff_new_pack.WZwFOz/_old  2016-06-19 10:50:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WZwFOz/_new  2016-06-19 10:50:18.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package libvmime_zarafa7
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,13 +28,12 @@
 #Svn-Clone:    https://vmime.svn.sourceforge.net/svnroot/vmime/trunk
 Source:         libvmime-%{version}sotag.tar.bz2
 Source2:        spice_source.sh
-Source3:        libvmime-%{version}.tar.bz2
-Source4:        readme.txt
-Source5:        build.collax
+Source3:        build.collax
+Source4:        manual-sotag.xdiff
+Source5:        vmime-all4debian.diff
 Source6:        debian.docs
-Source7:        libvmime-sotag.diff
-Source8:        manual-sotag.xdiff
-Source9:        vmime-all4debian.diff
+Source7:        readme.txt
+Source8:        libvmime-0.9.1+svn603.tar.bz2
 Patch1:         libvmime-nodatetime.diff
 Patch3:         vmime-0.8.1-charset-catch.diff
 Patch4:         vmime-0.9.2-header-value-on-next-line.diff
@@ -50,6 +49,7 @@
 Patch15:        15-vmime-wrongly-padded-B64-words.diff
 Patch16:        16-vmime-x-uuencode.diff
 Patch17:        17-vmime-avoid-unneeded-conversion.diff
+Patch18:        18-vmime-gcc6.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -115,25 +115,25 @@
 %prep
 %setup -qn vmime
 %patch -P 1 -P 3 -P 4 -P 5 -P 6 -P 7 -p1
-%patch -P 9 -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -p1
+%patch -P 9 -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -p1
 
 %build
-export CFLAGS="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1";
-export CXXFLAGS="$CFLAGS";
+export CFLAGS="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1"
+export CXXFLAGS="$CFLAGS"
 # sendmail's awesome location.
-export PATH="$PATH:/usr/sbin";
+export PATH="$PATH:/usr/sbin"
 %configure --disable-static --disable-sasl --disable-tls
-make %{?_smp_mflags};
+make %{?_smp_mflags} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
 
 %install
 b="%buildroot";
-make install DESTDIR="$b" docdir="%_docdir/%name";
-find "$b" -type f -name "*.la" -delete;
+make install DESTDIR="$b" docdir="%_docdir/%name"
+find "$b" -type f -name "*.la" -delete
 ln -sfv libvmime_zarafa7.so "$b/%_libdir/libvmime.so"
 mv -v "$b/%_libdir/pkgconfig"/{vmime_zarafa7.pc,vmime.pc}
 
 %check
-make check;
+make check
 
 %post -n %lname -p /sbin/ldconfig
 

++++++ 09-vmime-phf-stop-on-whitespace.diff ++++++
--- /var/tmp/diff_new_pack.WZwFOz/_old  2016-06-19 10:50:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WZwFOz/_new  2016-06-19 10:50:18.000000000 +0200
@@ -1,4 +1,5 @@
-For certain broken input mail which forgets to use the semicolon in e.g.
+Attempt to handle broken input mail which forgets to use the semicolon
+in e.g.
   Content-Type: text/plain charset=utf-8
 
 ---

++++++ 10-vmime-backport-mailboxList-parser-29954e5.diff ++++++
--- /var/tmp/diff_new_pack.WZwFOz/_old  2016-06-19 10:50:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WZwFOz/_new  2016-06-19 10:50:18.000000000 +0200
@@ -1,3 +1,5 @@
+[no description, what's it for?]
+
 ---
  src/mailboxList.cpp |   30 +++++++++++++++++++++++++++++-
  vmime/address.hpp   |    1 -

++++++ 11-vmime-disable-rfc2231.diff ++++++
--- /var/tmp/diff_new_pack.WZwFOz/_old  2016-06-19 10:50:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WZwFOz/_new  2016-06-19 10:50:18.000000000 +0200
@@ -1,3 +1,9 @@
+RFC 2231, that's multivalue à la..
+
+URL=foo;
+ URL*0=bar;
+ URL*1=bar;
+
 ---
  src/parameter.cpp |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

++++++ 12-vmime-ignore-multiple-colons-in-headers.diff ++++++
--- /var/tmp/diff_new_pack.WZwFOz/_old  2016-06-19 10:50:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WZwFOz/_new  2016-06-19 10:50:18.000000000 +0200
@@ -1,3 +1,8 @@
+From: nantko
+Date: 2013-12-02
+
+Don't just skip one colon, but any and all, if available.
+
 ---
  src/headerField.cpp |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
@@ -6,12 +11,11 @@
 ===================================================================
 --- vmime.orig/src/headerField.cpp
 +++ vmime/src/headerField.cpp
-@@ -132,7 +132,9 @@ ref <headerField> headerField::parseNext
+@@ -132,7 +132,8 @@ ref <headerField> headerField::parseNext
                                                  buffer.begin() + nameEnd);
  
                                // Skip ':' character
 -                              ++pos;
-+                              // Patch: don't just skip one colon, but any 
and all, if available. NS 2 December 2013
 +                              while ((pos < end) && (buffer[pos] == ':'))
 +                                  ++pos;
  

++++++ 16-vmime-x-uuencode.diff ++++++
--- /var/tmp/diff_new_pack.WZwFOz/_old  2016-06-19 10:50:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WZwFOz/_new  2016-06-19 10:50:18.000000000 +0200
@@ -1,3 +1,5 @@
+Support x-uuencode seen in the wild.
+
 ---
  src/constants.cpp                      |    1 +
  src/utility/encoder/encoderFactory.cpp |    1 +

++++++ 18-vmime-gcc6.diff ++++++
From: Jan Engelhardt
Date: 2016-03-26 21:22:38.079048272 +0100
References: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70417

GCC 6.0.0 20160324 [trunk revision 234449] changed something in its
parser and now chokes on a template-dependent specifier. (GCC6
appears to read "<X>" as a less-than X greater-than instead of a
template argument. Hence we need to explicitly state the "template"
keyword, similar to how "typename" is used.)

---
 vmime/base.hpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: vmime/vmime/base.hpp
===================================================================
--- vmime.orig/vmime/base.hpp
+++ vmime/vmime/base.hpp
@@ -252,7 +252,7 @@ namespace vmime
        template <class X, class Y>
        ref <X> dynamicCast(ref <Y> y)
        {
-               return y.dynamicCast <X>();
+               return y.template dynamicCast <X>();
        }
 
 } // vmime
++++++ debian.rules ++++++
--- /var/tmp/diff_new_pack.WZwFOz/_old  2016-06-19 10:50:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WZwFOz/_new  2016-06-19 10:50:18.000000000 +0200
@@ -1,12 +1,16 @@
 #!/usr/bin/make -f
 
 export DH_VERBOSE=1
+my_CFLAGS = -Wall -g -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1 -O2
 
 %:
        dh $@ --parallel
 
 override_dh_auto_configure:
-       dh_auto_configure -- CFLAGS="-Wall -g 
-DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1 -O2" --disable-static --disable-sasl 
--disable-tls
+       dh_auto_configure -- CFLAGS="${my_CFLAGS}" CXXFLAGS="${my_CFLAGS}" 
--disable-static --disable-sasl --disable-tls
+
+override_dh_auto_build:
+       make CFLAGS="${my_CFLAGS}" CXXFLAGS="${my_CFLAGS}"
 
 override_dh_auto_install:
        dh_auto_install

++++++ libvmime-zarafa7.dsc ++++++
--- /var/tmp/diff_new_pack.WZwFOz/_old  2016-06-19 10:50:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WZwFOz/_new  2016-06-19 10:50:18.000000000 +0200
@@ -2,7 +2,8 @@
 Source: libvmime-zarafa7
 Binary: libvmime-zarafa7-dev, libvmime-zarafa7-0
 Architecture: any
-Version: 0.9.1+svn603-1
+DEBTRANSFORM-RELEASE: 1
+Version: 0.9.1+svn603
 Maintainer: Zarafa <[email protected]>
 Standards-Version: 3.6.1
 Build-Depends: debhelper (>= 8), autotools-dev, g++ (>= 4),

++++++ vmime-0.8.1-charset-catch.diff ++++++
--- /var/tmp/diff_new_pack.WZwFOz/_old  2016-06-19 10:50:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WZwFOz/_new  2016-06-19 10:50:18.000000000 +0200
@@ -1,3 +1,5 @@
+???
+
 ---
  src/word.cpp |    6 ++++++
  1 file changed, 6 insertions(+)

++++++ vmime-0.9.2-header-value-on-next-line.diff ++++++
--- /var/tmp/diff_new_pack.WZwFOz/_old  2016-06-19 10:50:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WZwFOz/_new  2016-06-19 10:50:18.000000000 +0200
@@ -1,3 +1,6 @@
+
+[I think this is for handling "Content-Type:\n\ttext-plain"]
+
 ---
  src/headerField.cpp |   17 ++---------------
  1 file changed, 2 insertions(+), 15 deletions(-)

++++++ vmime-0.9.2-qp-in-buffers.diff ++++++
--- /var/tmp/diff_new_pack.WZwFOz/_old  2016-06-19 10:50:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WZwFOz/_new  2016-06-19 10:50:18.000000000 +0200
@@ -1,3 +1,6 @@
+
+If the string contains "=?", it needs to be escaped itself.
+(Turning it into something like =?xx?Q?=3D=3F?= eventually)
 ---
  src/wordEncoder.cpp |    7 +++++++
  1 file changed, 7 insertions(+)

++++++ vmime-all4debian.diff ++++++
--- /var/tmp/diff_new_pack.WZwFOz/_old  2016-06-19 10:50:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WZwFOz/_new  2016-06-19 10:50:18.000000000 +0200
@@ -1,3 +1,7 @@
+
+This is just a combination of all the patches to facilitate our
+Debian build. It should not be sent upstream.
+
 ---
  src/base.cpp                           |    2 
  src/constants.cpp                      |    1 


Reply via email to