Attachment 910467 Details for Bug 1037185 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-Werror-format-security-1037185-110614.patch (text/plain), 3.16 KB, created by Yaakov Selkowitz on 2014-06-19 16:05:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-19 16:05:57 UTC

Size: 3.16 KB

patch

obsolete

>From f5ab00c810956ffeaf346e380fd685616743136e Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowi@redhat.com>
>Date: Thu, 19 Jun 2014 11:05:34 -0500
>Subject: [PATCH] Fix FTBFS with -Werror=format-security (#1037185, #1106143)
>
>---
> lxpanel-0.6.1-format-security.patch | 13 +++++++++++++
> lxpanel.spec                        | 16 +++++++---------
> 2 files changed, 20 insertions(+), 9 deletions(-)
> create mode 100644 lxpanel-0.6.1-format-security.patch
>
>diff --git a/lxpanel-0.6.1-format-security.patch b/lxpanel-0.6.1-format-security.patch
>new file mode 100644
>index 0000000..c148b4a
>--- /dev/null
>+++ b/lxpanel-0.6.1-format-security.patch
>@@ -0,0 +1,13 @@
>+diff --git a/src/plugins/netstatus/netstatus-iface.c b/src/plugins/netstatus/netstatus-iface.c
>+index b0009c7..a57f4c8 100644
>+--- a/src/plugins/netstatus/netstatus-iface.c
>++++ b/src/plugins/netstatus/netstatus-iface.c
>+@@ -408,7 +408,7 @@ netstatus_iface_set_polling_error (NetstatusIface *iface,
>+   va_start (args, format);
>+ 
>+   error_message = g_strdup_vprintf (format, args);
>+-  error = g_error_new (NETSTATUS_ERROR, code, error_message);
>++  error = g_error_new (NETSTATUS_ERROR, code, "%s", error_message);
>+ 
>+   dprintf (POLLING, "ERROR: %s\n", error->message);
>+   netstatus_iface_set_error (iface, error);
>diff --git a/lxpanel.spec b/lxpanel.spec
>index f5dc039..953fb72 100644
>--- a/lxpanel.spec
>+++ b/lxpanel.spec
>@@ -2,7 +2,7 @@
> 
> Name:           lxpanel
> Version:        0.6.1
>-Release:        4%{?dist}
>+Release:        5%{?dist}
> Summary:        A lightweight X11 desktop panel
> 
> Group:          User Interface/Desktops
>@@ -21,10 +21,10 @@ Patch100:       lxpanel-0.5.9-default.patch
> Patch101:       lxpanel-0.3.8.1-nm-connection-editor.patch
> # use zenity instead of xmessage to display low battery warning
> Patch102:       lxpanel-0.5.12-battery-plugin-use-zenity.patch
>+# -Werror=format-security
>+Patch103:       lxpanel-0.6.1-format-security.patch
> 
> 
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>-
> #BuildRequires:  docbook-utils
> BuildRequires:  gettext
> BuildRequires:  gtk2-devel 
>@@ -65,6 +65,7 @@ developing applications that use %{name}.
> %patch100 -p1 -b .default
> %patch101 -p1 -b .system-config-network
> %patch102 -p1 -b .zenity
>+%patch103 -p1 -b .formatsec
> 
> # Fedora >= 19 doesn't use vendor prefixes for desktop files. Instead of
> # maintaining two patches we just strip the prefixes from the files we just
>@@ -82,17 +83,12 @@ make %{?_smp_mflags} V=1
> 
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
> make install DESTDIR=$RPM_BUILD_ROOT
> 
> %find_lang %{name}
> 
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>-
> 
> %files -f %{name}.lang
>-%defattr(-,root,root,-)
> %doc AUTHORS COPYING README
> %{_bindir}/lxpanel*
> %{_datadir}/lxpanel/
>@@ -100,11 +96,13 @@ rm -rf $RPM_BUILD_ROOT
> %{_mandir}/man1/lxpanel*
> 
> %files devel
>-%defattr(-,root,root,-)
> %{_includedir}/lxpanel/
> %{_libdir}/pkgconfig/lxpanel.pc
> 
> %changelog
>+* Thu Jun 19 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.6.1-5
>+- Fix FTBFS with -Werror=format-security (#1037185, #1106143)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1037185: 910467