[demorse] Fixed compilation with format-security

Jaroslav Škarvada jskarvad at fedoraproject.org
Wed Dec 4 12:26:48 UTC 2013


commit e6644fb7ac0a08ef4c853d7941c7062e7e955ed0
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Dec 4 13:26:44 2013 +0100

    Fixed compilation with format-security
    
      Resolves: rhbz#1037032
    - Updated URL

 demorse-1.1-format-security.patch |   22 ++++++++++++++++++++++
 demorse.spec                      |   14 +++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
---
diff --git a/demorse-1.1-format-security.patch b/demorse-1.1-format-security.patch
new file mode 100644
index 0000000..68fec37
--- /dev/null
+++ b/demorse-1.1-format-security.patch
@@ -0,0 +1,22 @@
+diff --git a/sound.c b/sound.c
+index de36010..a08eccb 100644
+--- a/sound.c
++++ b/sound.c
+@@ -328,7 +328,7 @@ Get_Signal_Sample( void )
+ 	  snprintf( mesg, 127,
+ 		  "Read from audio interface failed\n"
+ 		  "Error: %s\n", snd_strerror((int)error) );
+-	  fprintf( stderr, mesg );
++	  fprintf( stderr, "%s", mesg );
+ 
+ 	  /* Try to recover if broken pipe or suspend */
+ 	  if( !Xrun_Recovery((int)error) )
+@@ -428,7 +428,7 @@ Setup_Signal_Input( void )
+ 	  snprintf( mesg, 127,
+ 		  "demorse: Read from DSP failed\n"
+ 		  "Error: %s\n", snd_strerror((int)error) );
+-	  fprintf( stderr, mesg );
++	  fprintf( stderr, "%s", mesg );
+ 	}
+ 
+ 	/*** Find max sample level (average of 4 samples) ***/
diff --git a/demorse.spec b/demorse.spec
index 7cd7aca..b3befc9 100644
--- a/demorse.spec
+++ b/demorse.spec
@@ -1,14 +1,16 @@
 Name:		demorse
 Version:	1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Command line tool for decoding Morse code signals
 
 Group:		Applications/Communications
 License:	GPLv2+
-URL:		http://5b4az.chronos.org.uk/pages/morse.html
-Source0:	http://5b4az.chronos.org.uk/pkg/morse/%{name}/%{name}-%{version}.tar.bz2
+URL:		http://www.qsl.net/5b4az/pages/morse.html
+Source0:	http://www.qsl.net/5b4az/pkg/morse/%{name}/%{name}-%{version}.tar.bz2
 BuildRequires:	alsa-lib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Patch sent upstream
+Patch0:	demorse-1.1-format-security.patch
 
 %description
 demorse is a non-interactive command line tool for decoding Morse code signals 
@@ -24,6 +26,7 @@ decoded Morse signals are sent to stdout.
 
 %prep
 %setup -q
+%patch0 -p1 -b .format-security
 
 %build
 %configure
@@ -43,6 +46,11 @@ rm -rf %{buildroot}
 %{_bindir}/%{name}
 
 %changelog
+* Wed Dec  4 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 1.1-3
+- Fixed compilation with format-security
+  Resolves: rhbz#1037032
+- Updated URL
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list