From 9fd30e9c6c98ca4984673339648934f0bce99958 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sun, 3 May 2020 11:48:42 +0200 Subject: [PATCH 1/9] cpprest: update to 2.10.16 and refresh patches Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj --- .../cpprest/cpprest_2.10.15.bb | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb deleted file mode 100644 index dee5ae2564a..00000000000 --- a/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design." -SECTION = "libs/network" -HOMEPAGE = "https://github.com/Microsoft/cpprestsdk/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/license.txt;md5=a2e15b954769218ff912468eecd6a02f" -DEPENDS = "openssl websocketpp zlib boost brotli" - -EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake/cpprestsdk -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" - -SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \ - file://disable-float-tests.patch \ - file://disable-outside-tests.patch " - -# tag 2.10.15 -SRCREV= "b94bc32ff84e815ba44c567f6fe4af5f5f6b3048" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig From 97e0bb97ef56eb523052da5df3842a652d99041d Mon Sep 17 00:00:00 2001 From: Konrad Weihmann Date: Sun, 3 May 2020 16:02:23 +0200 Subject: [PATCH 2/9] php: fix zip package config --enable-zip and --with-libzip were removed in PHP 7.x. These are replaced by --with-zip --with-zlib-dir. Signed-off-by: Konrad Weihmann Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/php/php_7.4.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/php/php_7.4.4.bb b/meta-oe/recipes-devtools/php/php_7.4.4.bb index ff4c28e1337..c1784a78d98 100644 --- a/meta-oe/recipes-devtools/php/php_7.4.4.bb +++ b/meta-oe/recipes-devtools/php/php_7.4.4.bb @@ -81,7 +81,7 @@ PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \ " PACKAGECONFIG_class-native = "" -PACKAGECONFIG[zip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip" +PACKAGECONFIG[zip] = "--with-zip --with-zlib-dir=${STAGING_EXECPREFIXDIR},,libzip" PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ --with-pdo-mysql=mysqlnd \ From fd7e4a0295d960e420aa9a75d0495303e0fc537b Mon Sep 17 00:00:00 2001 From: Konrad Weihmann Date: Sun, 3 May 2020 16:02:24 +0200 Subject: [PATCH 3/9] php: add multibyte string support config Add mbstring to PACKAGECONFIG to enable multibyte string support in php Signed-off-by: Konrad Weihmann Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/php/php_7.4.4.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-devtools/php/php_7.4.4.bb b/meta-oe/recipes-devtools/php/php_7.4.4.bb index c1784a78d98..53cda40fbb8 100644 --- a/meta-oe/recipes-devtools/php/php_7.4.4.bb +++ b/meta-oe/recipes-devtools/php/php_7.4.4.bb @@ -105,6 +105,7 @@ PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache" PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" PACKAGECONFIG[mbregex] = "--enable-mbregex, --disable-mbregex, oniguruma" +PACKAGECONFIG[mbstring] = "--enable-mbstring,," export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" From c9a26475207481ca52f32afbac51dbc5a28dca36 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sun, 3 May 2020 23:13:52 +0200 Subject: [PATCH 4/9] cpprest: Disable one more test requiring internet connection Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj --- .../cpprest/disable-outside-tests.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch index e108e0279df..5f1f8a9f9ce 100644 --- a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch +++ b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch @@ -105,3 +105,23 @@ Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp } // SUITE(connections_and_errors) +--- cpprest-2.10.16.orig/Release/tests/functional/http/client/redirect_tests.cpp ++++ cpprest-2.10.16/Release/tests/functional/http/client/redirect_tests.cpp +@@ -159,7 +159,7 @@ SUITE(redirect_tests) + VERIFY_NO_THROWS(reply.get()); + } + } +- ++/* + TEST(does_not_follow_https_to_http_by_default) + { + handle_timeout([] { +@@ -182,7 +182,7 @@ SUITE(redirect_tests) + ); + }); + } +- ++*/ + TEST_FIXTURE(uri_address, follows_permanent_redirect) + { + #if USING_WINHTTP From ab57a2ac6c27232f64ddd563aed89ef36a6e8a2a Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Sun, 3 May 2020 21:48:01 -0700 Subject: [PATCH 5/9] geany-plugins: Support libgit2 version 1.0 Signed-off-by: Alistair Francis Signed-off-by: Khem Raj --- ...preprocessor-conditionals-compatible.patch | 55 +++++++++++++++++++ .../geany/geany-plugins_1.36.bb | 1 + 2 files changed, 56 insertions(+) create mode 100644 meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch new file mode 100644 index 00000000000..25e5ac4ea28 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch @@ -0,0 +1,55 @@ +From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001 +From: Dominik Schmidt +Date: Sun, 23 Feb 2020 19:15:30 +0100 +Subject: [PATCH] Make libgit2 version preprocessor conditionals compatible + with libgit2-0.99 + +LIBGIT2_SOVERSION is defined as string literal, e.g. "0.99", +from libgit2-0.99 and beyond. Arithmetic checks against this +variable whill hence fail. This patch switches the checks to +compare against the LIBGIT2_VER_* family, which should be more stable. +--- + git-changebar/src/gcb-plugin.c | 6 +++--- + workbench/src/plugin_main.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c +index b7083199..a911815f 100644 +--- a/git-changebar/src/gcb-plugin.c ++++ b/git-changebar/src/gcb-plugin.c +@@ -32,11 +32,11 @@ + #include + #include + +-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 ++#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) ) + # define git_libgit2_init git_threads_init + # define git_libgit2_shutdown git_threads_shutdown + #endif +-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23 ++#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) ) + /* 0.23 added @p binary_cb */ + # define git_diff_buffers(old_buffer, old_len, old_as_path, \ + new_buffer, new_len, new_as_path, options, \ +@@ -45,7 +45,7 @@ + new_buffer, new_len, new_as_path, options, \ + file_cb, hunk_cb, line_cb, payload) + #endif +-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28 ++#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) ) + # define git_buf_dispose git_buf_free + # define git_error_last giterr_last + #endif +diff --git a/workbench/src/plugin_main.c b/workbench/src/plugin_main.c +index 6fa6fc84..25ecdf6d 100644 +--- a/workbench/src/plugin_main.c ++++ b/workbench/src/plugin_main.c +@@ -36,7 +36,7 @@ + #include "tm_control.h" + + +-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 ++#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22)) + # define git_libgit2_init git_threads_init + # define git_libgit2_shutdown git_threads_shutdown + #endif diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb b/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb index a6a0b17dd49..3cf26057330 100644 --- a/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb +++ b/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb @@ -31,6 +31,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ file://0001-Use-pkg-config-to-find-gpgme.patch \ + file://0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch \ " SRC_URI[md5sum] = "91fb4634953702f914d9105da7048a33" SRC_URI[sha256sum] = "ebe18dd699292174622e8cb8745b020ada8a5be3b604ab980af36e8518df7ce6" From 44e458f8801030e06270383a2878ce2d9318746c Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Sun, 3 May 2020 21:48:02 -0700 Subject: [PATCH 6/9] libgit2: Update to v1.0.0 Signed-off-by: Alistair Francis Signed-off-by: Khem Raj --- .../libgit2/{libgit2_0.28.4.bb => libgit2_1.0.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-support/libgit2/{libgit2_0.28.4.bb => libgit2_1.0.0.bb} (64%) diff --git a/meta-oe/recipes-support/libgit2/libgit2_0.28.4.bb b/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb similarity index 64% rename from meta-oe/recipes-support/libgit2/libgit2_0.28.4.bb rename to meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb index 9b9c1910491..fd26a0fe911 100644 --- a/meta-oe/recipes-support/libgit2/libgit2_0.28.4.bb +++ b/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb @@ -1,12 +1,12 @@ SUMMARY = "the Git linkable library" HOMEPAGE = "http://libgit2.github.com/" LICENSE = "GPL-2.0-with-GCC-exception & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=3f2cd5d3cccd71d62066ba619614592b" +LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e" DEPENDS = "curl openssl zlib libssh2 libgcrypt" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.28" -SRCREV = "106a5f27586504ea371528191f0ea3aac2ad432b" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.0" +SRCREV = "7d3c7057f0e774aecd6fc4ef8333e69e5c4873e0" S = "${WORKDIR}/git" From cdcbf40d7cd792eb02921839d764f69f15bbb052 Mon Sep 17 00:00:00 2001 From: Michael Haener Date: Wed, 29 Apr 2020 15:11:51 +0200 Subject: [PATCH 7/9] cockpit: Add recipe version 218 Cockpit is a server manager that makes it easy to administer your GNU/Linux servers via a web browser. Signed-off-by: Michael Haener Signed-off-by: Khem Raj --- .../recipes-webadmin/cockpit/cockpit_218.bb | 178 ++++++++++++++++++ ...01-remove-tests-dep-on-gobject-intro.patch | 77 ++++++++ ...e-use-copy-rule-for-unmodified-files.patch | 47 +++++ .../cockpit/files/cockpit.pam | 8 + 4 files changed, 310 insertions(+) create mode 100644 meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb create mode 100644 meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch create mode 100644 meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch create mode 100644 meta-webserver/recipes-webadmin/cockpit/files/cockpit.pam diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb new file mode 100644 index 00000000000..863793a21a6 --- /dev/null +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb @@ -0,0 +1,178 @@ +SUMMARY = "Admin interface for Linux machines" +DESCRIPTION = "Cockpit makes it easy to administer your GNU/Linux servers via a web browser" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI += " \ + https://github.com/cockpit-project/cockpit/releases/download/${PV}/cockpit-${PV}.tar.xz \ + file://0001-remove-tests-dep-on-gobject-intro.patch \ + file://0002-fix-makefile-use-copy-rule-for-unmodified-files.patch \ + file://cockpit.pam \ + " +SRC_URI[md5sum] = "e69b0b8a75a5d55ddfd9817d857c71af" +SRC_URI[sha256sum] = "5f242cefccd7f1120c9e0310581aa51dbe941d9c4a6d8375c45057dcbb6f2fbb" + +inherit gettext pkgconfig autotools systemd features_check + +DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd" + +COMPATIBLE_HOST_libc-musl = "null" + +RDEPENDS_${PN} += "glib-networking" + +REQUIRED_DISTRO_FEATURES = "systemd pam" + +COCKPIT_USER_GROUP ?= "root" +COCKPIT_WS_USER_GROUP ?= "${COCKPIT_USER_GROUP}" + +EXTRA_AUTORECONF = "-I tools" +EXTRA_OECONF = " \ + --with-cockpit-user=${COCKPIT_USER_GROUP} \ + --with-cockpit-group=${COCKPIT_USER_GROUP} \ + --with-cockpit-ws-instance-user=${COCKPIT_WS_USER_GROUP} \ + --with-cockpit-ws-instance-group=${COCKPIT_WS_USER_GROUP} \ + --disable-doc \ + --with-systemdunitdir=${systemd_system_unitdir} \ +" + +PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp" +PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh" + +PACKAGES =+ " \ + ${PN}-pcp \ + ${PN}-realmd \ + ${PN}-tuned \ + ${PN}-shell \ + ${PN}-systemd \ + ${PN}-users \ + ${PN}-kdump \ + ${PN}-sosreport \ + ${PN}-storaged \ + ${PN}-networkmanager \ + ${PN}-machines \ + ${PN}-selinux \ + ${PN}-playground \ + ${PN}-docker \ + ${PN}-dashboard \ + ${PN}-bridge \ + ${PN}-ws \ + ${PN}-desktop \ +" +SYSTEMD_PACKAGES = "${PN}-ws" + +FILES_${PN}-pcp = " \ + ${libexecdir}/cockpit-pcp \ + ${datadir}/cockpit/pcp \ + ${localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit \ +" +FILES_${PN}-realmd = "${datadir}/cockpit/realmd" +FILES_${PN}-tuned = "${datadir}/cockpit/tuned" +FILES_${PN}-shell = "${datadir}/cockpit/shell" +FILES_${PN}-systemd = "${datadir}/cockpit/systemd" +FILES_${PN}-users = "${datadir}/cockpit/users" +FILES_${PN}-kdump = " \ + ${datadir}/cockpit/kdump \ + ${datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml \ +" +FILES_${PN}-sosreport = " \ + ${datadir}/cockpit/sosreport \ + ${datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml \ + ${datadir}/pixmaps/cockpit-sosreport.png \ +" +FILES_${PN}-storaged = " \ + ${datadir}/cockpit/storaged \ + ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \ +" +FILES_${PN}-networkmanager = "${datadir}/cockpit/networkmanager" +RDEPENDS_${PN}-networkmanager = "networkmanager" + +FILES_${PN}-machines = " \ + ${datadir}/cockpit/machines \ + ${datadir}/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml \ +" +FILES_${PN}-selinux = " \ + ${datadir}/cockpit/selinux \ + ${datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml \ +" +FILES_${PN}-playground = "${datadir}/cockpit/playground" +FILES_${PN}-docker = " \ + ${datadir}/cockpit/docker \ + ${datadir}/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml \ +" +FILES_${PN}-dashboard = "${datadir}/cockpit/dashboard" +ALLOW_EMPTY_${PN}-dashboard = "1" + +FILES_${PN}-bridge = " \ + ${bindir}/cockpit-bridge \ + ${libexec}/cockpit-askpass \ +" +RDEPENDS_${PN}-bridge = "" + +FILES_${PN}-desktop = "${libexecdir}/cockpit-desktop" +RDEPENDS_${PN}-desktop += "bash" + +FILES_${PN}-ws = " \ + ${sysconfdir}/cockpit/ws-certs.d \ + ${sysconfdir}/pam.d/cockpit \ + ${sysconfdir}/issue.d/cockpit.issue \ + ${sysconfdir}/motd.d/cockpit \ + ${datadir}/cockpit/motd/update-motd \ + ${datadir}/cockpit/motd/inactive.motd \ + ${systemd_system_unitdir}/cockpit.service \ + ${systemd_system_unitdir}/cockpit-motd.service \ + ${systemd_system_unitdir}/cockpit.socket \ + ${systemd_system_unitdir}/cockpit-wsinstance-http.socket \ + ${systemd_system_unitdir}/cockpit-wsinstance-http.service \ + ${systemd_system_unitdir}/cockpit-wsinstance-http-redirect.socket \ + ${systemd_system_unitdir}/cockpit-wsinstance-http-redirect.service \ + ${systemd_system_unitdir}/cockpit-wsinstance-https-factory.socket \ + ${systemd_system_unitdir}/cockpit-wsinstance-https-factory@.service \ + ${systemd_system_unitdir}/cockpit-wsinstance-https@.socket \ + ${systemd_system_unitdir}/cockpit-wsinstance-https@.service \ + ${systemd_system_unitdir}/system-cockpithttps.slice \ + ${libdir}/tmpfiles.d/cockpit-tempfiles.conf \ + ${sbindir}/remotectl \ + ${libdir}/security/pam_ssh_add.so \ + ${libdir}/security/pam_cockpit_cert.so \ + ${libexecdir}/cockpit-ws \ + ${libexecdir}/cockpit-wsinstance-factory \ + ${libexecdir}/cockpit-tls \ + ${libexecdir}/cockpit-session \ + ${localstatedir}/lib/cockpit \ + ${datadir}/cockpit/static \ + ${datadir}/cockpit/branding \ +" +CONFFILES_${PN}-ws += " \ + ${sysconfdir}/issue.d/cockpit.issue \ + ${sysconfdir}/motd.d/cockpit \ +" +RDEPENDS_${PN}-ws += "openssl-bin" +SYSTEMD_SERVICE_${PN}-ws = "cockpit.socket" + +FILES_${PN} += " \ + ${datadir}/cockpit/base1 \ + ${sysconfdir}/cockpit/machines.d \ + ${datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy \ + ${datadir}/cockpit/ssh \ + ${libexecdir}/cockpit-ssh \ + ${datadir}/cockpit \ + ${datadir}/metainfo/cockpit.appdata.xml \ + ${datadir}/pixmaps/cockpit.png \ +" +RDEPENDS_${PN} += "${PN}-bridge" + +do_install_append() { + pkgdatadir=${datadir}/cockpit + + # avoid host contamination + find ${D}${datadir}/cockpit -name manifest.json -exec chown root:root {} \; + + chmod 4750 ${D}${libexecdir}/cockpit-session + + install -d "${D}${sysconfdir}/pam.d" + install -p -m 0644 ${WORKDIR}/cockpit.pam ${D}${sysconfdir}/pam.d/cockpit + + # provided by firewalld + rm -rf ${D}${libdir}/firewalld +} diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch new file mode 100644 index 00000000000..2242190a38c --- /dev/null +++ b/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch @@ -0,0 +1,77 @@ +From 788aace494f79e8201b18ebcdf1592b5030c5295 Mon Sep 17 00:00:00 2001 +From: Adrian Freihofer +Date: Wed, 4 Dec 2019 17:23:46 +0100 +Subject: [PATCH] remove tests dep on gobject-intro + +--- + src/ws/Makefile-ws.am | 54 --------------------------------------------------- + 1 file changed, 54 deletions(-) + +diff --git a/src/ws/Makefile-ws.am b/src/ws/Makefile-ws.am +index 009130941..34e13d7fe 100644 +--- a/src/ws/Makefile-ws.am ++++ b/src/ws/Makefile-ws.am +@@ -246,60 +246,6 @@ EXTRA_DIST += \ + + # ---------------------------------------------------------------------------------------------------- + +-noinst_PROGRAMS += test-server +-check_PROGRAMS += test-server +- +-GDBUS_CODEGEN_XML = $(srcdir)/src/ws/com.redhat.Cockpit.DBusTests.xml +- +-GDBUS_CODEGEN_GENERATED = \ +- src/ws/mock-dbus-tests.h \ +- src/ws/mock-dbus-tests.c \ +- $(NULL) +- +-# FIXME: --header/--body and --output are only available from GLib 2.56. +-# just use --generate-c-code and a bit of dependency ugliness for now +-GDBUS_CODEGEN_INVOCATION = \ +- $(AM_V_GEN) gdbus-codegen \ +- --interface-prefix com.redhat.Cockpit.DBusTests \ +- --c-namespace Test \ +- --c-generate-object-manager \ +- --generate-c-code src/ws/mock-dbus-tests \ +- $(GDBUS_CODEGEN_XML) +- +-BUILT_SOURCES += $(GDBUS_CODEGEN_GENERATED) +-CLEANFILES += $(GDBUS_CODEGEN_GENERATED) +-EXTRA_DIST += $(GDBUS_CODEGEN_XML) +- +-src/ws/mock-dbus-tests.h: $(GDBUS_CODEGEN_XML) +- $(GDBUS_CODEGEN_INVOCATION) +- +-src/ws/mock-dbus-tests.c: $(GDBUS_CODEGEN_XML) src/ws/mock-dbus-tests.h +- $(GDBUS_CODEGEN_INVOCATION) +- +-test_server_SOURCES = \ +- src/ws/mock-service.c \ +- src/ws/mock-service.h \ +- src/ws/test-server.c \ +- $(NULL) +- +-nodist_test_server_SOURCES = \ +- $(GDBUS_CODEGEN_GENERATED) \ +- $(NULL) +- +-test_server_CFLAGS = \ +- -I$(builddir)/src/ws \ +- -I$(top_srcdir)/src/ws \ +- -DG_LOG_DOMAIN=\"test-server\" \ +- $(GIO_CFLAGS) \ +- $(COCKPIT_WS_CFLAGS) \ +- $(NULL) +- +-test_server_LDADD = \ +- $(libcockpit_ws_LIBS) \ +- $(GIO_LIBS) \ +- -lpam \ +- $(NULL) +- + WS_CHECKS = \ + test-base64 \ + test-creds \ +-- +2.11.0 + diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch b/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch new file mode 100644 index 00000000000..a1ea9bcfdcb --- /dev/null +++ b/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch @@ -0,0 +1,47 @@ +From 1edf0756bf4fd002f5b60cf2b86d4b97a00aff20 Mon Sep 17 00:00:00 2001 +From: Michael Haener +Date: Wed, 25 Mar 2020 08:32:07 +0100 +Subject: [PATCH] fix(makefile): use copy rule for unmodified files + +--- + pkg/Makefile.am | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/pkg/Makefile.am b/pkg/Makefile.am +index 192b785..03b9787 100644 +--- a/pkg/Makefile.am ++++ b/pkg/Makefile.am +@@ -13,6 +13,33 @@ playground_DATA = \ + dist/playground/extra.de.po: pkg/playground/extra.de.po + $(COPY_RULE) + ++dist/playground/hammer.gif: pkg/playground/hammer.gif ++ $(COPY_RULE) ++ ++dist/sosreport/sosreport.png: pkg/sosreport/sosreport.png ++ $(COPY_RULE) ++ ++dist/apps/default.png: pkg/apps/default.png ++ $(COPY_RULE) ++ ++dist/storaged/images/storage-array.png: pkg/storaged/images/storage-array.png ++ $(COPY_RULE) ++ ++dist/storaged/images/storage-disk.png: pkg/storaged/images/storage-disk.png ++ $(COPY_RULE) ++ ++dist/shell/images/server-error.png: pkg/shell/images/server-error.png ++ $(COPY_RULE) ++ ++dist/shell/images/server-large.png: pkg/shell/images/server-large.png ++ $(COPY_RULE) ++ ++dist/shell/images/server-small.png: pkg/shell/images/server-small.png ++ $(COPY_RULE) ++ ++dist/shell/index.html: pkg/shell/index.html ++ $(COPY_RULE) ++ + metainfodir = ${datarootdir}/metainfo + metainfo_DATA = pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \ + pkg/kdump/org.cockpit-project.cockpit-kdump.metainfo.xml \ diff --git a/meta-webserver/recipes-webadmin/cockpit/files/cockpit.pam b/meta-webserver/recipes-webadmin/cockpit/files/cockpit.pam new file mode 100644 index 00000000000..dd09e29ee0c --- /dev/null +++ b/meta-webserver/recipes-webadmin/cockpit/files/cockpit.pam @@ -0,0 +1,8 @@ +#%PAM-1.0 +auth required pam_unix.so nullok + +account required pam_unix.so + +-session optional pam_systemd.so +session required pam_unix.so +session optional pam_keyinit.so force revoke From 888e5c504c917cc15b15e3d3a4dba41c3196430f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 4 May 2020 10:23:32 -0700 Subject: [PATCH 8/9] remmina: Depend on avahi instead of Avahi-ui avahi-ui is merged into avahi recipe in OE-core see [1] [1] https://lists.openembedded.org/g/openembedded-core/message/137788?p=,,,20,0,0,0::Created,,avahi-ui,20,2,0,73957169 Signed-off-by: Khem Raj --- meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb index 5b663489f8e..c61cc722d9d 100644 --- a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://remmina.org" SECTION = "Support" LICENSE = "GPLv2 & openssl" LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" -DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret libxkbfile" +DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret libxkbfile" DEPENDS_append_libc-musl = " libexecinfo" From 322f9d9a3b4ce195eb4b35170c0fa70ab1f90188 Mon Sep 17 00:00:00 2001 From: Emmanuel Roullit Date: Mon, 4 May 2020 20:35:33 +0200 Subject: [PATCH 9/9] cockpit: fix metainfo.xml file ownership The 'tar -cf - | tar -xf' combo applies an invalid ownership. This is corrected by patching the install target to use the --no-same-owner tar parameter. Signed-off-by: Emmanuel Roullit --- .../recipes-webadmin/cockpit/cockpit_218.bb | 4 +-- ...ix-metainfo.xml-ownership-on-install.patch | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb index 863793a21a6..4ddffb4bdfa 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb @@ -8,6 +8,7 @@ SRC_URI += " \ https://github.com/cockpit-project/cockpit/releases/download/${PV}/cockpit-${PV}.tar.xz \ file://0001-remove-tests-dep-on-gobject-intro.patch \ file://0002-fix-makefile-use-copy-rule-for-unmodified-files.patch \ + file://0003-install-fix-metainfo.xml-ownership-on-install.patch \ file://cockpit.pam \ " SRC_URI[md5sum] = "e69b0b8a75a5d55ddfd9817d857c71af" @@ -165,9 +166,6 @@ RDEPENDS_${PN} += "${PN}-bridge" do_install_append() { pkgdatadir=${datadir}/cockpit - # avoid host contamination - find ${D}${datadir}/cockpit -name manifest.json -exec chown root:root {} \; - chmod 4750 ${D}${libexecdir}/cockpit-session install -d "${D}${sysconfdir}/pam.d" diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch b/meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch new file mode 100644 index 00000000000..b967b1c0ada --- /dev/null +++ b/meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch @@ -0,0 +1,30 @@ +From e56f2b294ca8c805bfd3d715d523bef188c54cb1 Mon Sep 17 00:00:00 2001 +From: Emmanuel Roullit +Date: Sat, 2 May 2020 14:05:35 +0200 +Subject: [PATCH] install: fix metainfo.xml ownership on install + +Signed-off-by: Emmanuel Roullit +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index d9f918e99..9a23e0a7b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -226,10 +226,10 @@ maintainer-clean-local:: + + install-data-local:: $(WEBPACK_INSTALL) + $(MKDIR_P) $(DESTDIR)$(pkgdatadir) +- tar -cf - $^ | tar -C $(DESTDIR)$(pkgdatadir) --strip-components=1 -xvf - ++ tar -cf - $^ | tar --no-same-owner -C $(DESTDIR)$(pkgdatadir) --strip-components=1 -xvf - + install-data-local:: $(WEBPACK_DEBUG) + $(MKDIR_P) $(DESTDIR)$(debugdir)$(pkgdatadir) +- tar -cf - $^ | tar -C $(DESTDIR)$(debugdir)$(pkgdatadir) --strip-components=1 -xvf - ++ tar -cf - $^ | tar --no-same-owner -C $(DESTDIR)$(debugdir)$(pkgdatadir) --strip-components=1 -xvf - + uninstall-local:: + find $(DESTDIR)$(pkgdatadir) -ignore_readdir_race -type f -exec rm -f {} \; + find $(DESTDIR)$(pkgdatadir) -ignore_readdir_race -type d -empty -delete +-- +2.17.1 +