cdw: fix incorrect use of mvwprintw()

In the way it was used it was missing the format string. And with -Werror=format-security set it would therefore fail to compile.

3 files changed, 50 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 788f95c3a063..0262b046c30d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sat Apr 16 11:56:44 UTC 2016
 pkgbase = cdw
 	pkgdesc = Ncurses CD writer program which uses cdrecord and mkisofs
 	pkgver = 0.8.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://cdw.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -13,7 +11,8 @@ pkgbase = cdw
 	depends = libburn
 	depends = libcdio
 	source = cdw-0.8.1.tar.gz::http://sourceforge.net/projects/cdw/files/cdw/cdw%200.8.1/cdw-0.8.1.tar.gz/download
+	source = 0001-add-formatstring.patch
 	md5sums = 9e6b5c2bbe54e8f1dc0d20e3cb966e5c
+	md5sums = 4275a59000cd5d03c7aa9171dbc4271c
 
 pkgname = cdw
-
diff --git a/0001-add-formatstring.patch b/0001-add-formatstring.patch
new file mode 100644
index 000000000000..83c945a50ad2
--- /dev/null
+++ b/0001-add-formatstring.patch
@@ -0,0 +1,36 @@
+--- cdw-0.8.1/src/user_interface/widgets/cdw_dropdown.c
++++ cdw-0.8.1/src/user_interface/widgets/cdw_dropdown.c
+@@ -704,7 +704,7 @@
+ 	mvwprintw(dropdown->parent, dropdown->begin_y, dropdown->begin_x + dropdown->width - 1, "]");
+ 
+ 	/* 'real' content */
+-	mvwprintw(dropdown->parent, dropdown->begin_y, dropdown->begin_x + 1, dropdown->items[dropdown->current_item_ind]->label);
++	mvwprintw(dropdown->parent, dropdown->begin_y, dropdown->begin_x + 1, "%s", dropdown->items[dropdown->current_item_ind]->label);
+ 
+ 	/* and now fancy, bolded arrow by the dropdown */
+ 	if (reverse) {
+
+--- cdw-0.8.1/src/user_interface/cdw_window.c
++++ cdw-0.8.1/src/user_interface/cdw_window.c
+@@ -324,7 +324,7 @@
+ 		cdw_vdm ("ERROR: can't produce wrapped string\n");
+ 		return -1;
+ 	}
+-	mvwprintw(window, 0, 0, string);
++	mvwprintw(window, 0, 0, "%s", string);
+ 
+ 	free(string);
+ 	string = (char *) NULL;
+
+--- cdw-0.8.1/src/user_interface/cdw_main_window.c
++++ cdw-0.8.1/src/user_interface/cdw_main_window.c
+@@ -615,7 +615,7 @@
+ 		return;
+ 	} else {
+ 		if (disc->state_empty == CDW_TRUE) {
+-			mvwprintw(cdw_ui.disc_info_view.subwindow, row_h, pcol, disc->type_label);
++			mvwprintw(cdw_ui.disc_info_view.subwindow, row_h, pcol, "%s", disc->type_label);
+ 		} else {
+ 			mvwprintw(cdw_ui.disc_info_view.subwindow, row_h, pcol,
+ 				  /* 2TRANS: this is string displaying information
+
diff --git a/PKGBUILD b/PKGBUILD
index fe25c7286361..1e63799eba92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,16 +4,24 @@
 
 pkgname=cdw
 pkgver=0.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Ncurses CD writer program which uses cdrecord and mkisofs"
 arch=('i686' 'x86_64')
 url="http://cdw.sourceforge.net/"
 license=('GPL')
 depends=('cdrtools' 'ncurses' 'libburn' 'libcdio')
-source=(${pkgname}-${pkgver}.tar.gz::http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgname}%20${pkgver}/${pkgname}-${pkgver}.tar.gz/download)
-md5sums=('9e6b5c2bbe54e8f1dc0d20e3cb966e5c')
+source=(${pkgname}-${pkgver}.tar.gz::http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgname}%20${pkgver}/${pkgname}-${pkgver}.tar.gz/download
+        0001-add-formatstring.patch)
+md5sums=('9e6b5c2bbe54e8f1dc0d20e3cb966e5c'
+         '4275a59000cd5d03c7aa9171dbc4271c')
 
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  patch -Np1 -i ${srcdir}/0001-add-formatstring.patch
+}
+
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}