- updated to 3.9

- updated link patch
- added cpp patch (update libmu_cpp wrapper)

diff --git a/link.patch b/link.patch
index a99cf443f030f14eb65ab1bc92df4aa084236a37..0f525f16092aa339e035ca6ba54d6628bb9e343d 100644 (file)
--- a/link.patch
+++ b/link.patch
@@ -28,14 +28,14 @@
        AC_CHECK_HEADERS(tcpd.h,
                         [status_tcpwrap=yes],
                         [status_tcpwrap=no])
---- mailutils-3.4/libmu_cpp/Makefile.am.orig   2017-06-08 15:08:20.000000000 +0200
-+++ mailutils-3.4/libmu_cpp/Makefile.am        2017-12-10 21:03:12.276619950 +0100
-@@ -42,6 +42,6 @@
+--- mailutils-3.9/libmu_cpp/Makefile.am.orig   2020-03-19 19:04:22.031808542 +0100
++++ mailutils-3.9/libmu_cpp/Makefile.am        2020-03-19 19:05:45.661355482 +0100
+@@ -41,6 +41,6 @@
   stream.cc\
   url.cc
  
--libmu_cpp_la_LIBADD = @MU_COMMON_LIBRARIES@
-+libmu_cpp_la_LIBADD = $(top_builddir)/libmailutils/libmailutils.la $(top_builddir)/libmu_sieve/libmu_sieve.la $(top_builddir)/libproto/pop/libmu_pop.la @MU_COMMON_LIBRARIES@
+-libmu_cpp_la_LIBADD = $(MU_COMMON_LIBRARIES)
++libmu_cpp_la_LIBADD = $(top_builddir)/libmailutils/libmailutils.la $(top_builddir)/libmu_sieve/libmu_sieve.la $(top_builddir)/libproto/pop/libmu_pop.la $(MU_COMMON_LIBRARIES)
  libmu_cpp_la_LDFLAGS = -rpath $(libdir)  -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
  
 --- mailutils-3.5/Makefile.am.orig     2018-07-28 17:24:19.000000000 +0200

diff --git a/mailutils-cpp.patch b/mailutils-cpp.patch
new file mode 100644 (file)
index 0000000..7d410aa
--- /dev/null
+++ b/mailutils-cpp.patch
@@ -0,0 +1,22 @@
+--- mailutils-3.9/libmu_cpp/body.cc.orig       2020-03-19 19:35:52.194901983 +0100
++++ mailutils-3.9/libmu_cpp/body.cc    2020-03-19 19:35:55.191552415 +0100
+@@ -66,7 +66,7 @@
+ {
+   mu_stream_t c_stream;
+ 
+-  int status = mu_body_get_stream (body, &c_stream);
++  int status = mu_body_get_streamref (body, &c_stream);
+   if (status)
+     throw Exception ("Body::get_stream", status);
+ 
+--- mailutils-3.9/libmu_cpp/message.cc.orig    2020-03-13 07:52:50.000000000 +0100
++++ mailutils-3.9/libmu_cpp/message.cc 2020-03-19 19:36:58.991206783 +0100
+@@ -118,7 +118,7 @@
+ {
+   mu_stream_t c_stream;
+ 
+-  int status = mu_message_get_stream (msg, &c_stream);
++  int status = mu_message_get_streamref (msg, &c_stream);
+   if (status)
+     throw Exception ("Message::get_stream", status);
+ 

diff --git a/mailutils.spec b/mailutils.spec
index 37936d920b0d5ed71c244c5bd58b5206493cad97..3ec65e03ee442e350a2f4d545e12935d458c9fd7 100644 (file)
--- a/mailutils.spec
+++ b/mailutils.spec
@@ -28,18 +28,19 @@
 Summary:       GNU mail utilities
 Summary(pl.UTF-8):     Narzędzia pocztowe z projektu GNU
 Name:          mailutils
-Version:       3.8
+Version:       3.9
 Release:       1
 License:       GPL v3+
 Group:         Applications/Mail
 Source0:       https://ftp.gnu.org/gnu/mailutils/%{name}-%{version}.tar.xz
-# Source0-md5: 283f803ea2057d50ecabf9fd8de9b776
+# Source0-md5: a357709d5f34b9acc6e16b7c10e77eaa
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-tinfo.patch
 Patch2:                link.patch
 Patch3:                %{name}-includes.patch
 Patch4:                %{name}-examples.patch
 Patch5:                %{name}-extern.patch
+Patch6:                %{name}-cpp.patch
 URL:           http://www.gnu.org/software/mailutils/mailutils.html
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
@@ -188,6 +189,7 @@ skrzynek pocztowych.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__rm} po/stamp-po