Attachment 908703 Details for Bug 1037361 – Patch for rawhide

[patch] Patch for rawhide

tnef-Fix-FTBFS-with-Werror-format-security-1037361-110745.patch (text/plain), 2.64 KB, created by Yaakov Selkowitz on 2014-06-13 20:34:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-13 20:34:58 UTC

Size: 2.64 KB

patch

obsolete

>From 0bbe0d516ef3bad7e02e5740314de7766950941b Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Fri, 13 Jun 2014 15:33:43 -0500
>Subject: [PATCH] Fix FTBFS with -Werror=format-security (#1037361, #1107453)
>
>---
> tnef-1.4.9-format-security.patch | 23 +++++++++++++++++++++++
> tnef.spec                        |  7 ++++++-
> 2 files changed, 29 insertions(+), 1 deletion(-)
> create mode 100644 tnef-1.4.9-format-security.patch
>
>diff --git a/tnef-1.4.9-format-security.patch b/tnef-1.4.9-format-security.patch
>new file mode 100644
>index 0000000..783d3ef
>--- /dev/null
>+++ b/tnef-1.4.9-format-security.patch
>@@ -0,0 +1,23 @@
>+diff --git a/src/main.c b/src/main.c
>+index 5059309..b1d8b0c 100644
>+--- a/src/main.c
>++++ b/src/main.c
>+@@ -51,15 +51,15 @@
>+ 
>+ /* COPYRIGHTS & NO_WARRANTY -- defined to make code below a little nicer to
>+    read */
>+-static const char* COPYRIGHTS = \
>++static const char COPYRIGHTS[] = \
>+ "Copyright (C) 1999-2011 by Mark Simpson\n"
>+ "Copyright (C) 1997 by Thomas Boll (original code)";
>+-static const char* NO_WARRANTY = \
>++static const char NO_WARRANTY[] = \
>+ "%s comes with ABSOLUTELY NO WARRANTY.\n"
>+ "You may redistribute copies of %s under the terms of the GNU General\n"
>+ "Public License.  For more information about these matters, see the file\n"
>+ "named COPYING.";
>+-static const char* USAGE = \
>++static const char USAGE[] = \
>+ "-f FILE,--file=FILE     \tUse FILE as input ('-' == stdin)\n"
>+ "-C DIR, --directory=DIR \tUnpack files into DIR\n"
>+ "-x SIZE --maxsize=SIZE  \tLimit maximum size of extracted archive (bytes)\n"
>diff --git a/tnef.spec b/tnef.spec
>index ef1683f..f22afdc 100644
>--- a/tnef.spec
>+++ b/tnef.spec
>@@ -1,6 +1,6 @@
> Name:      tnef
> Version:   1.4.9
>-Release:   4%{?dist}
>+Release:   5%{?dist}
> Summary:   Extract files from email attachments like WINMAIL.DAT
> 
> Group:     Applications/Archiving
>@@ -14,6 +14,7 @@ Source1:   vnd.ms-tnef.desktop
> Source2:   tnef-extract.desktop
> Source3:   tnefextract.desktop
> Source4:   tnef.sh
>+Patch0:    tnef-1.4.9-format-security.patch
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires: kde-filesystem
>@@ -56,6 +57,7 @@ Provides a right-click extract menu item for Dolphin to extract TNEF files.
> 
> %prep
> %setup -q
>+%patch0 -p1
> 
> 
> %build
>@@ -127,6 +129,9 @@ make check DESTDIR=%{buildroot}
> 
> 
> %changelog
>+* Fri Jun 13 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1.4.9-5
>+- Fix FTBFS with -Werror=format-security (#1037361, #1107453)
>+
> * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.9-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1037361: 908703