[packages/madwifi-ng] - fix -Wformat-security errors - rel 27

[baggins]

commit 09061dfacd676291fc5b5c6b1d66ca15b0134e81
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Sep 25 14:41:12 2012 +0200

    - fix -Wformat-security errors
    - rel 27

 format-security.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 madwifi-ng.spec       |  4 +++-
 2 files changed, 49 insertions(+), 1 deletion(-)
---
diff --git a/madwifi-ng.spec b/madwifi-ng.spec
index ef52fed..afe9787 100644
--- a/madwifi-ng.spec
+++ b/madwifi-ng.spec
@@ -18,7 +18,7 @@
 %define		prel	0.%{snap}.%{rel}
 %define		trunk	r4177
 
-%define		rel		26
+%define		rel		27
 
 %if "%{_alt_kernel}" != "%{nil}"
 %if %{with kernel}
@@ -54,6 +54,7 @@ Patch1:		%{pname}-makefile-werror.patch
 # http://madwifi-project.org/ticket/617
 Patch2:		%{pname}-ticket-617.patch
 Patch3:		%{pname}-ieee80211-skb-update.patch
+Patch4:		format-security.patch
 URL:		http://madwifi-project.org/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:3.0.21}
@@ -116,6 +117,7 @@ Ten pakiet zawiera moduł jądra Linuksa.
 # fix - ticket 617
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %if %{with userspace}
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..5637fc5
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,46 @@
+--- madwifi-trunk-r4177-20120131/tools/80211stats.c~	2008-06-06 22:32:29.000000000 +0200
++++ madwifi-trunk-r4177-20120131/tools/80211stats.c	2012-09-25 14:38:32.502500897 +0200
+@@ -284,7 +284,7 @@
+ 		/* no args, just show global stats */
+ 		ifr.ifr_data = (caddr_t) &stats;
+ 		if (ioctl(s, SIOCG80211STATS, &ifr) < 0)
+-			err(1, ifr.ifr_name);
++			err(1, "%s", ifr.ifr_name);
+ 		printstats(stdout, &stats);
+ 		return 0;
+ 	}
+--- madwifi-trunk-r4177-20120131/tools/athstats.c~	2009-04-07 03:26:53.000000000 +0200
++++ madwifi-trunk-r4177-20120131/tools/athstats.c	2012-09-25 14:38:20.669167983 +0200
+@@ -285,9 +285,9 @@
+ 		if (line != 0) {
+ 			ifr.ifr_data = (caddr_t) &cur;
+ 			if (ioctl(s, SIOCGATHSTATS, &ifr) < 0)
+-				err(1, ifr.ifr_name);
++				err(1, "%s", ifr.ifr_name);
+ 			if (!getifstats(ifr.ifr_name, &icur, &ocur))
+-				err(1, ifr.ifr_name);
++				err(1, "%s", ifr.ifr_name);
+ 			printf("%8lu %8lu %7u %7u %7u %6u %6u %6u %7u %4u %3uM\n",
+ 				(icur - itot) -
+ 					(cur.ast_rx_mgt - total.ast_rx_mgt),
+@@ -307,9 +307,9 @@
+ 		} else {
+ 			ifr.ifr_data = (caddr_t) &total;
+ 			if (ioctl(s, SIOCGATHSTATS, &ifr) < 0)
+-				err(1, ifr.ifr_name);
++				err(1, "%s", ifr.ifr_name);
+ 			if (!getifstats(ifr.ifr_name, &itot, &otot))
+-				err(1, ifr.ifr_name);
++				err(1, "%s", ifr.ifr_name);
+ 			printf("%8lu %8lu %7u %7u %7u %6u %6u %6u %7u %4u %3uM\n",
+ 				itot - total.ast_rx_mgt,
+ 				otot,
+@@ -344,7 +344,7 @@
+ 
+ 		ifr.ifr_data = (caddr_t) &stats;
+ 		if (ioctl(s, SIOCGATHSTATS, &ifr) < 0)
+-			err(1, ifr.ifr_name);
++			err(1, "%s", ifr.ifr_name);
+ 		printstats(stdout, &stats);
+ 	}
+ 	return 0;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/madwifi-ng.git/commitdiff/09061dfacd676291fc5b5c6b1d66ca15b0134e81