diff options
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-support/usermode')
4 files changed, 117 insertions, 0 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch new file mode 100644 index 000000000..76640b0a1 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch @@ -0,0 +1,26 @@ +From fda0ff49968aebc7b27f9711cf6eb7f6c560adc1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 25 Jul 2017 18:28:15 -0700 +Subject: [PATCH] Makefile.am: Link with libm for powl() API + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 4219f28..2a5ceac 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -69,7 +69,7 @@ dist_pkgdata_DATA = usermode.ui + userhelper_SOURCES = userhelper.c userhelper.h shvar.c shvar.h + userhelper_CPPFLAGS = $(AM_CPPFLAGS) -DSYSCONFDIR='"$(sysconfdir)"' + userhelper_LDADD = liblib.a $(LIBUSER_LIBS) $(GLIB_LIBS) $(PAM_LIBS) \ +- $(SELINUX_LIBS) $(EFENCE_LIBS) ++ $(SELINUX_LIBS) $(EFENCE_LIBS) -lm + + userinfo_SOURCES = userinfo.c + userinfo_CPPFLAGS = $(AM_CPPFLAGS) $(PIXMAPDIR_CPPFLAGS) $(SBINDIR_CPPFLAGS) \ +-- +2.13.3 + diff --git a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-fix-compile-failure-against-musl-C-library.patch b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-fix-compile-failure-against-musl-C-library.patch new file mode 100644 index 000000000..bf19f284c --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-fix-compile-failure-against-musl-C-library.patch @@ -0,0 +1,27 @@ +From c77e3f0d4560797f7dc56549ae5ebcc035714a4d Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 20 Jul 2017 23:20:53 -0400 +Subject: [PATCH] fix compile failure against musl C library + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + usermount.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/usermount.c b/usermount.c +index 3aafadd..4107027 100644 +--- a/usermount.c ++++ b/usermount.c +@@ -46,6 +46,7 @@ + #include <limits.h> + #include <locale.h> + #include <mntent.h> ++#include <paths.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-- +2.8.1 + 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 new file mode 100644 index 000000000..9d512d439 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch @@ -0,0 +1,34 @@ +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.111.bb new file mode 100644 index 000000000..3aea2e6bb --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.111.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "The usermode contains the userhelper program, which can be used to allow configured \ +programs to be run with superuser privileges by ordinary users, and several \ +graphical tools for users: \ +* userinfo allows users to change their finger information. \ +* usermount lets users mount, unmount, and format filesystems. \ +* userpasswd allows users to change their passwords. \ +" +HOMEPAGE = "https://pagure.io/usermode" +LICENSE = "GPLv2+" +DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ + gtk+ desktop-file-utils-native \ + startup-notification intltool-native \ + util-linux \ +" + +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 \ + " +SRC_URI[md5sum] = "28ba510fbd8da9f4e86e57d6c31cff29" +SRC_URI[sha256sum] = "3dd0b9639b5bd396b7ea5fada6aaa694dbfdaa3ad06eb95a6eabcdfd02f875c6" + +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit distro_features_check autotools gettext pkgconfig + +EXTRA_OEMAKE += "INSTALL='install -p'" + +REQUIRED_DISTRO_FEATURES = "x11 pam" |
