diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-extended/polkit | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/polkit')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch | 56 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch | 18 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.115.bb (renamed from meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.113.bb) | 10 |
3 files changed, 43 insertions, 41 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch index 4e3af876e..3b0ef5e5a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch @@ -12,16 +12,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- Upstream-Status: Pending +Rebase to 0.115 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- configure.ac | 2 +- src/polkitbackend/polkitbackendinteractiveauthority.c | 6 +++++- - src/polkitbackend/polkitbackendjsauthority.c | 5 ++--- - 3 files changed, 8 insertions(+), 5 deletions(-) + src/polkitbackend/polkitbackendjsauthority.cpp | 2 ++ + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 07982d1..21590b2 100644 +index 8b3e1b1..1c392df 100644 --- a/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_SUBST(EXPAT_LIBS) @@ -31,10 +34,10 @@ index 07982d1..21590b2 100644 if test "x$GCC" = "xyes"; then LDFLAGS="-Wl,--as-needed $LDFLAGS" 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 +++ 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: return ret; } @@ -43,7 +46,7 @@ index 7019356..cf39d77 100644 static GList * get_users_in_net_group (PolkitIdentity *group, 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; } @@ -52,7 +55,7 @@ index 7019356..cf39d77 100644 /* ---------------------------------------------------------------------------------------------------- */ 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)); } @@ -65,43 +68,26 @@ index 7019356..cf39d77 100644 else { g_warning ("Unsupported identity"); -diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c -index 097dcc5..e59b3f7 100644 ---- a/src/polkitbackend/polkitbackendjsauthority.c -+++ b/src/polkitbackend/polkitbackendjsauthority.c -@@ -1498,7 +1498,6 @@ js_polkit_spawn (JSContext *cx, - - /* ---------------------------------------------------------------------------------------------------- */ - -- - 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); +diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp +index 517f3c6..6042dd2 100644 +--- a/src/polkitbackend/polkitbackendjsauthority.cpp ++++ b/src/polkitbackend/polkitbackendjsauthority.cpp +@@ -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()); +#if defined HAVE_INNETGR if (innetgr (netgroup, NULL, /* host */ 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 JS_free (cx, netgroup); 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 diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch index 74647efce..c491abf4a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch @@ -4,9 +4,18 @@ Upstream-Status:Inappropriate [configuration] Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> ---- a/configure.ac 2011-03-04 02:26:20.000000000 +0800 -+++ b/configure.ac.new 2011-07-18 10:14:12.516818852 +0800 -@@ -350,10 +350,10 @@ +Upstream-Status: Inappropriate [oe specific] +Rebase to 0.115 +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_SESSION=system else @@ -21,3 +30,6 @@ Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> fi AC_SUBST(PAM_FILE_INCLUDE_AUTH) +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.113.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.115.bb index f34928fe3..ad0f66a5e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.113.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.115.bb @@ -24,10 +24,13 @@ SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar. file://0001-make-netgroup-support-configurable.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ " -SRC_URI[md5sum] = "4b77776c9e4f897dcfe03b2c34198edf" -SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81" +SRC_URI[md5sum] = "f03b055d6ae5fc8eac76838c7d83d082" +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 () { export GIR_EXTRA_LIBS_PATH="${B}/src/polkit/.libs" @@ -40,6 +43,7 @@ FILES_${PN}_append = " \ ${nonarch_libdir}/${BPN}-1 \ ${datadir}/dbus-1 \ ${datadir}/${BPN}-1 \ + ${datadir}/gettext \ " FILES_${PN}-examples = "${bindir}/*example*" |