[iperf] added patch to build with format security enabled (#1037132)

Gabriel L. Somlo somlo at fedoraproject.org
Sun Dec 22 17:31:05 UTC 2013


commit 74aa8974ead4ed12f5471d9106d7f0d01e90f439
Author: Gabriel L. Somlo <somlo at cmu.edu>
Date:   Sun Dec 22 12:30:17 2013 -0500

    added patch to build with format security enabled (#1037132)

 iperf-2.0.5-format_security.patch |   16 ++++++++++++++++
 iperf.spec                        |    7 ++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/iperf-2.0.5-format_security.patch b/iperf-2.0.5-format_security.patch
new file mode 100644
index 0000000..673587a
--- /dev/null
+++ b/iperf-2.0.5-format_security.patch
@@ -0,0 +1,16 @@
+diff -NarU5 A/compat/Thread.c B/compat/Thread.c
+--- A/compat/Thread.c	2010-03-30 19:08:24.000000000 -0400
++++ B/compat/Thread.c	2013-12-22 12:23:11.623088163 -0500
+@@ -379,11 +379,11 @@
+  * ------------------------------------------------------------------- */
+ int thread_release_nonterm( int interrupt ) {
+     Condition_Lock( thread_sNum_cond );
+     thread_sNum -= nonterminating_num;
+     if ( thread_sNum > 1 && nonterminating_num > 0 && interrupt != 0 ) {
+-        fprintf( stderr, wait_server_threads );
++        fprintf( stderr, "%s", wait_server_threads );
+     }
+     nonterminating_num = 0;
+     Condition_Signal( &thread_sNum_cond );
+     Condition_Unlock( thread_sNum_cond );
+     return thread_sNum;
diff --git a/iperf.spec b/iperf.spec
index 891c27b..7f6012d 100644
--- a/iperf.spec
+++ b/iperf.spec
@@ -1,6 +1,6 @@
 Name: iperf
 Version: 2.0.5
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Measurement tool for TCP/UDP bandwidth performance
 License: BSD
 Group: Applications/Internet
@@ -8,6 +8,7 @@ URL: http://sourceforge.net/projects/iperf
 Source: http://sourceforge.net/projects/iperf/files/%{name}-%{version}.tar.gz
 Patch0: iperf-2.0.5-debuginfo.patch
 Patch1: iperf-2.0.5-tcpdual.patch
+Patch2: iperf-2.0.5-format_security.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
 
@@ -20,6 +21,7 @@ jitter, datagram loss.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__autoconf}
@@ -40,6 +42,9 @@ jitter, datagram loss.
 %{_mandir}/man*/*
 
 %changelog
+* Sun Dec 22 2013 Gabriel Somlo <somlo at cmu.edu> 2.0.5-10
+- added patch to build with format security enabled (#1037132)
+
 * Tue Aug 06 2013 Gabriel Somlo <somlo at cmu.edu> 2.0.5-9
 - fix debuginfo regression (#925592)
 


More information about the scm-commits mailing list