diff options
Diffstat (limited to 'external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring')
-rw-r--r-- | external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch | 42 | ||||
-rw-r--r-- | external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.34.0.bb (renamed from external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb) | 25 | ||||
-rw-r--r-- | external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb | 29 |
3 files changed, 59 insertions, 37 deletions
diff --git a/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch b/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch new file mode 100644 index 00000000..32eecf8f --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch @@ -0,0 +1,42 @@ +From e6464e01bc1cdf5496be2942d1bac41aa609f47e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 23 May 2019 23:44:06 +0200 +Subject: [PATCH] Set paths to ssh-agent and ssh-add by configure options +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We have no executables in our sysroot so configuration won't find them. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + configure.ac | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4b83664..eda0c96 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -351,8 +351,15 @@ if test "$enable_ssh_agent" = "no"; then + SSH_AGENT=false + SSH_ADD=false + else +- AC_PATH_PROG([SSH_AGENT], [ssh-agent], [no]) +- AC_PATH_PROG([SSH_ADD], [ssh-add], [no]) ++ AC_ARG_WITH([ssh-agent-path], ++ [AC_HELP_STRING([--with-ssh-agent-path=PATH], ++ [path to ssh-agent])], ++ [SSH_AGENT=$with_ssh_agent_path], [SSH_AGENT=no]) ++ AC_ARG_WITH([ssh-add-path], ++ [AC_HELP_STRING([--with-ssh-add-path=PATH], ++ [path to ssh-add])], ++ [SSH_ADD=$with_ssh_add_path], [SSH_ADD=no]) ++ + if test "$SSH_AGENT" = "no" -o "$SSH_ADD" = "no"; then + AC_MSG_ERROR([the ssh-agent and ssh-add commands were not found]) + else +-- +2.20.1 + diff --git a/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb b/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.34.0.bb index 55640625..52c254b2 100644 --- a/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb +++ b/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.34.0.bb @@ -9,10 +9,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " -inherit distro_features_check gnomebase remove-libtool - DEPENDS = " \ - intltool-native \ glib-2.0-native \ gtk+3 \ gcr \ @@ -20,23 +17,35 @@ DEPENDS = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ " -SRC_URI[archive.md5sum] = "e09efe8021944dae404736b5a2adb98e" -SRC_URI[archive.sha256sum] = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99" -SRC_URI += "file://musl.patch" +inherit gnomebase gsettings features_check remove-libtool gettext upstream-version-is-even REQUIRED_DISTRO_FEATURES = "x11" -RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" +SRC_URI[archive.md5sum] = "7c8fd85e46ed4ba1add0288b2ead9aec" +SRC_URI[archive.sha256sum] = "e9cda9542a3e37c61636145e7e9e2513c569092ea8020752a834e1f40ad41943" +SRC_URI += " \ + file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \ + file://musl.patch \ +" + +PACKAGECONFIG ??= "ssh-agent" +PACKAGECONFIG[ssh-agent] = "--enable-ssh-agent --with-ssh-agent-path=${bindir}/ssh-agent --with-ssh-add-path=${bindir}/ssh-add,--disable-ssh-agent,,openssh-misc" EXTRA_OECONF = " \ --disable-doc \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)} \ " - FILES_${PN} += " \ ${datadir}/dbus-1/services \ ${datadir}/p11-kit \ ${base_libdir}/security/*${SOLIBSDEV} \ ${libdir}/pkcs11/gnome-keyring-pkcs11.so \ " + +# fix | gnome-keyring-daemon: insufficient process capabilities, unsecure memory might get used +# This does not make it through pseudo so perform on-target - sigh +pkg_postinst_ontarget_${PN} () { + setcap cap_ipc_lock+ep `which gnome-keyring-daemon` +} +RDEPENDS_${PN} += "libcap-bin" diff --git a/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb b/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb deleted file mode 100644 index ba69e2e0..00000000 --- a/external/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Compatibility library for accessing secrets" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=0914b9d3ebaba41ef2e3e0ae16f296cf \ - file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ -" -SECTION = "x11/gnome/libs" - -inherit gnomebase gtk-doc gobject-introspection - -DEPENDS = "dbus libgcrypt glib-2.0 glib-2.0-native intltool-native" - -SRC_URI[archive.md5sum] = "6696e4f2e9aed4625cdc3af30bd8c238" -SRC_URI[archive.sha256sum] = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783" - - -# Fails to build with thumb-1 (qemuarm) -#| {standard input}: Assembler messages: -#| {standard input}:823: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#3' -#| {standard input}:823: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#13' -#| {standard input}:824: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#29' -#| {standard input}:824: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#19' -#| {standard input}:825: Error: lo register required -- `orr r10,r10,r10' -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv4 = "arm" - |