usermode: 1.112 -> 1.113

Drop backported patches
- 0001-Missing-n-in-translated-string.patch
- 0001-Include-sys-sysmacros.h-for-major-minor.patch

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia 2018-12-18 15:38:40 +08:00 committed by Khem Raj
parent 233a17e09f
commit 9bebac99a0
3 changed files with 2 additions and 57 deletions

View File

@ -1,25 +0,0 @@
From 75539659396b18110d5a52a8a32845254b4d8eca Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 11 Aug 2018 18:25:47 -0700
Subject: [PATCH] Include sys/sysmacros.h for major/minor
usermount.c:238: undefined reference to `major'
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
usermount.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/usermount.c b/usermount.c
index 4107027..21ef77f 100644
--- a/usermount.c
+++ b/usermount.c
@@ -40,6 +40,7 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
+#include <sys/sysmacros.h>
#include <errno.h>
#include <glob.h>
#include <libintl.h>

View File

@ -1,28 +0,0 @@
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

View File

@ -16,11 +16,9 @@ DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '',
SRC_URI = "https://releases.pagure.org/${BPN}/${BPN}-${PV}.tar.xz \
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 \
file://0001-Include-sys-sysmacros.h-for-major-minor.patch \
"
SRC_URI[md5sum] = "a766a9f7600f573fb6de4655d4162196"
SRC_URI[sha256sum] = "37c4d667209da14082c08df6e48fe955d1532efebd5322f13f94683c6cc10370"
SRC_URI[md5sum] = "eadfbff18578b645096b6fa61854b41d"
SRC_URI[sha256sum] = "99fbfd248b411ed0e7c44d1957b0ecde699b5a968a4db5d37228e82e7b1ba092"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"