Attachment 910478 Details for Bug 1037394 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-Werror-format-security-1037394-110726.patch (text/plain), 3.15 KB, created by Yaakov Selkowitz on 2014-06-19 16:54:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-19 16:54:42 UTC

Size: 3.15 KB

patch

obsolete

>From 5d2de532eab69aebbd204dbcd081ef65a1412c62 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowi@redhat.com>
>Date: Thu, 19 Jun 2014 11:53:10 -0500
>Subject: [PATCH] Fix FTBFS with -Werror=format-security (#1037394, #1107268)
>
>---
> xfce4-modemlights-plugin-0.1.3.99-format-security.patch | 13 +++++++++++++
> xfce4-modemlights-plugin.spec                           | 14 ++++++--------
> 2 files changed, 19 insertions(+), 8 deletions(-)
> create mode 100644 xfce4-modemlights-plugin-0.1.3.99-format-security.patch
>
>diff --git a/xfce4-modemlights-plugin-0.1.3.99-format-security.patch b/xfce4-modemlights-plugin-0.1.3.99-format-security.patch
>new file mode 100644
>index 0000000..3891745
>--- /dev/null
>+++ b/xfce4-modemlights-plugin-0.1.3.99-format-security.patch
>@@ -0,0 +1,13 @@
>+diff --git a/panel-plugin/panel-plugin.c b/panel-plugin/panel-plugin.c
>+index d41d590..5e1ce7e 100644
>+--- a/panel-plugin/panel-plugin.c
>++++ b/panel-plugin/panel-plugin.c
>+@@ -737,7 +737,7 @@ modemlights_create_info (GtkWidget *widget,
>+                                           GTK_DIALOG_DESTROY_WITH_PARENT,
>+                                           GTK_MESSAGE_INFO,
>+                                           GTK_BUTTONS_CLOSE,
>+-                                          text);
>++                                          "%s", text);
>+     gtk_dialog_run (GTK_DIALOG (dialog));
>+     gtk_widget_destroy (dialog);
>+ }
>diff --git a/xfce4-modemlights-plugin.spec b/xfce4-modemlights-plugin.spec
>index a6d0eaf..649b1e9 100644
>--- a/xfce4-modemlights-plugin.spec
>+++ b/xfce4-modemlights-plugin.spec
>@@ -1,6 +1,6 @@
> Name:           xfce4-modemlights-plugin
> Version:        0.1.3.99
>-Release:        15%{?dist}
>+Release:        16%{?dist}
> Summary:        Modemlights for the Xfce panel
> 
> Group:          User Interface/Desktops
>@@ -13,7 +13,7 @@ Patch0:         xfce4-modemlights-plugin-0.1.3.99-ifupdown.patch
> # as of 2010-12-18
> Patch2:         xfce4-modemlights-plugin-0.1.3.99-update-translations.patch
> Patch3:         xfce4-modemlights-plugin-0.1.3.99-modemlights.desktop.patch
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+Patch4:         xfce4-modemlights-plugin-0.1.3.99-format-security.patch
> 
> BuildRequires:  xfce4-panel-devel >= 4.4.0
> BuildRequires:  libxfcegui4-devel >= 4.4.0
>@@ -30,6 +30,7 @@ a modem.
> %patch0 -p1 -b .ifupdown
> %patch2 -p1 -b .update-translations
> %patch3 -p1 -b .modemlights.desktop
>+%patch4 -p1 -b .formatsec
> 
> 
> %build
>@@ -38,17 +39,11 @@ make %{?_smp_mflags}
> 
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
> make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
> %find_lang %{name}
> 
> 
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>-
>-
> %files -f %{name}.lang
>-%defattr(-,root,root,-)
> %doc AUTHORS COPYING ChangeLog NEWS README
> %{_libexecdir}/xfce4/panel-plugins/%{name}
> %{_datadir}/xfce4/panel-plugins/*.desktop
>@@ -56,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
> 
> 
> %changelog
>+* Thu Jun 19 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.1.3.99-16
>+- Fix FTBFS with -Werror=format-security (#1037394, #1107268)
>+
> * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.3.99-15
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1037394: 910478