diff options
Diffstat (limited to 'meta-webserver')
25 files changed, 91 insertions, 323 deletions
diff --git a/meta-webserver/README b/meta-webserver/README.md index d23f6cc65c..d23f6cc65c 100644 --- a/meta-webserver/README +++ b/meta-webserver/README.md diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch new file mode 100644 index 0000000000..996eabf586 --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch @@ -0,0 +1,31 @@ +From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00 2001 +From: Valeria Petrov <valeria.petrov@spinetix.com> +Date: Tue, 18 Apr 2023 15:38:53 +0200 +Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory to + include path if mod_rewrite is enabled. + +Upstream-Status: Accepted [https://svn.apache.org/viewvc?view=revision&revision=1909241] + +--- + modules/mappers/config9.m4 | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4 +index 55a97ab993..7120b729b7 100644 +--- a/modules/mappers/config9.m4 ++++ b/modules/mappers/config9.m4 +@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to user-specific directories, , , mos + APACHE_MODULE(alias, mapping of requests to different filesystem parts, , , yes) + APACHE_MODULE(rewrite, rule based URL manipulation, , , most) + ++if test "x$enable_rewrite" != "xno"; then ++ # mod_rewrite needs test_char.h ++ APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) ++fi ++ + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current]) + + APACHE_MODPATH_FINISH +-- +2.25.1 + diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb index 4f30eca59e..00f8aaa415 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb @@ -16,6 +16,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ file://0008-Fix-perl-install-directory-to-usr-bin.patch \ file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \ file://0001-make_exports.awk-not-expose-the-path.patch \ + file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch \ " SRC_URI:append:class-target = " \ @@ -27,7 +28,7 @@ SRC_URI:append:class-target = " \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" -SRC_URI[sha256sum] = "eb397feeefccaf254f8d45de3768d9d68e8e73851c49afd5b7176d1ecf80c340" +SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a" S = "${WORKDIR}/httpd-${PV}" diff --git a/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf b/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf index ff2c587046..0852a8859a 100644 --- a/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf +++ b/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf @@ -1,2 +1,2 @@ -d /var/run/apache2 0755 root root - +d /run/apache2 0755 root root - d /var/log/apache2 0755 root root - diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch index f3be7c6e52..b16060f2a1 100644 --- a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch +++ b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch @@ -7,6 +7,7 @@ Fixes errors like | Makefile.am: error: required file './README' not found | Makefile.am: error: required file './ChangeLog' not found +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- configure.ac | 2 +- diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch index d4c0b6e8c6..1d6a2182bd 100644 --- a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch +++ b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch @@ -5,6 +5,7 @@ Subject: [PATCH] make: Do not build po files Target fails to build +Upstream-Status: Inappropriate [Cross-compile specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- Makefile.am | 2 +- diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb index 7100ef4341..3dc4ca8bbb 100644 --- a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb +++ b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb @@ -75,3 +75,5 @@ python() { if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') } + +CVE_PRODUCT += "cherokee_web_server" diff --git a/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch b/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch deleted file mode 100644 index 7a229513b6..0000000000 --- a/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b0526a9b5325bd4758dad8d14efd85c98ef2ebff Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 14 Jul 2017 18:25:23 -0700 -Subject: [PATCH] configure: Respect LIBS variable from env - -For musl we need to pass -lexecinfo from env -this change accomodates that - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 4286c34..f1c65db 100755 ---- a/configure -+++ b/configure -@@ -620,7 +620,7 @@ LIBDEFS = -DSHAREDLIB -fPIC \$(DEFS) - INCDIR = ./include - LDFLAGS = $LDFLAGS - DESTDIR = ../bin/monkey --LIBS = -ldl $libs -+LIBS = -ldl $libs ${LIBS} - OBJ = monkey.o mk_method.o mk_mimetype.o mk_vhost.o mk_request.o \\ - mk_header.o mk_config.o mk_signals.o \\ - mk_user.o mk_utils.o mk_epoll.o mk_scheduler.o \\ --- -2.13.3 - diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index d3e22757c4..ee5dc16198 100644 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -39,6 +39,10 @@ inherit cmake pkgconfig update-rc.d systemd OECMAKE_GENERATOR = "Unix Makefiles" +do_configure:append() { + sed -i -e 's|${STAGING_BINDIR_TOOLCHAIN}/||g' ${S}/include/monkey/mk_env.h +} + do_install:append() { rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/run ${D}${localstatedir}/log rmdir --ignore-fail-on-non-empty ${D}${localstatedir} diff --git a/meta-webserver/recipes-httpd/nginx/files/CVE-2021-3618.patch b/meta-webserver/recipes-httpd/nginx/files/CVE-2021-3618.patch deleted file mode 100644 index be42a1ed5e..0000000000 --- a/meta-webserver/recipes-httpd/nginx/files/CVE-2021-3618.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 6dafcdebde58577f4fcb190be46a0eb910cf1b96 Mon Sep 17 00:00:00 2001 -From: Maxim Dounin <mdounin@mdounin.ru> -Date: Wed, 19 May 2021 03:13:31 +0300 -Subject: [PATCH 1/1] Mail: max_errors directive. - -Similarly to smtpd_hard_error_limit in Postfix and smtp_max_unknown_commands -in Exim, specifies the number of errors after which the connection is closed. ---- end of original header --- - -CVE: CVE-2021-3618 - -Upstream-Status: Backport - https://github.com/nginx/nginx.git - commit 173f16f736c10eae46cd15dd861b04b82d91a37a - -Signed-off-by: Joe Slater <joe.slater@windriver.com> ---- - src/mail/ngx_mail.h | 3 +++ - src/mail/ngx_mail_core_module.c | 10 ++++++++++ - src/mail/ngx_mail_handler.c | 15 ++++++++++++++- - 3 files changed, 27 insertions(+), 1 deletion(-) - -diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h -index b865a3b9..76cae37a 100644 ---- a/src/mail/ngx_mail.h -+++ b/src/mail/ngx_mail.h -@@ -115,6 +115,8 @@ typedef struct { - ngx_msec_t timeout; - ngx_msec_t resolver_timeout; - -+ ngx_uint_t max_errors; -+ - ngx_str_t server_name; - - u_char *file_name; -@@ -231,6 +233,7 @@ typedef struct { - ngx_uint_t command; - ngx_array_t args; - -+ ngx_uint_t errors; - ngx_uint_t login_attempt; - - /* used to parse POP3/IMAP/SMTP command */ -diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c -index 40831242..115671ca 100644 ---- a/src/mail/ngx_mail_core_module.c -+++ b/src/mail/ngx_mail_core_module.c -@@ -85,6 +85,13 @@ static ngx_command_t ngx_mail_core_commands[] = { - offsetof(ngx_mail_core_srv_conf_t, resolver_timeout), - NULL }, - -+ { ngx_string("max_errors"), -+ NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, -+ ngx_conf_set_num_slot, -+ NGX_MAIL_SRV_CONF_OFFSET, -+ offsetof(ngx_mail_core_srv_conf_t, max_errors), -+ NULL }, -+ - ngx_null_command - }; - -@@ -163,6 +170,8 @@ ngx_mail_core_create_srv_conf(ngx_conf_t *cf) - cscf->timeout = NGX_CONF_UNSET_MSEC; - cscf->resolver_timeout = NGX_CONF_UNSET_MSEC; - -+ cscf->max_errors = NGX_CONF_UNSET_UINT; -+ - cscf->resolver = NGX_CONF_UNSET_PTR; - - cscf->file_name = cf->conf_file->file.name.data; -@@ -182,6 +191,7 @@ ngx_mail_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) - ngx_conf_merge_msec_value(conf->resolver_timeout, prev->resolver_timeout, - 30000); - -+ ngx_conf_merge_uint_value(conf->max_errors, prev->max_errors, 5); - - ngx_conf_merge_str_value(conf->server_name, prev->server_name, ""); - -diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c -index 0aaa0e78..71b81512 100644 ---- a/src/mail/ngx_mail_handler.c -+++ b/src/mail/ngx_mail_handler.c -@@ -871,7 +871,20 @@ ngx_mail_read_command(ngx_mail_session_t *s, ngx_connection_t *c) - return NGX_MAIL_PARSE_INVALID_COMMAND; - } - -- if (rc == NGX_IMAP_NEXT || rc == NGX_MAIL_PARSE_INVALID_COMMAND) { -+ if (rc == NGX_MAIL_PARSE_INVALID_COMMAND) { -+ -+ s->errors++; -+ -+ if (s->errors >= cscf->max_errors) { -+ ngx_log_error(NGX_LOG_INFO, c->log, 0, -+ "client sent too many invalid commands"); -+ s->quit = 1; -+ } -+ -+ return rc; -+ } -+ -+ if (rc == NGX_IMAP_NEXT) { - return rc; - } - --- -2.25.1 - diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 260f5f320c..1ea32f7c94 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -44,6 +44,8 @@ PACKAGECONFIG[http2] = "--with-http_v2_module,," PACKAGECONFIG[ssl] = "--with-http_ssl_module,,openssl" PACKAGECONFIG[http-auth-request] = "--with-http_auth_request_module,," PACKAGECONFIG[ipv6] = "--with-ipv6,," +PACKAGECONFIG[webdav] = "--with-http_dav_module,," +PACKAGECONFIG[stream] = "--with-stream,," do_configure () { if [ "${SITEINFO_BITS}" = "64" ]; then @@ -147,7 +149,7 @@ do_install () { pkg_postinst:${PN} () { if [ -z "$D" ]; then - if type systemd-tmpfiles >/dev/null; then + if type systemd-tmpfiles >/dev/null 2>&1; then systemd-tmpfiles --create elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then ${sysconfdir}/init.d/populate-volatile.sh update diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb deleted file mode 100644 index d686c627f2..0000000000 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require nginx.inc - -SRC_URI += "file://CVE-2021-3618.patch" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=206629dc7c7b3e87acb31162363ae505" - -SRC_URI[md5sum] = "8ca6edd5076bdfad30a69c9c9b41cc68" -SRC_URI[sha256sum] = "e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49" - diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.25.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.25.1.bb new file mode 100644 index 0000000000..702eac39e2 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.25.1.bb @@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=79ad2eb837299421c4435dedc8897b3d" + +SRC_URI[sha256sum] = "f09071ac46e0ea3adc0008ef0baca229fc6b4be4533baef9bbbfba7de29a8602" + diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.0.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.1.bb index 45de455643..34b710e885 100644 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.0.bb +++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.phpmyadmin.net" # Main code is GPLv2, vendor/tecnickcom/tcpdf is under LGPLv3, js/jquery is under MIT LICENSE = "GPL-2.0-only & LGPL-3.0-only & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=dd6470bbcd3436ca317f82d34abaf688 \ + file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=d0ff7e060074497f34481cf574e8a581 \ file://js/vendor/jquery/MIT-LICENSE.txt;md5=de877aa6d744cc160ff41c26a8e4811f \ " @@ -11,7 +11,7 @@ SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-la file://apache.conf \ " -SRC_URI[sha256sum] = "66da31ca295f06182ac3f2e6e96057dc824c459baedf4b29de6ed0d3be039230" +SRC_URI[sha256sum] = "373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557" UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/" UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P<pver>\d+(\.\d+)+)-all-languages.tar.xz" diff --git a/meta-webserver/recipes-php/xdebug/xdebug_3.1.1.bb b/meta-webserver/recipes-php/xdebug/xdebug_3.2.0.bb index 580ae7e89a..fe6fc5bf9a 100644 --- a/meta-webserver/recipes-php/xdebug/xdebug_3.1.1.bb +++ b/meta-webserver/recipes-php/xdebug/xdebug_3.2.0.bb @@ -6,7 +6,7 @@ DEPENDS = "php re2c-native" SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" -SRC_URI[sha256sum] = "9be3ae0fdb4dc4a4c68084626cddc56f12396487e309a8c8dd318f0f900d1a68" +SRC_URI[sha256sum] = "7769b20eecdadf5fbe9f582512c10b394fb575b6f7a8c3a3a82db6883e0032b7" UPSTREAM_CHECK_REGEX = "xdebug-(?P<pver>\d+(\.\d+)+)\.tgz" diff --git a/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi-1.6.4/fix_configure_ipv6_test.patch b/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi-1.6.4/fix_configure_ipv6_test.patch deleted file mode 100644 index 9409dd2b15..0000000000 --- a/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi-1.6.4/fix_configure_ipv6_test.patch +++ /dev/null @@ -1,35 +0,0 @@ -Testing for IPv6 support got broken by configure.ac changes in 1.6.4 -As a temp workaround, revert back to the 1.6.3 version. - -Upstream-Status: Pending - ---- spawn-fcgi-1.6.4/configure.ac -+++ spawn-fcgi-1.6.3/configure.ac -@@ -66,8 +47,8 @@ - # Check for IPv6 support - - AC_ARG_ENABLE(ipv6, -- AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]), -- [case "${enableval}" in -+ AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]), -+ [case "${enableval}" in - yes) ipv6=true ;; - no) ipv6=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-ipv6) ;; -@@ -75,13 +56,10 @@ - - if test x$ipv6 = xtrue; then - AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support, -- [AC_TRY_LINK([[ --#include <sys/types.h> -+ [AC_TRY_LINK([ #include <sys/types.h> - #include <sys/socket.h> --#include <netinet/in.h> -- ]], [[ --struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0; -- ]], [ac_cv_ipv6_support=yes], [ac_cv_ipv6_support=no])]) -+#include <netinet/in.h>], [struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0; ], -+ [ac_cv_ipv6_support=yes], [ac_cv_ipv6_support=no])]) - - if test "$ac_cv_ipv6_support" = yes; then - AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support]) diff --git a/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb b/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.5.bb index 808d4528c1..307919f775 100644 --- a/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb +++ b/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.5.bb @@ -4,11 +4,9 @@ HOMEPAGE = "http://redmine.lighttpd.net/projects/spawn-fcgi" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" -SRC_URI = "http://download.lighttpd.net/spawn-fcgi/releases-1.6.x/spawn-fcgi-${PV}.tar.gz \ - file://fix_configure_ipv6_test.patch" +SRC_URI = "http://download.lighttpd.net/spawn-fcgi/releases-1.6.x/spawn-fcgi-${PV}.tar.gz" -SRC_URI[md5sum] = "e970de4efe8045c01dd76280f39901aa" -SRC_URI[sha256sum] = "ab327462cb99894a3699f874425a421d934f957cb24221f00bb888108d9dd09e" +SRC_URI[sha256sum] = "a72d7bf7fb6d1a0acda89c93d4f060bf77a2dba97ddcfecd00f11e708f592c40" inherit autotools diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_289.bb index 93198e3569..2f920b417f 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_289.bb @@ -6,12 +6,10 @@ 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://0001-Warn-not-error-if-xsltproc-is-not-found.patch \ file://cockpit.pam \ " -SRC_URI[sha256sum] = "dde91a157ee8514112334653fa2775a99d71bd1b604067a48eaf7411114d19de" +SRC_URI[sha256sum] = "3f8e369b21dbe9f5e05ac6ffd8c7a58ad5759065bea29b3b14c937a17f030eb5" inherit gettext pkgconfig autotools systemd features_check @@ -92,7 +90,10 @@ FILES:${PN}-storaged = " \ ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \ " -FILES:${PN}-networkmanager = "${datadir}/cockpit/networkmanager" +FILES:${PN}-networkmanager = " \ + ${datadir}/cockpit/networkmanager \ + ${datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml \ +" RDEPENDS:${PN}-networkmanager = "networkmanager" FILES:${PN}-machines = " \ @@ -130,6 +131,8 @@ FILES:${PN}-ws = " \ ${systemd_system_unitdir}/cockpit.service \ ${systemd_system_unitdir}/cockpit-motd.service \ ${systemd_system_unitdir}/cockpit.socket \ + ${systemd_system_unitdir}/cockpit-session.socket \ + ${systemd_system_unitdir}/cockpit-session@.service \ ${systemd_system_unitdir}/cockpit-wsinstance-http.socket \ ${systemd_system_unitdir}/cockpit-wsinstance-http.service \ ${systemd_system_unitdir}/cockpit-wsinstance-http-redirect.socket \ diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch index b3b0988b12..db583cfd29 100644 --- a/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch +++ b/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch @@ -1,27 +1,25 @@ -From 588bb5cb248aaeaf0fea33084229c99ad1574291 Mon Sep 17 00:00:00 2001 +From 7c1f95995ce9180221bac03b7b1e1696b8a79de7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 7 Sep 2022 11:12:28 -0700 Subject: [PATCH] Warn not error if xsltproc is not found Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 7659f41..537203e 100644 +index 6896c19..2a1fb52 100644 --- a/configure.ac +++ b/configure.ac -@@ -177,7 +177,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir]) +@@ -182,7 +182,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir]) # package as xgettext, and we find them by PATH, so just check for the one. - AC_PATH_PROG([XGETTEXT], [xsltproc], [no]) + AC_PATH_PROG([XGETTEXT], [xgettext], [no]) if test "$XGETTEXT" = "no"; then - AC_MSG_ERROR([Please install gettext tools]) + AC_MSG_WARN([Please install gettext tools]) fi # ssh-add --- -2.37.3 - 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 deleted file mode 100644 index 8f70fe9434..0000000000 --- a/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 788aace494f79e8201b18ebcdf1592b5030c5295 Mon Sep 17 00:00:00 2001 -From: Adrian Freihofer <adrian.freihofer@siemens.com> -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(-) - ---- a/src/ws/Makefile-ws.am -+++ b/src/ws/Makefile-ws.am -@@ -58,46 +58,6 @@ pam_cockpit_cert_so_LDFLAGS = -shared - pam_cockpit_cert_so_SOURCES = src/ws/pam_cockpit_cert.c - - # ----------------------------------------------------------------------------- --# test-server: server for running the html/browser unit tests against -- --check_PROGRAMS += test-server -- --test_server_CPPFLAGS = $(libcockpit_ws_a_CPPFLAGS) $(TEST_CPP) --test_server_LDADD = $(libcockpit_ws_a_LIBS) $(TEST_LIBS) -- --test_server_SOURCES = \ -- src/ws/mock-service.c \ -- src/ws/mock-service.h \ -- src/ws/test-server.c \ -- $(NULL) -- --test_server_CPPFLAGS += -I$(top_builddir)/src/ws --nodist_test_server_SOURCES = $(GDBUS_CODEGEN_GENERATED) -- --BUILT_SOURCES += $(GDBUS_CODEGEN_GENERATED) --CLEANFILES += $(GDBUS_CODEGEN_GENERATED) --GDBUS_CODEGEN_GENERATED = \ -- src/ws/mock-dbus-tests.h \ -- src/ws/mock-dbus-tests.c \ -- $(NULL) -- --EXTRA_DIST += $(GDBUS_CODEGEN_XML) --GDBUS_CODEGEN_XML = $(srcdir)/src/ws/com.redhat.Cockpit.DBusTests.xml -- --GDBUS_CODEGEN_INVOCATION = \ -- $(AM_V_GEN) gdbus-codegen \ -- --interface-prefix com.redhat.Cockpit.DBusTests \ -- --c-namespace Test \ -- --c-generate-object-manager \ -- $(NULL) -- --src/ws/mock-dbus-tests.h: $(GDBUS_CODEGEN_XML) -- $(GDBUS_CODEGEN_INVOCATION) --header --output $@ $< -- --src/ws/mock-dbus-tests.c: $(GDBUS_CODEGEN_XML) -- $(GDBUS_CODEGEN_INVOCATION) --body --output $@ $< -- --# ----------------------------------------------------------------------------- - # Unit tests - - check_SCRIPTS += src/ws/mock-cat-with-init 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 deleted file mode 100644 index 48702c3d1e..0000000000 --- a/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1edf0756bf4fd002f5b60cf2b86d4b97a00aff20 Mon Sep 17 00:00:00 2001 -From: Michael Haener <michael.haener@siemens.com> -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(+) - ---- a/pkg/Makefile.am -+++ b/pkg/Makefile.am -@@ -7,6 +7,33 @@ TESTS += $(pkg_TESTS) - %.metainfo.xml: %.metainfo.xml.in - $(AM_V_GEN) mkdir -p $(dir $@) && msgfmt --xml -d $(top_srcdir)/po --template $< --output $@ - -+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 - nodist_metainfo_DATA = \ - pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \ diff --git a/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch b/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch index 4212917f6e..489318b4bd 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch @@ -1,11 +1,11 @@ -# Hack in support for an "exclude" config option for the init module, so -# we can hide certain system services that shouldn't really be configurable -# via the web interface -# -# Upstream-status: Pending -# -# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -# Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Hack in support for an "exclude" config option for the init module, so +we can hide certain system services that shouldn't really be configurable +via the web interface + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- init/index.cgi | 27 ++++++++++++++------------- init/init-lib.pl | 5 +++-- diff --git a/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch b/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch index 46f3109796..dfc962bfb7 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch @@ -1,3 +1,7 @@ +add mediatomb support + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> diff -Nru webmin-1.570.bak/mediatomb/index.cgi webmin-1.570/mediatomb/index.cgi --- webmin-1.570.bak/mediatomb/index.cgi 1969-12-31 16:00:00.000000000 -0800 +++ webmin-1.570/mediatomb/index.cgi 2011-10-26 10:00:05.992522036 -0700 diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch index 5549392851..6ae3dced72 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch @@ -1,8 +1,8 @@ -# Add support for configuring network interfaces on a generic linux system -# -# Upstream-status: Not appropriate [config] -# -# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +Add support for configuring network interfaces on a generic linux system + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Index: webmin-1.850/net/module.info =================================================================== --- webmin-1.850.orig/net/module.info diff --git a/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch b/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch index d957f4a3bc..358e53ab8c 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch @@ -1,9 +1,9 @@ -# Remove "start on boot" option from webmin configuration, as -# end-users should not need to configure this from the web interface -# -# Upstream-status: Inappropriate -# -# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +Remove "start on boot" option from webmin configuration, as +end-users should not need to configure this from the web interface + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- webmin-1.570.orig/webmin/index.cgi +++ webmin-1.570/webmin/index.cgi @@ -79,20 +79,6 @@ print &ui_buttons_start(); |