[packages/wanpipe] - updated to 7.0.8 - added format patch (fixes build with -Werror=format-security)

[qboosh]

commit d87bf2dc16f3721d1cc1875103c74c84a8e2bde0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Nov 17 10:07:21 2013 +0100

    - updated to 7.0.8
    - added format patch (fixes build with -Werror=format-security)

 wanpipe-format.patch | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 wanpipe.spec         |  8 +++----
 2 files changed, 66 insertions(+), 4 deletions(-)
---
diff --git a/wanpipe.spec b/wanpipe.spec
index 7c50375..5b67701 100644
--- a/wanpipe.spec
+++ b/wanpipe.spec
@@ -12,12 +12,12 @@
 Summary:	WAN routing package for Sangoma cards
 Summary(pl.UTF-8):	Pakiet do rutingu WAN dla kart Sangoma
 Name:		wanpipe
-Version:	7.0.5
+Version:	7.0.8
 Release:	%{rel}
 License:	GPL v2+, partially BSD
 Group:		Applications/System
 Source0:	ftp://ftp.sangoma.com/linux/current_wanpipe/%{name}-%{version}.tgz
-# Source0-md5:	bb058a15054b5d252bcf703adb8a3d5a
+# Source0-md5:	fe2d6a2c1aa63d2024beeabd9adb4e8e
 Source1:	wanrouter.init
 Source2:	wanrouter.sysconfig
 Source3:	%{name}1.conf
@@ -25,6 +25,7 @@ Patch0:		%{name}-cfgtools.patch
 Patch1:		%{name}-opt.patch
 Patch2:		%{name}-setup.patch
 Patch3:		%{name}-kbuild.patch
+Patch4:		%{name}-format.patch
 URL:		http://www.sangoma.com/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -120,6 +121,7 @@ Ten pakiet zawiera moduł WANPIPE dla Linuksa.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 sed -i 's#EXTRA_UTIL_FLAGS = #EXTRA_UTIL_FLAGS = -I/usr/include/ncurses #' Makefile
 sed -i 's#<ncurses.h>#<ncurses/ncurses.h>#' util/lxdialog/Makefile
@@ -241,9 +243,7 @@ fi
 %attr(755,root,root) %{_sbindir}/wan_ec_client
 %attr(755,root,root) %{_sbindir}/wan_plxup
 %attr(755,root,root) %{_sbindir}/wancfg_*
-%attr(755,root,root) %{_sbindir}/wanconfig
 %attr(755,root,root) %{_sbindir}/wanpipe_lxdialog
-%attr(755,root,root) %{_sbindir}/wanpipemon
 %attr(755,root,root) %{_sbindir}/wanpipemon_legacy
 %{_datadir}/wanrouter/wancfg
 
diff --git a/wanpipe-format.patch b/wanpipe-format.patch
new file mode 100644
index 0000000..5d5e5bb
--- /dev/null
+++ b/wanpipe-format.patch
@@ -0,0 +1,62 @@
+--- wanpipe-7.0.8/util/lxdialog/lxdialog.c.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-7.0.8/util/lxdialog/lxdialog.c	2013-11-17 08:36:36.085857157 +0100
+@@ -240,7 +240,7 @@
+     int ret = dialog_inputbox (t, av[2], atoi (av[3]), atoi (av[4]),
+                             ac == 6 ? av[5] : (char *) NULL);
+     if (ret == 0)
+-        fprintf(stderr, (char*)dialog_input_result);
++        fputs((char*)dialog_input_result, stderr);
+     return ret;
+ }
+ 
+--- wanpipe-7.0.8/util/wanconfig/wanconfig.c.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-7.0.8/util/wanconfig/wanconfig.c	2013-11-17 08:50:28.805822211 +0100
+@@ -713,7 +713,7 @@
+  * Show usage text
+  */
+ void show_usage(void) {
+-	fprintf(stderr, usagetext);
++	fputs(usagetext, stderr);
+ 	exit(1);
+ }
+ 
+@@ -765,7 +765,7 @@
+ 	}
+ 	
+ 	while(fgets(buf, sizeof(buf) -1, file)) {
+-		printf(buf);
++		fputs(buf, stdout);
+ 	}	
+ 
+ 	fclose(file);
+@@ -3864,7 +3864,7 @@
+ 		if (buf[0] != '#'){
+ 			break;
+ 		}else{
+-			fprintf(tmp_file, buf);
++			fputs(buf, tmp_file);
+ 		}
+ 	}	
+ 	for(x = 0; x < vcivpi_num; x++){
+--- wanpipe-7.0.8/util/wanpipemon/wanpipemon.c.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-7.0.8/util/wanpipemon/wanpipemon.c	2013-11-17 08:56:23.629140653 +0100
+@@ -1176,7 +1176,7 @@
+ 				exit(1);
+ 			}
+ 
+-			snprintf(pcap_output_file_name, sizeof(pcap_output_file_name), argv[i+1]);
++			snprintf(pcap_output_file_name, sizeof(pcap_output_file_name), "%s", argv[i+1]);
+ 		}else if (!strcmp(argv[i], "-x25opt")){
+ 			int x;
+ 			if (i+1 > argc-1){
+--- wanpipe-7.0.8/util/wanpipemon/prot_trace.c.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-7.0.8/util/wanpipemon/prot_trace.c	2013-11-17 09:02:20.812458997 +0100
+@@ -1805,7 +1805,7 @@
+ 		break;
+ 	}
+ 
+-	printf(outstr);
++	fputs(outstr, stdout);
+ 	printf("\n\n");
+ 	return inf_frame;
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wanpipe.git/commitdiff/d87bf2dc16f3721d1cc1875103c74c84a8e2bde0