diff options
| -rw-r--r-- | meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch | 81 | ||||
| -rw-r--r-- | meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb | 4 |
2 files changed, 84 insertions, 1 deletions
diff --git a/meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch b/meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch new file mode 100644 index 0000000000..cf2687f015 --- /dev/null +++ b/meta/recipes-sato/leafpad/files/src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch | |||
| @@ -0,0 +1,81 @@ | |||
| 1 | From 316ccb1733a6da726c0e7f0748e3e88ec459ca54 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> | ||
| 3 | Date: Fri, 13 May 2016 14:36:51 -0500 | ||
| 4 | Subject: [PATCH] src/{dialog,gtkprint}.c: Fix security formatting issues | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | ../../../../../../../workspace/sources/leafpad/src/dialog.c: In | ||
| 10 | unction | ||
| 11 | 'run_dialog_message': | ||
| 12 | ../../../../../../../workspace/sources/leafpad/src/dialog.c:39:3: | ||
| 13 | rror: | ||
| 14 | format not a string literal and no format arguments | ||
| 15 | [-Werror=format-security] | ||
| 16 | str); | ||
| 17 | ^ | ||
| 18 | ../../../../../../../workspace/sources/leafpad/src/dialog.c: In | ||
| 19 | unction | ||
| 20 | 'create_dialog_message_question': | ||
| 21 | ../../../../../../../workspace/sources/leafpad/src/dialog.c:64:3: | ||
| 22 | rror: | ||
| 23 | format not a string literal and no format arguments | ||
| 24 | [-Werror=format-security] | ||
| 25 | str); | ||
| 26 | |||
| 27 | ../../../../../../../workspace/sources/leafpad/src/gtkprint.c: In | ||
| 28 | function 'create_error_dialog': | ||
| 29 | ../../../../../../../workspace/sources/leafpad/src/gtkprint.c:168:3: | ||
| 30 | error: format not a string literal and no format arguments | ||
| 31 | [-Werror=format-security] | ||
| 32 | message); | ||
| 33 | |||
| 34 | [YOCTO #9546] | ||
| 35 | |||
| 36 | Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> | ||
| 37 | |||
| 38 | Upstream-status: Pending | ||
| 39 | --- | ||
| 40 | src/dialog.c | 4 ++-- | ||
| 41 | src/gtkprint.c | 2 +- | ||
| 42 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
| 43 | |||
| 44 | diff --git a/src/dialog.c b/src/dialog.c | ||
| 45 | index 14b69d7..8c8f2da 100644 | ||
| 46 | --- a/src/dialog.c | ||
| 47 | +++ b/src/dialog.c | ||
| 48 | @@ -36,7 +36,7 @@ void run_dialog_message(GtkWidget *window, | ||
| 49 | GTK_DIALOG_DESTROY_WITH_PARENT, | ||
| 50 | type, | ||
| 51 | GTK_BUTTONS_NONE, | ||
| 52 | - str); | ||
| 53 | + str, NULL); | ||
| 54 | gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); | ||
| 55 | gtk_dialog_add_buttons(GTK_DIALOG(dialog), | ||
| 56 | GTK_STOCK_OK, GTK_RESPONSE_CANCEL, NULL); | ||
| 57 | @@ -61,7 +61,7 @@ GtkWidget *create_dialog_message_question(GtkWidget *window, gchar *message, ... | ||
| 58 | GTK_DIALOG_DESTROY_WITH_PARENT, | ||
| 59 | GTK_MESSAGE_QUESTION, | ||
| 60 | GTK_BUTTONS_NONE, | ||
| 61 | - str); | ||
| 62 | + str, NULL); | ||
| 63 | gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); | ||
| 64 | gtk_dialog_add_buttons(GTK_DIALOG(dialog), | ||
| 65 | GTK_STOCK_NO, GTK_RESPONSE_NO, | ||
| 66 | diff --git a/src/gtkprint.c b/src/gtkprint.c | ||
| 67 | index 3f39384..e2bb83a 100644 | ||
| 68 | --- a/src/gtkprint.c | ||
| 69 | +++ b/src/gtkprint.c | ||
| 70 | @@ -165,7 +165,7 @@ static void create_error_dialog(GtkTextView *text_view, gchar *message) | ||
| 71 | GTK_DIALOG_DESTROY_WITH_PARENT, | ||
| 72 | GTK_MESSAGE_ERROR, | ||
| 73 | GTK_BUTTONS_NONE, | ||
| 74 | - message); | ||
| 75 | + message, NULL); | ||
| 76 | gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); | ||
| 77 | gtk_dialog_add_buttons(GTK_DIALOG(dialog), | ||
| 78 | GTK_STOCK_OK, GTK_RESPONSE_CANCEL, NULL); | ||
| 79 | -- | ||
| 80 | 2.1.4 | ||
| 81 | |||
diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb index 093b89f779..e6a4b56133 100644 --- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb +++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb | |||
| @@ -11,7 +11,9 @@ DEPENDS = "gtk+ intltool-native libowl gettext-native" | |||
| 11 | REQUIRED_DISTRO_FEATURES = "x11" | 11 | REQUIRED_DISTRO_FEATURES = "x11" |
| 12 | 12 | ||
| 13 | SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ | 13 | SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ |
| 14 | file://leafpad.desktop" | 14 | file://leafpad.desktop \ |
| 15 | file://src-dialog-gtkprint-.c-Fix-security-formatting-issue.patch \ | ||
| 16 | " | ||
| 15 | 17 | ||
| 16 | SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97" | 18 | SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97" |
| 17 | SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c" | 19 | SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c" |
