[gyachi] add a patch to build with Werror=format-security flag (rhbz#1037117)

Rahul Sundaram sundaram at fedoraproject.org
Thu Dec 12 20:11:28 UTC 2013


commit 8836f93370f79d13673ba2d86dd32926f60208bd
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Thu Dec 12 15:03:16 2013 -0500

    add a patch to build with Werror=format-security flag (rhbz#1037117)
    
    - fix spec to comply with unversioned doc dir change (rhbz#993788)
    - fix bogus dates in spec file

 format-string.patch |   11 +++++++++++
 gyachi.spec         |   25 +++++++++++++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/format-string.patch b/format-string.patch
new file mode 100644
index 0000000..ea94875
--- /dev/null
+++ b/format-string.patch
@@ -0,0 +1,11 @@
+--- gyachi-1.2.11/webcam/gyachewebcam.c.orig	2013-12-12 14:27:46.912041950 -0500
++++ gyachi-1.2.11/webcam/gyachewebcam.c	2013-12-12 14:28:44.283994167 -0500
+@@ -550,7 +550,7 @@
+ 			  _("Last image received:"), stampbuf );
+ 	}
+ 	else {
+-		snprintf( timebuf, 126, _("Connected") );
++		snprintf( timebuf, 126, "%s", _("Connected") );
+ 	}
+ 	gtk_label_set_markup(GTK_LABEL(vstatuslabel), timebuf );
+ }
diff --git a/gyachi.spec b/gyachi.spec
index 39a5459..f3893e2 100644
--- a/gyachi.spec
+++ b/gyachi.spec
@@ -1,3 +1,4 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %define _without_photo_album 1
 %undefine _with_photo_album
 %define _without_xmms 1
@@ -30,7 +31,7 @@
 
 Name:		gyachi
 Version:	1.2.11
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -38,6 +39,7 @@ License:	GPLv2
 URL:		http://gyachi.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
 
+Patch1:		format-string.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	autoconf automake gawk sed
@@ -226,6 +228,7 @@ This theme uses the pidgin icons, and is copyrighted by it's respective authors.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 ./autogen.sh
@@ -242,7 +245,7 @@ This theme uses the pidgin icons, and is copyrighted by it's respective authors.
 	%{?_without_libnotify:--disable-plugin_libnotify} \
 	%{?_without_gktspell:--disable-plugin_gtkspell} \
 	%{?_with_photo_album:--enable-plugin_photo_album} \
-	%{?_with_xmms:--enable-plugin_xmms} 
+	%{?_with_xmms:--enable-plugin_xmms} \
 
 make %{?_smp_mflags}
 
@@ -286,6 +289,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/%{name}-%{version}
 %docdir %{_docdir}/%{name}-%{version}
 
+
 %if 0%{!?_without_blowfish:1}
 %files plugin-blowfish
 %defattr(-,root,root,-)
@@ -356,6 +360,11 @@ rm -rf $RPM_BUILD_ROOT
 %post -p /sbin/ldconfig
 
 %changelog
+* Thu Dec 12 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 1.2.11-10
+- add a patch to build with Werror=format-security flag (rhbz#1037117)
+- fix spec to comply with unversioned doc dir change (rhbz#993788)
+- fix bogus dates in spec file
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.11-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -510,7 +519,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul  8 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-15
 - plugin-photo_album obsoletes plugin-photosharing
 
-* Thu Jun 20 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-12
+* Fri Jun 20 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-12
 - Changed jasper-libs back to jasper for el4/el5
 
 * Fri Jun 20 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.35-8
@@ -539,17 +548,17 @@ rm -rf $RPM_BUILD_ROOT
 - added new gyachi modules (libnotify, and recre8)
 - updated the name change of the old photosharing module to photo_album
 
-* Tue Feb 05 2007 Rahul Sundaram <sundaram at fedoraproject.org> - 1.1.0-7
+* Mon Feb 05 2007 Rahul Sundaram <sundaram at fedoraproject.org> - 1.1.0-7
 - Fix directory ownership and timestamp issues highlighted by Mamoru Tasaka and Parag Nemade
 
-* Tue Feb 05 2007 Rahul Sundaram <sundaram at fedoraproject.org> - 1.1.0-6
+* Mon Feb 05 2007 Rahul Sundaram <sundaram at fedoraproject.org> - 1.1.0-6
 -  Apply upstream patch to make it build on all arch's
 
-* Mon Feb 04 2007 Rahul Sundaram <sundaram at fedoraproject.org> - 1.1.0-5
+* Sun Feb 04 2007 Rahul Sundaram <sundaram at fedoraproject.org> - 1.1.0-5
 - Add ExcludeArchs
 
-* Mon Feb 04 2007 Rahul Sundaram <sundaram at fedoraproject.org> - 1.1.0-4
+* Sun Feb 04 2007 Rahul Sundaram <sundaram at fedoraproject.org> - 1.1.0-4
 - Fix review as per Parag Nemade 
 
-* Sun Feb 03 2007 Rahul Sundaram <sundaram at fedoraproject.org> - 1.1.0-3
+* Sat Feb 03 2007 Rahul Sundaram <sundaram at fedoraproject.org> - 1.1.0-3
 - Initial spec file based on spec from Christopher Polyte (drpixel)


More information about the scm-commits mailing list