Attachment 909308 Details for Bug 1037369 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-Werror-format-security-1037369-110703.patch (text/plain), 3.97 KB, created by Yaakov Selkowitz on 2014-06-16 22:43:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-16 22:43:54 UTC

Size: 3.97 KB

patch

obsolete

>From c992976dc7b91e26fbde43ec255d9e2a1a34948c Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Mon, 16 Jun 2014 17:42:17 -0500
>Subject: [PATCH] Fix FTBFS with -Werror=format-security (#1037369, #1107039)
>
>---
> unpaper-0.3-format-security.patch | 55 +++++++++++++++++++++++++++++++++++++++
> unpaper.spec                      |  7 ++++-
> 2 files changed, 61 insertions(+), 1 deletion(-)
> create mode 100644 unpaper-0.3-format-security.patch
>
>diff --git a/unpaper-0.3-format-security.patch b/unpaper-0.3-format-security.patch
>new file mode 100644
>index 0000000..40b01f2
>--- /dev/null
>+++ b/unpaper-0.3-format-security.patch
>@@ -0,0 +1,55 @@
>+diff --git a/src/unpaper.c b/src/unpaper.c
>+index f967d92..53f55b0 100644
>+--- a/src/unpaper.c
>++++ b/src/unpaper.c
>+@@ -1,9 +1,9 @@
>+ /* ---------------------------------------------------------------------------
>+ unpaper - written by Jens Gulden 2005-2007                                  */
>+ 
>+-const char* VERSION = "0.3";
>++const char VERSION[] = "0.3";
>+ 
>+-const char* README = 
>++const char README[] = 
>+ "unpaper is a post-processing tool for scanned sheets of paper, especially for\n"
>+ "book pages that have been scanned from previously created photocopies.\n"
>+ "The main purpose is to make scanned book pages better readable on screen\n"
>+@@ -29,7 +29,7 @@ const char* README =
>+ "Conversion to PDF can e.g. be achieved with the Linux tools pgm2tiff, tiffcp\n"
>+ "and tiff2pdf.";
>+ 
>+-const char* COMPILE = 
>++const char COMPILE[] = 
>+ "gcc -D TIMESTAMP=\"<yyyy-MM-dd HH:mm:ss>\" -lm -O3 -funroll-all-loops -fomit-frame-pointer -ftree-vectorize -o unpaper unpaper.c\n";
>+ 
>+ /* ------------------------------------------------------------------------ */
>+@@ -46,17 +46,17 @@ const char* BUILD = TIMESTAMP;
>+ const char* BUILD = NULL;
>+ #endif
>+ 
>+-const char* WELCOME = 
>++const char WELCOME[] = 
>+ "unpaper %s - written by Jens Gulden 2005-2007.\n"
>+ "Licensed under the GNU General Public License, this comes with no warranty.\n";
>+               
>+-const char* USAGE = 
>++const char USAGE[] = 
>+ "Usage: unpaper [options] <input-file(s)> <output-file(s)>\n\n"
>+ "Filenames may contain a formatting placeholder starting with '%%' to insert a\n"
>+ "page counter for multi-page processing. E.g.: 'scan%%03d.pbm' to process files\n"
>+ "scan001.pbm, scan002.pbm, scan003.pbm etc.\n";
>+ 
>+-const char* OPTIONS = 
>++const char OPTIONS[] = 
>+ "-l --layout single                   Set default layout options for a sheet:\n"
>+ "           |double                   'single': One page per sheet.\n"
>+ "           |none                     'double': Two pages per sheet, landscape\n"
>+@@ -558,7 +558,7 @@ const char* OPTIONS =
>+ //--help-compile                      Undocumented.
>+ 
>+ 
>+-const char* HELP = 
>++const char HELP[] = 
>+ "Run 'unpaper --help' for usage information.\n";
>+ 
>+ 
>diff --git a/unpaper.spec b/unpaper.spec
>index c72bdb3..a1b3458 100644
>--- a/unpaper.spec
>+++ b/unpaper.spec
>@@ -1,6 +1,6 @@
> Name:           unpaper
> Version:        0.3
>-Release:        10%{?dist}
>+Release:        11%{?dist}
> Summary:        Post-processing of scanned and photocopied book pages
> 
> Group:          Applications/Publishing
>@@ -8,6 +8,7 @@ Group:          Applications/Publishing
> License:        GPL+
> URL:            http://unpaper.berlios.de
> Source0:        http://download.berlios.de/%{name}/%{name}-%{version}.tar.gz
>+Patch0:         unpaper-0.3-format-security.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> 
>@@ -27,6 +28,7 @@ the correct angle. This process is called "deskewing".
> 
> %prep
> %setup -q
>+%patch0 -p1
> 
> 
> %build
>@@ -50,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
> %doc doc CHANGELOG LICENSE README
> 
> %changelog
>+* Mon Jun 16 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.3-11
>+- Fix FTBFS with -Werror=format-security (#1037369, #1107039)
>+
> * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-10
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1037369: 909308