Attachment 909275 Details for Bug 1106050 – Patch for rawhide

[patch] Patch for rawhide

0001-Fixes-for-gcc-4.8-Werror-format-security-914140-9921.patch (text/plain), 3.89 KB, created by Yaakov Selkowitz on 2014-06-16 21:03:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-16 21:03:52 UTC

Size: 3.89 KB

patch

obsolete

>From d44baef6de0d743fe5c640e9ddfc0407953fe4ac Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Mon, 16 Jun 2014 16:03:06 -0500
>Subject: [PATCH] Fixes for gcc-4.8, -Werror=format-security (#914140, #992107,
> #1106050)
>
>---
> libopensync-plugin-opie-format-security.patch | 13 +++++++++++++
> libopensync-plugin-opie-gcc48.patch           | 27 +++++++++++++++++++++++++++
> libopensync-plugin-opie.spec                  | 10 +++++++++-
> 3 files changed, 49 insertions(+), 1 deletion(-)
> create mode 100644 libopensync-plugin-opie-format-security.patch
> create mode 100644 libopensync-plugin-opie-gcc48.patch
>
>diff --git a/libopensync-plugin-opie-format-security.patch b/libopensync-plugin-opie-format-security.patch
>new file mode 100644
>index 0000000..bbad967
>--- /dev/null
>+++ b/libopensync-plugin-opie-format-security.patch
>@@ -0,0 +1,13 @@
>+diff --git a/src/opie_debug.h b/src/opie_debug.h
>+index 364c06b..292fedb 100644
>+--- a/src/opie_debug.h
>++++ b/src/opie_debug.h
>+@@ -32,7 +32,7 @@
>+ #include <glib.h>
>+ 
>+ #ifndef OPIE_DEBUG
>+-#define OPIE_DEBUG(x) (printf(x))
>++#define OPIE_DEBUG(x) (printf("%s", x))
>+ #endif
>+ 
>+ /* Use the OPIE_PRINT macro instead of printf.
>diff --git a/libopensync-plugin-opie-gcc48.patch b/libopensync-plugin-opie-gcc48.patch
>new file mode 100644
>index 0000000..29d3e8f
>--- /dev/null
>+++ b/libopensync-plugin-opie-gcc48.patch
>@@ -0,0 +1,27 @@
>+diff --git a/src/opie_qcop.c b/src/opie_qcop.c
>+index 5090a18..a3ac162 100644
>+--- a/src/opie_qcop.c
>++++ b/src/opie_qcop.c
>+@@ -541,11 +541,11 @@ void monitor_thread_main(qcop_monitor_data* data)
>+ 	
>+ static const char *base64_alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
>+ 
>+-static void opie_base64_init(char *rank)
>++static void opie_base64_init(char *rank, size_t bufsize)
>+ {
>+ 	int i;
>+ 
>+-	memset(rank, 0xff, sizeof(rank));
>++	memset(rank, 0xff, bufsize);
>+ 	for (i=0;i<64;i++) {
>+ 		rank[(unsigned int)base64_alphabet[i]] = i;
>+ 	}
>+@@ -565,7 +565,7 @@ static void opie_base64_init(char *rank)
>+ static size_t opie_base64_decode_step(unsigned char *in, size_t len, unsigned char *out, int *state, unsigned int *save)
>+ {
>+ 	unsigned char base64_rank[256];
>+-	opie_base64_init((char*)base64_rank);
>++	opie_base64_init((char*)base64_rank, sizeof(base64_rank));
>+ 	
>+ 	register unsigned char *inptr, *outptr;
>+ 	unsigned char *inend, c;
>diff --git a/libopensync-plugin-opie.spec b/libopensync-plugin-opie.spec
>index 91f7c93..37f91f6 100644
>--- a/libopensync-plugin-opie.spec
>+++ b/libopensync-plugin-opie.spec
>@@ -1,7 +1,7 @@
> Name:           libopensync-plugin-opie
> Epoch:          1
> Version:        0.22
>-Release:        11%{?dist}
>+Release:        12%{?dist}
> Summary:        Synchronisation with the Opie handheld environment
> 
> Group:          System Environment/Libraries
>@@ -12,6 +12,8 @@ Source0:        http://www.opensync.org/download/releases/%{version}/%{name}-%{v
> Source1:        PACKAGE-LICENSING
> Patch0:         libopensync-plugin-opie-curl-setopt.patch
> Patch1:         libopensync-plugin-opie-curl-include.patch
>+Patch2:         libopensync-plugin-opie-gcc48.patch
>+Patch3:         libopensync-plugin-opie-format-security.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  libopensync-devel = 1:0.22
>@@ -26,6 +28,8 @@ handheld environment (http://opie.handhelds.org).
> %setup -q
> %patch0 -b curlsetopt
> %patch1 -p1 -b curlinclude
>+%patch2 -p1 -b .gcc48
>+%patch3 -p1 -b .format-security
> 
> %build
> %configure
>@@ -50,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
> %{_datadir}/opensync/defaults/opie-sync
> 
> %changelog
>+* Mon Jun 16 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1:0.22-12
>+- Fix FTBFS with gcc-4.8 (#914140, #992107)
>+- Fix FTBFS with -Werror=format-security (#1106050)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.22-11
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1106050: 903735 | 903736 | 903737 | 909275