mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

polkit: 0.113 -> 0.115

Browse Source 
- Rebase patches to 0.115
  0001-make-netgroup-support-configurable.patch
  polkit-1_pam.patch

- Add --disable-libelogind which OE does not have recipe
  libelogind

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-07-16 15:31:42 +08:00
committed by Khem Raj
parent 50e8ed5fd4
commit 5cf053a7f5
3 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch
+21 -35
View File
@@ -12,16 +12,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- ---
Upstream-Status: Pending Upstream-Status: Pending
Rebase to 0.115
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
configure.ac | 2 +- configure.ac | 2 +-
src/polkitbackend/polkitbackendinteractiveauthority.c | 6 +++++- src/polkitbackend/polkitbackendinteractiveauthority.c | 6 +++++-
src/polkitbackend/polkitbackendjsauthority.c | 5 ++--- src/polkitbackend/polkitbackendjsauthority.cpp | 2 ++
3 files changed, 8 insertions(+), 5 deletions(-) 3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 07982d1..21590b2 100644 index 8b3e1b1..1c392df 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -158,7 +158,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], @@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"],
[AC_MSG_ERROR([Can't find expat library. Please install expat.])]) [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
AC_SUBST(EXPAT_LIBS) AC_SUBST(EXPAT_LIBS)
@@ -31,10 +34,10 @@ index 07982d1..21590b2 100644
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes"; then
LDFLAGS="-Wl,--as-needed $LDFLAGS" LDFLAGS="-Wl,--as-needed $LDFLAGS"
diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
index 7019356..cf39d77 100644 index cb6fdab..de3f752 100644
--- a/src/polkitbackend/polkitbackendinteractiveauthority.c --- a/src/polkitbackend/polkitbackendinteractiveauthority.c
+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c +++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
@@ -2213,7 +2213,7 @@ get_users_in_group (PolkitIdentity *group, @@ -2224,7 +2224,7 @@ get_users_in_group (PolkitIdentity *group,
out: out:
return ret; return ret;
} }
@@ -43,7 +46,7 @@ index 7019356..cf39d77 100644
static GList * static GList *
get_users_in_net_group (PolkitIdentity *group, get_users_in_net_group (PolkitIdentity *group,
gboolean include_root) gboolean include_root)
@@ -2270,6 +2270,8 @@ get_users_in_net_group (PolkitIdentity *group, @@ -2285,6 +2285,8 @@ get_users_in_net_group (PolkitIdentity *group,
return ret; return ret;
} }
@@ -52,7 +55,7 @@ index 7019356..cf39d77 100644
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
static void static void
@@ -2355,10 +2357,12 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent, @@ -2369,10 +2371,12 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent,
{ {
user_identities = g_list_concat (user_identities, get_users_in_group (identity, FALSE)); user_identities = g_list_concat (user_identities, get_users_in_group (identity, FALSE));
} }
@@ -65,43 +68,26 @@ index 7019356..cf39d77 100644
else else
{ {
g_warning ("Unsupported identity"); g_warning ("Unsupported identity");
diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp
index 097dcc5..e59b3f7 100644 index 517f3c6..6042dd2 100644
--- a/src/polkitbackend/polkitbackendjsauthority.c --- a/src/polkitbackend/polkitbackendjsauthority.cpp
+++ b/src/polkitbackend/polkitbackendjsauthority.c +++ b/src/polkitbackend/polkitbackendjsauthority.cpp
@@ -1498,7 +1498,6 @@ js_polkit_spawn (JSContext *cx, @@ -1502,6 +1502,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx,
user = JS_EncodeString (cx, args[0].toString());
/* ---------------------------------------------------------------------------------------------------- */ netgroup = JS_EncodeString (cx, args[1].toString());
-
static JSBool
js_polkit_user_is_in_netgroup (JSContext *cx,
unsigned argc,
@@ -1518,6 +1517,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx,
user = JS_EncodeString (cx, user_str);
netgroup = JS_EncodeString (cx, netgroup_str);
+#if defined HAVE_INNETGR +#if defined HAVE_INNETGR
if (innetgr (netgroup, if (innetgr (netgroup,
NULL, /* host */ NULL, /* host */
user, user,
@@ -1525,6 +1525,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, @@ -1509,6 +1510,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx,
{ {
is_in_netgroup = JS_TRUE; is_in_netgroup = true;
} }
+#endif +#endif
JS_free (cx, netgroup); JS_free (cx, netgroup);
JS_free (cx, user); JS_free (cx, user);
@@ -1536,8 +1537,6 @@ js_polkit_user_is_in_netgroup (JSContext *cx,
return ret;
}
-
-
/* ---------------------------------------------------------------------------------------------------- */
typedef struct
-- --
2.7.0 2.7.4
meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch
+15 -3
View File
@@ -4,9 +4,18 @@ Upstream-Status:Inappropriate [configuration]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
--- a/configure.ac 2011-03-04 02:26:20.000000000 +0800 Upstream-Status: Inappropriate [oe specific]
+++ b/configure.ac.new 2011-07-18 10:14:12.516818852 +0800 Rebase to 0.115
@@ -350,10 +350,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 36df239..8b3e1b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -471,10 +471,10 @@ elif test x$with_os_type = xfreebsd -o x$with_os_type = xnetbsd; then
PAM_FILE_INCLUDE_PASSWORD=system PAM_FILE_INCLUDE_PASSWORD=system
PAM_FILE_INCLUDE_SESSION=system PAM_FILE_INCLUDE_SESSION=system
else else
@@ -21,3 +30,6 @@ Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
fi fi
AC_SUBST(PAM_FILE_INCLUDE_AUTH) AC_SUBST(PAM_FILE_INCLUDE_AUTH)
--
2.7.4
meta-oe/recipes-extended/polkit/polkit_0.113.bb → meta-oe/recipes-extended/polkit/polkit_0.115.bb
+7 -3
View File
@@ -24,10 +24,13 @@ SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.
file://0001-make-netgroup-support-configurable.patch \ file://0001-make-netgroup-support-configurable.patch \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
" "
SRC_URI[md5sum] = "4b77776c9e4f897dcfe03b2c34198edf" SRC_URI[md5sum] = "f03b055d6ae5fc8eac76838c7d83d082"
SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81" SRC_URI[sha256sum] = "2f87ecdabfbd415c6306673ceadc59846f059b18ef2fce42bac63fe283f12131"
EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages" EXTRA_OECONF = "--with-os-type=moblin \
--disable-man-pages \
--disable-libelogind \
"
do_compile_prepend () { do_compile_prepend () {
export GIR_EXTRA_LIBS_PATH="${B}/src/polkit/.libs" export GIR_EXTRA_LIBS_PATH="${B}/src/polkit/.libs"
@@ -40,6 +43,7 @@ FILES_${PN}_append = " \
${nonarch_libdir}/${BPN}-1 \ ${nonarch_libdir}/${BPN}-1 \
${datadir}/dbus-1 \ ${datadir}/dbus-1 \
${datadir}/${BPN}-1 \ ${datadir}/${BPN}-1 \
${datadir}/gettext \
" "
FILES_${PN}-examples = "${bindir}/*example*" FILES_${PN}-examples = "${bindir}/*example*"