mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-07 15:40:01 +00:00
usermode: 1.111 -> 1.112
- Drop 0001-formatting-issues.patch which upstream fixed the issue Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+28
@@ -0,0 +1,28 @@
|
|||||||
|
From 7cbc6441cd06e0c0bb51ac37c8f22b0fd51f12f2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jiri Kucera <jkucera@redhat.com>
|
||||||
|
Date: Wed, 11 Apr 2018 17:13:44 +0200
|
||||||
|
Subject: [PATCH] Missing \n in translated string
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
|
||||||
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
---
|
||||||
|
po/tr.po | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/po/tr.po b/po/tr.po
|
||||||
|
index 84e5021..a28e947 100644
|
||||||
|
--- a/po/tr.po
|
||||||
|
+++ b/po/tr.po
|
||||||
|
@@ -408,7 +408,7 @@ msgstr "Grafik pencere açılamadı ve uçbirim denetimi bulunamadı.\n"
|
||||||
|
#: ../../po/../userpasswd.c:37
|
||||||
|
#, c-format
|
||||||
|
msgid "Unexpected command-line arguments\n"
|
||||||
|
-msgstr "Beklenmeyen komut satırı argümanları"
|
||||||
|
+msgstr "Beklenmeyen komut satırı argümanları\n"
|
||||||
|
|
||||||
|
#: ../../po/../userinfo.c:411
|
||||||
|
#, c-format
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
From 7a316dad0697af2ef4e8079a5af51565a8195aa6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
|
||||||
Date: Mon, 24 Jul 2017 01:42:30 -0400
|
|
||||||
Subject: [PATCH] userhelper.c: fix formatting issues
|
|
||||||
|
|
||||||
Fixed when compile with "-Wformat -Wformat-security -Werror=format-security":
|
|
||||||
|../usermode-1.111/userhelper.c:585:4: error: format not a string
|
|
||||||
literal and no format arguments [-Werror=format-security]
|
|
||||||
| text = g_strdup_printf(dgettext(data->domain, data->banner));
|
|
||||||
| ^~~~
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
||||||
---
|
|
||||||
userhelper.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/userhelper.c b/userhelper.c
|
|
||||||
index 76ad492..ee0da49 100644
|
|
||||||
--- a/userhelper.c
|
|
||||||
+++ b/userhelper.c
|
|
||||||
@@ -582,7 +582,7 @@ converse_console(int num_msg, const struct pam_message **msg,
|
|
||||||
|
|
||||||
if (banner == 0) {
|
|
||||||
if ((data->banner != NULL) && (data->domain != NULL)) {
|
|
||||||
- text = g_strdup_printf(dgettext(data->domain, data->banner));
|
|
||||||
+ text = g_strdup_printf("%s", dgettext(data->domain, data->banner));
|
|
||||||
} else {
|
|
||||||
if ((service != NULL) && (strlen(service) > 0)) {
|
|
||||||
if (data->fallback_allowed) {
|
|
||||||
--
|
|
||||||
2.8.1
|
|
||||||
|
|
||||||
+3
-3
@@ -14,12 +14,12 @@ DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '',
|
|||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI = "https://releases.pagure.org/${BPN}/${BPN}-${PV}.tar.xz \
|
SRC_URI = "https://releases.pagure.org/${BPN}/${BPN}-${PV}.tar.xz \
|
||||||
file://0001-formatting-issues.patch \
|
|
||||||
file://0001-fix-compile-failure-against-musl-C-library.patch \
|
file://0001-fix-compile-failure-against-musl-C-library.patch \
|
||||||
file://0001-Makefile.am-Link-with-libm-for-powl-API.patch \
|
file://0001-Makefile.am-Link-with-libm-for-powl-API.patch \
|
||||||
|
file://0001-Missing-n-in-translated-string.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "28ba510fbd8da9f4e86e57d6c31cff29"
|
SRC_URI[md5sum] = "a766a9f7600f573fb6de4655d4162196"
|
||||||
SRC_URI[sha256sum] = "3dd0b9639b5bd396b7ea5fada6aaa694dbfdaa3ad06eb95a6eabcdfd02f875c6"
|
SRC_URI[sha256sum] = "37c4d667209da14082c08df6e48fe955d1532efebd5322f13f94683c6cc10370"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
|
||||||
|
|
||||||
Reference in New Issue
Block a user