[ptxdist] [PATCH] busybox: add patch to fix -Wformat-security problem

[Jan Luebbe <jlu@pengutronix.de>]

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 .../0001-reactivate-check-for-tty.patch            |    1 -
 .../0002-Fix-compilation-on-Darwin.patch           |    1 -
 ...mat-warning-when-building-applets-usage_p.patch |   27 ++++++++++++++++++++
 patches/busybox-1.20.1/series                      |    3 ++-
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 patches/busybox-1.20.1/0003-Fix-the-format-warning-when-building-applets-usage_p.patch

diff --git a/patches/busybox-1.20.1/0001-reactivate-check-for-tty.patch b/patches/busybox-1.20.1/0001-reactivate-check-for-tty.patch
index 186aa57..a44f6b6 100644
--- a/patches/busybox-1.20.1/0001-reactivate-check-for-tty.patch
+++ b/patches/busybox-1.20.1/0001-reactivate-check-for-tty.patch
@@ -1,4 +1,3 @@
-From 1bfae474d5bde25836fa996506f89018d6fbd6e1 Mon Sep 17 00:00:00 2001
 From: Marc Kleine-Budde <mkl@pengutronix.de>
 Date: Fri, 6 Nov 2009 09:19:58 +0100
 Subject: [PATCH] reactivate check for tty
diff --git a/patches/busybox-1.20.1/0002-Fix-compilation-on-Darwin.patch b/patches/busybox-1.20.1/0002-Fix-compilation-on-Darwin.patch
index 031a84f..a6a6d78 100644
--- a/patches/busybox-1.20.1/0002-Fix-compilation-on-Darwin.patch
+++ b/patches/busybox-1.20.1/0002-Fix-compilation-on-Darwin.patch
@@ -1,4 +1,3 @@
-From 6b464e669163eee0fc71b57ba3530df812736541 Mon Sep 17 00:00:00 2001
 From: Bernhard Walle <bernhard@bwalle.de>
 Date: Wed, 13 Jun 2012 21:44:46 +0200
 Subject: [PATCH] Fix compilation on Darwin
diff --git a/patches/busybox-1.20.1/0003-Fix-the-format-warning-when-building-applets-usage_p.patch b/patches/busybox-1.20.1/0003-Fix-the-format-warning-when-building-applets-usage_p.patch
new file mode 100644
index 0000000..8c0b36a
--- /dev/null
+++ b/patches/busybox-1.20.1/0003-Fix-the-format-warning-when-building-applets-usage_p.patch
@@ -0,0 +1,27 @@
+From: Dinny Wu <dinny.wu@gmail.com>
+Date: Thu, 26 Jul 2012 14:12:51 +0000
+Subject: [PATCH] Fix the format warning when building applets/usage_pod.c
+
+When compiling busybox with gcc 4.6.3, it shows below warning:
+
+applets/usage_pod.c: In function ‘main’:
+applets/usage_pod.c:74:3: warning: format not a string literal and no format arguments [-Wformat-security]
+
+Signed-off-by: Dinny Wu <dinny.wu@gmail.com>
+---
+ applets/usage_pod.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/applets/usage_pod.c b/applets/usage_pod.c
+index 0b1c4aa..a67e8b4 100644
+--- a/applets/usage_pod.c
++++ b/applets/usage_pod.c
+@@ -71,7 +71,7 @@ int main(void)
+ 		} else {
+ 			printf(", ");
+ 		}
+-		printf(usage_array[i].aname);
++		printf("%s", usage_array[i].aname);
+ 		col += len2;
+ 	}
+ 	printf("\n\n");
diff --git a/patches/busybox-1.20.1/series b/patches/busybox-1.20.1/series
index 4c4504b..0404eac 100644
--- a/patches/busybox-1.20.1/series
+++ b/patches/busybox-1.20.1/series
@@ -2,4 +2,5 @@
 #tag:base --start-number 1
 0001-reactivate-check-for-tty.patch
 0002-Fix-compilation-on-Darwin.patch
-# 0f71f4e1223df5ecf36d97b5851e1c4c  - git-ptx-patches magic
+0003-Fix-the-format-warning-when-building-applets-usage_p.patch
+# 5f3f3ac2bf84d7c201d42388a92d64f8  - git-ptx-patches magic
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de