commit f8fce8ddcdb5a5c97704890d8058224b98190139
Author: Jan Rękorajski <[email protected]>
Date: Sun Apr 5 08:52:34 2015 +0000
- disable dotnet on x32
- fix format string errors
- fix glib2 deprecation
- rel 4
format-security.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++++
gmime22.spec | 7 +++++--
2 files changed, 52 insertions(+), 2 deletions(-)
---
diff --git a/gmime22.spec b/gmime22.spec
index ab9e592..c60e2aa 100644
--- a/gmime22.spec
+++ b/gmime22.spec
@@ -2,7 +2,7 @@
# Conditional build:
%bcond_without dotnet # without .net support
-%ifarch i386
+%ifarch i386 x32
%undefine with_dotnet
%endif
@@ -11,13 +11,14 @@ Summary: GMIME library
Summary(pl.UTF-8): Biblioteka GMIME
Name: gmime22
Version: 2.2.27
-Release: 2
+Release: 4
License: LGPL v2.1+
Group: Libraries
Source0:
http://ftp.gnome.org/pub/GNOME/sources/gmime/2.2/gmime-%{version}.tar.bz2
# Source0-md5: 16d89accbe5c79ba22e3dfabf53e3b7e
Patch0: %{name}-link.patch
Patch1: %{name}-dont-delay-sign.patch
+Patch2: format-security.patch
URL: http://spruce.sourceforge.net/gmime/
BuildRequires: autoconf
BuildRequires: automake
@@ -116,6 +117,7 @@ Część dla programistów dotnet-gmime-sharp.
%setup -q -n gmime-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
touch config.rpath
@@ -123,6 +125,7 @@ touch config.rpath
%{__aclocal}
%{__autoconf}
%{__automake}
+CFLAGS="%{rpmcflags} -UG_DISABLE_DEPRECATED"
%configure \
--enable-largefile \
--%{?with_dotnet:enable}%{!?with_dotnet:disable}-mono \
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..7aaaa51
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,47 @@
+--- gmime-2.2.27/gmime/gmime-gpg-context.c~ 2011-03-07 18:09:21.000000000
+0000
++++ gmime-2.2.27/gmime/gmime-gpg-context.c 2015-04-05 08:50:06.913345576
+0000
+@@ -1504,7 +1504,7 @@
+ diagnostics = gpg_ctx_get_diagnostics (gpg);
+ errno = save;
+
+- g_set_error (err, GMIME_ERROR, errno, diagnostics);
++ g_set_error (err, GMIME_ERROR, errno, "%s", diagnostics);
+ gpg_ctx_free (gpg);
+
+ return -1;
+@@ -1678,7 +1678,7 @@
+ diagnostics = gpg_ctx_get_diagnostics (gpg);
+ errno = save;
+
+- g_set_error (err, GMIME_ERROR, errno, diagnostics);
++ g_set_error (err, GMIME_ERROR, errno, "%s", diagnostics);
+ gpg_ctx_free (gpg);
+
+ return -1;
+@@ -1728,7 +1728,7 @@
+ diagnostics = gpg_ctx_get_diagnostics (gpg);
+ errno = save;
+
+- g_set_error (err, GMIME_ERROR, errno, diagnostics);
++ g_set_error (err, GMIME_ERROR, errno, "%s", diagnostics);
+ gpg_ctx_free (gpg);
+
+ return -1;
+@@ -1775,7 +1775,7 @@
+ diagnostics = gpg_ctx_get_diagnostics (gpg);
+ errno = save;
+
+- g_set_error (err, GMIME_ERROR, errno, diagnostics);
++ g_set_error (err, GMIME_ERROR, errno, "%s", diagnostics);
+ gpg_ctx_free (gpg);
+
+ return -1;
+@@ -1828,7 +1828,7 @@
+ diagnostics = gpg_ctx_get_diagnostics (gpg);
+ errno = save;
+
+- g_set_error (err, GMIME_ERROR, errno, diagnostics);
++ g_set_error (err, GMIME_ERROR, errno, "%s", diagnostics);
+ gpg_ctx_free (gpg);
+
+ return -1;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gmime22.git/commitdiff/f8fce8ddcdb5a5c97704890d8058224b98190139
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
