diff options
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-support')
8 files changed, 215 insertions, 37 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch new file mode 100644 index 000000000..79756b9a0 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch @@ -0,0 +1,62 @@ +From d0537cb7f2dc5877700ad78dfd191515379d4edc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 7 Jan 2016 02:22:51 +0000 +Subject: [PATCH 1/2] Check for issetugid() + +If secure version of getenv is not there then we can use +issetugid() as aid to call getenv() + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + configure.ac | 1 + + lib/config.c | 12 +++++++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1ded1a2..ee19e1f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -125,6 +125,7 @@ AC_TYPE_OFF_T + AC_TYPE_SIZE_T + + AC_CHECK_FUNCS([__secure_getenv secure_getenv]) ++AC_CHECK_FUNCS([issetugid]) + + # Modify CFLAGS after all tests are run (some of them could fail because + # of the -Werror). +diff --git a/lib/config.c b/lib/config.c +index 29e7120..30f9daf 100644 +--- a/lib/config.c ++++ b/lib/config.c +@@ -44,8 +44,10 @@ + # define safe_getenv(string) secure_getenv(string) + #elif defined(HAVE___SECURE_GETENV) + # define safe_getenv(string) __secure_getenv(string) ++#elif defined(HAVE_ISSETUGID) ++# define safe_getenv(string) safe_getenv_issetugid(string) + #else +-# error Neither secure_getenv not __secure_getenv are available ++# error None of secure_getenv, __secure_getenv, or issetugid is available + #endif + + struct config_config { +@@ -59,6 +61,14 @@ struct config_key { + GList *values; + }; + ++static const char* ++safe_getenv_issetugid(const char* name) ++{ ++ if (issetugid ()) ++ return 0; ++ return getenv (name); ++} ++ + /* Compare two section names */ + static int + compare_section_names(gconstpointer a, gconstpointer b) +-- +2.7.0 + diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch new file mode 100644 index 000000000..7c47df22e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch @@ -0,0 +1,34 @@ +From a4857911ece5ebfcdef42aee4c070eb216f39597 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> +Date: Fri, 13 May 2016 11:40:13 -0500 +Subject: [PATCH] modules/files.c: parse_field fix string formating in + g_warnings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[YOCTO #9547] + +Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> + +Upstream-Status: Pending +--- + modules/files.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/files.c b/modules/files.c +index 4ef0a57..35eafc9 100644 +--- a/modules/files.c ++++ b/modules/files.c +@@ -534,7 +534,7 @@ parse_field(const struct format_specifier *format, GValue *value, + string, &err); + if (ret == FALSE) { + g_assert(err != NULL); +- g_warning(lu_strerror(err)); ++ g_warning(lu_strerror(err), NULL); + lu_error_free(&err); + } + return ret; +-- +2.1.4 + diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0002-remove-unused-execinfo.h.patch b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0002-remove-unused-execinfo.h.patch new file mode 100644 index 000000000..4bc0219f1 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0002-remove-unused-execinfo.h.patch @@ -0,0 +1,27 @@ +From 4b2f81f307ffeac12956e5c16e894e5ebb937ea5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 7 Jan 2016 02:26:00 +0000 +Subject: [PATCH 2/2] remove unused execinfo.h + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + lib/error.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/lib/error.c b/lib/error.c +index a5ec30a..443e601 100644 +--- a/lib/error.c ++++ b/lib/error.c +@@ -18,7 +18,6 @@ + #include <config.h> + #include <sys/types.h> + #include <errno.h> +-#include <execinfo.h> + #include <libintl.h> + #include <stdarg.h> + #include <stdlib.h> +-- +2.7.0 + diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb new file mode 100644 index 000000000..7ec54eb16 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb @@ -0,0 +1,35 @@ +SUMMARY = "user and group account administration library" +DESCRIPTION = "The libuser library implements a standardized interface for manipulating and administering user \ +and group accounts" +HOMEPAGE = "https://pagure.io/libuser" +BUGTRACKER = "https://pagure.io/libuser/issues" + +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://lib/user.h;endline=19;md5=76b301f63c39fa992062395efbdc9558 \ + file://samples/testuser.c;endline=19;md5=3b87fa660fa3f4a6bb31d624afe30ba1" + +SECTION = "base" + +SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.xz \ + file://0001-Check-for-issetugid.patch \ + file://0002-remove-unused-execinfo.h.patch \ + file://0001-modules-files.c-parse_field-fix-string-formating-in-.patch \ + " + +SRC_URI[md5sum] = "63e5e5c551e99dc5302b40b80bd6d4f2" +SRC_URI[sha256sum] = "a58ff4fabb01a25043b142185a33eeea961109dd60d4b40b6a9df4fa3cace20b" + +DEPENDS = "popt libpam glib-2.0 python3" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + +inherit autotools gettext python3native python3-dir pkgconfig gtk-doc + +EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" + +PACKAGES += "${PN}-python " + +FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" + diff --git a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch new file mode 100644 index 000000000..277f6e21b --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch @@ -0,0 +1,25 @@ +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> diff --git a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch new file mode 100644 index 000000000..9db700e96 --- /dev/null +++ b/meta-openembedded/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 <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 + diff --git a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch deleted file mode 100644 index 9d512d439..000000000 --- a/meta-openembedded/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 <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 - diff --git a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.111.bb b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.112.bb index 3aea2e6bb..82ccf3eda 100644 --- a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.111.bb +++ b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.112.bb @@ -14,12 +14,13 @@ 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 \ + file://0001-Include-sys-sysmacros.h-for-major-minor.patch \ " -SRC_URI[md5sum] = "28ba510fbd8da9f4e86e57d6c31cff29" -SRC_URI[sha256sum] = "3dd0b9639b5bd396b7ea5fada6aaa694dbfdaa3ad06eb95a6eabcdfd02f875c6" +SRC_URI[md5sum] = "a766a9f7600f573fb6de4655d4162196" +SRC_URI[sha256sum] = "37c4d667209da14082c08df6e48fe955d1532efebd5322f13f94683c6cc10370" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" |