From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mail.openembedded.org (Postfix) with ESMTP id 98E9878D07 for ; Wed, 1 Aug 2018 07:31:54 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2018 00:31:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,431,1526367600"; d="scan'208";a="76318255" Received: from anmitta2-mobl1.png.intel.com (HELO [10.221.21.171]) ([10.221.21.171]) by fmsmga004.fm.intel.com with ESMTP; 01 Aug 2018 00:31:54 -0700 To: Hongxu Jia , raj.khem@gmail.com References: <2c1741bf8ecf487a42eda85c8c4f962854f24d90.1533107855.git.hongxu.jia@windriver.com> From: Anuj Mittal Message-ID: Date: Wed, 1 Aug 2018 15:31:53 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <2c1741bf8ecf487a42eda85c8c4f962854f24d90.1533107855.git.hongxu.jia@windriver.com> Cc: openembedded-devel@lists.openembedded.org Subject: Re: [PATCH 02/16] usermode: 0.111 -> 0.112 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Aug 2018 07:31:54 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Should the subject be 1.111 -> 1.112? On 08/01/2018 03:21 PM, Hongxu Jia wrote: > - Drop 0001-formatting-issues.patch which upstream fixed the issue > > Signed-off-by: Hongxu Jia > --- > .../0001-Missing-n-in-translated-string.patch | 28 ++++++++++++++++++ > .../usermode/usermode/0001-formatting-issues.patch | 34 ---------------------- > .../{usermode_1.111.bb => usermode_1.112.bb} | 6 ++-- > 3 files changed, 31 insertions(+), 37 deletions(-) > create mode 100644 meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch > delete mode 100644 meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch > rename meta-gnome/recipes-support/usermode/{usermode_1.111.bb => usermode_1.112.bb} (84%) > > diff --git a/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch b/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch > new file mode 100644 > index 0000000..9db700e > --- /dev/null > +++ b/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch > @@ -0,0 +1,28 @@ > +From 7cbc6441cd06e0c0bb51ac37c8f22b0fd51f12f2 Mon Sep 17 00:00:00 2001 > +From: Jiri Kucera > +Date: Wed, 11 Apr 2018 17:13:44 +0200 > +Subject: [PATCH] Missing \n in translated string > + > +Upstream-Status: Backport > + > +Signed-off-by: Hongxu Jia > +--- > + 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 > + > diff --git a/meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch b/meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch > deleted file mode 100644 > index 9d512d4..0000000 > --- a/meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -From 7a316dad0697af2ef4e8079a5af51565a8195aa6 Mon Sep 17 00:00:00 2001 > -From: Hongxu Jia > -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 > ---- > - 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 > - > diff --git a/meta-gnome/recipes-support/usermode/usermode_1.111.bb b/meta-gnome/recipes-support/usermode/usermode_1.112.bb > similarity index 84% > rename from meta-gnome/recipes-support/usermode/usermode_1.111.bb > rename to meta-gnome/recipes-support/usermode/usermode_1.112.bb > index 3aea2e6..51f81a1 100644 > --- a/meta-gnome/recipes-support/usermode/usermode_1.111.bb > +++ b/meta-gnome/recipes-support/usermode/usermode_1.112.bb > @@ -14,12 +14,12 @@ DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', > " > > 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-Makefile.am-Link-with-libm-for-powl-API.patch \ > + file://0001-Missing-n-in-translated-string.patch \ > " > -SRC_URI[md5sum] = "28ba510fbd8da9f4e86e57d6c31cff29" > -SRC_URI[sha256sum] = "3dd0b9639b5bd396b7ea5fada6aaa694dbfdaa3ad06eb95a6eabcdfd02f875c6" > +SRC_URI[md5sum] = "a766a9f7600f573fb6de4655d4162196" > +SRC_URI[sha256sum] = "37c4d667209da14082c08df6e48fe955d1532efebd5322f13f94683c6cc10370" > > LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" > >