[trickle] - Add Fedora specific patch trickle-1.07-err-Werror=format-security.patch to fix trickle FTBFS if "-

Pavel Alexeev hubbitus at fedoraproject.org
Mon Jan 6 15:30:07 UTC 2014


commit ab379a1fa8d413bd40c9ec50b180af7a5e494016
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Mon Jan 6 19:29:55 2014 +0400

    - Add Fedora specific patch trickle-1.07-err-Werror=format-security.patch to fix trickle FTBFS if "-Werror=format-security" flag is used (bz#1037366)
    - Fix bogus date in changelog.

 trickle-1.07-err-Werror=format-security.patch |   12 ++++++++++++
 trickle.spec                                  |   19 +++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)
---
diff --git a/trickle-1.07-err-Werror=format-security.patch b/trickle-1.07-err-Werror=format-security.patch
new file mode 100644
index 0000000..720997b
--- /dev/null
+++ b/trickle-1.07-err-Werror=format-security.patch
@@ -0,0 +1,12 @@
+diff -NurEbBH --exclude '*.lo' trickle-1.07.orig/tricklectl.c trickle-1.07/tricklectl.c
+--- trickle-1.07.orig/tricklectl.c	2014-01-06 18:37:31.000000000 +0400
++++ trickle-1.07/tricklectl.c	2014-01-06 18:52:46.065646752 +0400
+@@ -91,7 +91,7 @@
+ 	trickled_ctl_open(&trickled_sock);
+ 
+ 	if (!trickled_sock)
+-		err(1, sockname);
++		err(1, "%s", sockname);
+ 
+ 	handle_command(i, argc, argv);
+ 
diff --git a/trickle.spec b/trickle.spec
index 68592b6..bfa2800 100644
--- a/trickle.spec
+++ b/trickle.spec
@@ -1,6 +1,6 @@
 Name:           trickle
-Version:        1.07 
-Release:        16%{?dist}
+Version:        1.07
+Release:        17%{?dist}
 Summary:        Portable lightweight userspace bandwidth shaper
 
 Group:          Applications/System
@@ -16,16 +16,18 @@ Patch0:         %{name}-%{version}-include_netdb.patch
 Patch1:         %{name}-%{version}-libdir.patch
 Patch2:         %{name}-%{version}-CVE-2009-0415.patch
 Patch3:         %{name}-%{version}-bwsta_getdelay-stop-if-no-packets.patch
+# Fedora specific: https://bugzilla.redhat.com/show_bug.cgi?id=1037366
+Patch4:         %{name}-%{version}-err-Werror=format-security.patch
 
 %description
 trickle is a portable lightweight userspace bandwidth shaper.
 It can run in collaborative mode or in stand alone mode.
 
 trickle works by taking advantage of the unix loader preloading.
-Essentially it provides, to the application, 
-a new version of the functionality that is required 
+Essentially it provides, to the application,
+a new version of the functionality that is required
 to send and receive data through sockets.
-It then limits traffic based on delaying the sending 
+It then limits traffic based on delaying the sending
 and receiving of data over a socket.
 trickle runs entirely in userspace and does not require root privileges.
 
@@ -35,6 +37,7 @@ trickle runs entirely in userspace and does not require root privileges.
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .cve
 %patch3 -p1
+%patch4 -p1 -b .err-Werror=format-security.patch
 touch -r configure aclocal.m4 Makefile.in stamp-h.in
 
 iconv -f ISO88591 -t UTF8 < README > README.UTF8
@@ -73,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 6 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 1.07-17
+- Add Fedora specific patch trickle-1.07-err-Werror=format-security.patch to fix trickle FTBFS if "-Werror=format-security" flag is used (bz#1037366)
+- Fix bogus date in changelog.
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -99,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 - Replace sed with a patch for #484065 (CVE-2009-0415)
 * Fri Feb  6 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 1.07-6
 - Add a fix for bug #484065 (CVE-2009-0415)
-* Fri Aug 28 2008 Manuel Wolfshant <wolfy at fedoraproject.org> 1.07-5
+* Thu Aug 28 2008 Manuel Wolfshant <wolfy at fedoraproject.org> 1.07-5
 - modify trickle-1.07-include_netdb.patch to adjust for building with fuzz=0
 * Sun Jun 29 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 1.07-4
 - rebuild for new libevent


More information about the scm-commits mailing list