[unique] Add patch for format-security FTBFS

Peter Robinson pbrobinson at fedoraproject.org
Wed May 7 12:25:39 UTC 2014


commit 818aeeb55d5c2c8aa2c15cd4f64aaa97e616d4e0
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed May 7 13:25:58 2014 +0100

    Add patch for format-security FTBFS

 libunique-1.1.6-format-security.patch |   15 +++++++++++++++
 unique.spec                           |   11 +++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/libunique-1.1.6-format-security.patch b/libunique-1.1.6-format-security.patch
new file mode 100644
index 0000000..5f2cc91
--- /dev/null
+++ b/libunique-1.1.6-format-security.patch
@@ -0,0 +1,15 @@
+--- libunique-1.1.6/tests/test-unique.c.orig	2014-05-07 11:05:02.743420865 +0100
++++ libunique-1.1.6/tests/test-unique.c	2014-05-07 11:24:20.163336706 +0100
+@@ -82,10 +82,10 @@
+                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    GTK_MESSAGE_INFO,
+                                    GTK_BUTTONS_CLOSE,
+-                                   title);
++                                   "%s", title);
+   if (message)
+     gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+-                                              message);
++                                              "%s", message);
+ 
+   gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE);
+ 
diff --git a/unique.spec b/unique.spec
index f8dce6e..551f83e 100644
--- a/unique.spec
+++ b/unique.spec
@@ -1,6 +1,6 @@
 Name:           unique
 Version:        1.1.6
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Single instance support for applications
 
 Group:          System Environment/Libraries
@@ -11,6 +11,7 @@ Source0:        http://download.gnome.org/sources/libunique/1.1/libunique-%{vers
 # Fix build -- upstream dead (replaced with GtkApplication)
 Patch0:    fix-unused-but-set-variable.patch
 Patch1:    fix-disable-deprecated.patch
+Patch2:    libunique-1.1.6-format-security.patch
 
 BuildRequires:  dbus-glib-devel
 BuildRequires:  gnome-doc-utils >= 0.3.2
@@ -38,6 +39,7 @@ Headers and libraries for Unique.
 %setup -q -n libunique-%{?version}
 %patch0 -p1 -b .unused-but-set-variable
 %patch1 -p1 -b .disable-deprecated
+%patch2 -p1 -b .format-security
 
 %build
 %configure --enable-gtk-doc --disable-static --enable-introspection=no --enable-maintainer-flags=no
@@ -45,25 +47,26 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc %{_datadir}/gtk-doc
 %{_includedir}/unique-1.0/
 %{_libdir}/pkgconfig/*
 %{_libdir}/lib*.so
 
 %changelog
+* Wed May  7 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.1.6-11
+- Add patch for format-security FTBFS
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list