From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 25 Feb 2016 22:00:34 +0000 (+0000)
Subject: linux-atm: activate format security checks
X-Git-Tag: reboot~363
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=9c394f4cbeaba21a1317bb2516636cf0c67c6da6

linux-atm: activate format security checks

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 48786
---

diff --git a/package/network/utils/linux-atm/Makefile b/package/network/utils/linux-atm/Makefile
index e081428eb0..62d71ea75d 100644
--- a/package/network/utils/linux-atm/Makefile
+++ b/package/network/utils/linux-atm/Makefile
@@ -18,7 +18,6 @@ PKG_MD5SUM:=d49499368c3cf15f73a05d9bce8824a8
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
-PKG_CHECK_FORMAT_SECURITY:=0
 PKG_LICENSE:=GPL-2.0+
 PKG_FIXUP:=autoreconf
 
diff --git a/package/network/utils/linux-atm/patches/400-portability_fixes.patch b/package/network/utils/linux-atm/patches/400-portability_fixes.patch
index 462f57c3f4..9fe3e1faea 100644
--- a/package/network/utils/linux-atm/patches/400-portability_fixes.patch
+++ b/package/network/utils/linux-atm/patches/400-portability_fixes.patch
@@ -1,6 +1,5 @@
-diff -urN linux-atm-2.5.2/src/ilmid/io.c linux-atm-2.5.2.new/src/ilmid/io.c
---- linux-atm-2.5.2/src/ilmid/io.c	2008-01-01 01:14:50.000000000 +0100
-+++ linux-atm-2.5.2.new/src/ilmid/io.c	2012-11-23 17:32:18.149268039 +0100
+--- a/src/ilmid/io.c
++++ b/src/ilmid/io.c
 @@ -48,6 +48,14 @@
  			     be manually configured (after ilmid has
  			     registered the "official" address) - HACK */
@@ -16,9 +15,8 @@ diff -urN linux-atm-2.5.2/src/ilmid/io.c linux-atm-2.5.2.new/src/ilmid/io.c
  extern SysGroup *remsys;
  extern State ilmi_state;
  static short atm_itf = -1; /* bad value */
-diff -urN linux-atm-2.5.2/src/mpoad/io.c linux-atm-2.5.2.new/src/mpoad/io.c
---- linux-atm-2.5.2/src/mpoad/io.c	2008-01-01 01:14:51.000000000 +0100
-+++ linux-atm-2.5.2.new/src/mpoad/io.c	2012-11-23 17:34:17.745271101 +0100
+--- a/src/mpoad/io.c
++++ b/src/mpoad/io.c
 @@ -10,14 +10,7 @@
  #include <errno.h>
  #include <sys/ioctl.h>
@@ -34,10 +32,9 @@ diff -urN linux-atm-2.5.2/src/mpoad/io.c linux-atm-2.5.2.new/src/mpoad/io.c
  #include <atm.h>
  #include <linux/types.h>
  #include <linux/atmioc.h>
-diff -urN linux-atm-2.5.2/src/sigd/atmsigd.c linux-atm-2.5.2.new/src/sigd/atmsigd.c
---- linux-atm-2.5.2/src/sigd/atmsigd.c	2008-01-01 01:14:52.000000000 +0100
-+++ linux-atm-2.5.2.new/src/sigd/atmsigd.c	2012-11-23 17:30:38.689265492 +0100
-@@ -517,7 +517,7 @@
+--- a/src/sigd/atmsigd.c
++++ b/src/sigd/atmsigd.c
+@@ -517,7 +517,7 @@ int main(int argc,char **argv)
  	    exit(0);
  	}
      }
@@ -46,9 +43,8 @@ diff -urN linux-atm-2.5.2/src/sigd/atmsigd.c linux-atm-2.5.2.new/src/sigd/atmsig
      poll_loop();
      close_all();
      for (sig = entities; sig; sig = sig->next) stop_saal(&sig->saal);
-diff -urN linux-atm-2.5.2/src/test/align.c linux-atm-2.5.2.new/src/test/align.c
---- linux-atm-2.5.2/src/test/align.c	2001-10-10 00:33:08.000000000 +0200
-+++ linux-atm-2.5.2.new/src/test/align.c	2012-11-23 17:25:15.077257206 +0100
+--- a/src/test/align.c
++++ b/src/test/align.c
 @@ -24,7 +24,7 @@
  #include <signal.h>
  #include <sys/types.h>
diff --git a/package/network/utils/linux-atm/patches/600-fix-format-errors.patch b/package/network/utils/linux-atm/patches/600-fix-format-errors.patch
new file mode 100644
index 0000000000..ef484f2fa3
--- /dev/null
+++ b/package/network/utils/linux-atm/patches/600-fix-format-errors.patch
@@ -0,0 +1,11 @@
+--- a/src/test/ttcp.c
++++ b/src/test/ttcp.c
+@@ -664,7 +664,7 @@ int no_check = 0;
+     exit(0);
+ 
+   usage:
+-    fprintf(stderr, Usage);
++    fprintf(stderr, "%s", Usage);
+     exit(1);
+ }
+