From patchwork Mon Apr 24 14:30:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valeria Petrov X-Patchwork-Id: 22945 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 467F3C77B61 for ; Mon, 24 Apr 2023 14:35:52 +0000 (UTC) Received: from CHE01-ZR0-obe.outbound.protection.outlook.com (CHE01-ZR0-obe.outbound.protection.outlook.com [40.107.24.71]) by mx.groups.io with SMTP id smtpd.web10.53028.1682346608624044203 for ; Mon, 24 Apr 2023 07:30:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@spinetix.com header.s=selector2 header.b=zraDRy68; spf=pass (domain: spinetix.com, ip: 40.107.24.71, mailfrom: valeria.petrov@spinetix.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WP0aUqMVwBt+VyUWNHo3o+YhcFw03cTh4wjglMCQAn43WsTlUCC9ktY9jw0EiS2WEwgEzLtQXRJh3/+9P4zXPFZwt+d0WuspmKmXH7a/XSjuZWLcdB38qq+bNHRdc6xkxp0Fu7nJVocsmf6bYS+Dmweq5Z4fMoFkTWCzNWXV+1tYQ1RNJs54hbpim7XKDkL9dz7blQAEmzxp9f3WvawHai/MT9Z3CbJMP9ZX7YxsTjgnWjbZnvN8O6slUJIVjCdxR02jGyijon6F5bcIRLZGss8BvfzjrxrzUrcTkNEKAFI9C0UA8FOmCEyNlqmtFlHdrrd20eSaLJV36n3VW5TSsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mxZdOjtEXvG/MpAMXXHaOuFYp36/h9xCbJNFN1nbcDo=; b=A7lBpjBLLfloL/uQxYydU7pigpkMR7EzsEbMrGFhD/3nPTRyLSyK1c/ewS3atXhja6IsMQ668quCaaaoEKFtD5sU6JpsctKiubZ/e4JayI3H5nfVfIkwxmXh9gps5rMhUE3HUvQOBUlZbis17EzNNQO6p/a46VQ6El2E9yCQGfk7HpG0GMLn7znT8A5SfR+COovKuCd+i5K0rAayp+6srEYg8eeZlHxng49o7P1r0WBzRmTjIU3XdPxPtyeEhW1M1xfF1yLjsHJVIx0maup1jf/uyqPL5MghpT3CYYqaJtff8UFWvfkEiKawnbKjWQ7eMwXtQCk610mk7QfOKhInuQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=spinetix.com; dmarc=pass action=none header.from=spinetix.com; dkim=pass header.d=spinetix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spinetix.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mxZdOjtEXvG/MpAMXXHaOuFYp36/h9xCbJNFN1nbcDo=; b=zraDRy680tIigb8Q9EOgORhlk8srF1tjou+WABnPSMjUaR8XDolCSTiUz6lQ+HwY6YUnHGZeaMlshMBYElaFNPYh9G/QuHp+55a943dFYktRDxNB+3YruzhG+80BtCg5aGOcM7ekk8M9nlOYTAvp/kP402P0oHA/peKrC4MSkh8= Received: from GV0P278MB0372.CHEP278.PROD.OUTLOOK.COM (2603:10a6:710:31::10) by ZR2P278MB0986.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:5d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Mon, 24 Apr 2023 14:30:04 +0000 Received: from GV0P278MB0372.CHEP278.PROD.OUTLOOK.COM ([fe80::2837:51f0:b9ea:3ac]) by GV0P278MB0372.CHEP278.PROD.OUTLOOK.COM ([fe80::2837:51f0:b9ea:3ac%3]) with mapi id 15.20.6319.033; Mon, 24 Apr 2023 14:30:04 +0000 From: "Valeria Petrov" To: "openembedded-devel@lists.openembedded.org" CC: Valeria Petrov Subject: [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57 Thread-Topic: [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57 Thread-Index: AQHZcsPxtrq4wuo0ckCIws/O+rPC6686GseAgABxJvA= Date: Mon, 24 Apr 2023 14:30:04 +0000 Message-ID: References: <20230419133608.21415-1-valeria.petrov@spinetix.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=spinetix.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: GV0P278MB0372:EE_|ZR2P278MB0986:EE_ x-ms-office365-filtering-correlation-id: 6df3342f-fb30-4b51-c120-08db44d06545 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: YLwgWSOzeevEOShG4ylBYvZZcD/KNr9z1D/iLnrlQwJfONrThOsJAhvi9v/DoSUTpTW7skvbhAWNKj3/J6LPVOa8Yr3fWRg80jh0AsfdVN3CtQVxwX+JAXgr21TdS1AbHqxrKVnnWADYZ7vAo0veGFaeFxx5+wlfhRYliMXpRhlG6A074KZYE1+Q0ysTklbNqyOGIRC/F+OjUAboabsTsN91dDlSspFx5pBNLZ8iCauoFdRpOt0TZYmmHfdeXZT1U351E8eQYB5Yp+988PabBM0NQcaOYQSwxpFSjLDoUqLzmK6QuRoj+M3fWTFbsIBnDedIEPm7eYbnZpdhIq0ih29M8s8U6L0I+1FN6OEtWjIpoScp7EF4Gj9/OvYyad37oPOe4NmY02mY+uWYQXnN0lk11L22d1iARtvbke6jsPDPBTjiLomDSpn+z8+wTJNxIq8VYYD+66frcE/Fuvw5zWxBDLXXR5zxodSIlH2MKwsqpIMuNPGNPCCHo6QWUZIcu8pzgBEbDWn4uzWzmvVDf1Qv3JN27PrP14PtCKo3Hwy7kWjR8PIVJt62NMiJxzAp8DvCyy2wcN8LhU9u+UPz6BQYqyOi3I8Lz8IEivL/pDrbScpKgxtoc9cg4ZS0t7JH x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV0P278MB0372.CHEP278.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(366004)(376002)(346002)(39830400003)(396003)(451199021)(2906002)(76116006)(64756008)(66446008)(66476007)(66556008)(66946007)(6916009)(316002)(4326008)(52536014)(8676002)(8936002)(5660300002)(38070700005)(41300700001)(33656002)(86362001)(55016003)(9686003)(26005)(186003)(122000001)(71200400001)(107886003)(38100700002)(45080400002)(478600001)(7696005)(83380400001)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?2IIfp2mpDslUpO//XNGhBMpSrnD0?= =?utf-8?q?/wcUYGZ2bsnBybYE0XH3Q5cDuV2Qe4W1ZAiSQ2aBY4PUn8Rk1za7Mtl4VI82CyaXF?= =?utf-8?q?AOsvCmjSrdCBgzCynRVoFuvnPmOdUNfRufGgZD/i6c90gyT5VJAM4jZyQ861Wu1Lk?= =?utf-8?q?bNpBwFo9VdDTFkPC1FLeMK2VfiIk1/aNMGGinkUP68lt5x/iAZon1k8AzcUUriJTv?= =?utf-8?q?X1HgKz6bjkDsfRtBhG15vMcp1pj247Xra4xYPGXqoXiRhXktIExyKeXdSyjbCvEeM?= =?utf-8?q?2XJMzWbmPniNVUlUsNcjYZ9428WlCdkGPiJUlMl8+wQ/8aGWovo32/SlWpp8G5VKD?= =?utf-8?q?0IM5eobzw6S18FS3IEISIF2F8dnU9JX68TzEsqcEEtqoqj2Ft6Mbj1V9X8ncuUlVj?= =?utf-8?q?ky4mZDU2eq1sL9MC5/NUplPd2E0+ULksyOQ4JWZkVUIcd9qMdGZcwKWfiBcvEIegX?= =?utf-8?q?8ep72xxPP6k4gBOPbiwheuHGwaNHNvdNzG+E50man1HcDoE8n08nbaq2xUQ76eZfE?= =?utf-8?q?H4i7l8x+MdtxPSFsULSyn3mRdtdfjzOxtuRVy7J3ZCS1gEasSSdiUCOUildMsSfNy?= =?utf-8?q?HPY4XVUGNON2lT5+GWb1lu4j0IbF2THMfG4SWHyCajfKxgQPU6XFcEfDUAni+V0Bf?= =?utf-8?q?XuEp6fe0XDzE//vfZp3UkklbK9gHtcwaOFurJh9KoV0eioKIhyAxUF/IsRipcUVLI?= =?utf-8?q?AnPSY9/mwCCM7OII9PjvWy6m0oaHxw/rdTp58VhVOizoaK5s/MxEeZKzcU6XR2zeM?= =?utf-8?q?ukX8eglCV2O53P2FsvQpaMAnTb8qfRthCmQ1Trq10SJ7AdjkUlxR5a9/pcWeXaWjn?= =?utf-8?q?qfEvcNHRRv0cwVDWe4v7UJr1YgoWFxbqwX6YFAq05UZuGGjqfVgNH7ML37E7wg5sy?= =?utf-8?q?DP+TuxX6OBRMf8OI1JCwA2RwGuboRZam0H1yadsEaNlc/u+BJVv2RMs74V8+gWBjq?= =?utf-8?q?WgHnl0VdPqYCF8l/r3NQr1pk/k/WbE7Wi7k45s0W1q0WwVwxZ3oQ2o2ci0ElDN8jf?= =?utf-8?q?lYOcvaS7SgtIDu1su0+RDY5kloDjNRLcL7FFdyLoODvrOnXAhWUYbskU2OwTvj/JS?= =?utf-8?q?xMg5yVHwg083cYBevsgQKPq7/CAbnTAoeJ7udCu1tRZ5+nXQxca2+0XiCjmtvcGtu?= =?utf-8?q?OcHboMyGPyT7oYcvmtbi8k4WC5Z6g1Y9tLzuKn+gpHqTmJTrmMNxuuz1ub4U1jbT+?= =?utf-8?q?HWsd7pzFCJCu2v5y39MoYvgwSp3GbmAwRvUJgGyYuVsxI/5aYjIsDh+gCzZXzoVNQ?= =?utf-8?q?2oPqr4AEIocH9HMmkTfrFbDP3bMPDKmQiooHfAu9HIKCnCB8o8fZ334SfbcT46LEj?= =?utf-8?q?uHqogA5Kg3T95sv5HE8IDPdvZqbeSlxN4zGLDyzr1IWi+cZoK6ZtIkGxE1WB3c8pv?= =?utf-8?q?/Fk425ydAvoNY2D8mxKTtkDjWgXzETQB5di6gHEOe5EsY76028/H67ndfhQtMd3up?= =?utf-8?q?i8U+V6mIeD/CYvCJUkKK5uGirZgQ0wgOK6mY7f4EcLz/YtDnkCU4rYKoVMXcUoCcm?= =?utf-8?q?OsnIaO3AkK3m?= MIME-Version: 1.0 X-OriginatorOrg: spinetix.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: GV0P278MB0372.CHEP278.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 6df3342f-fb30-4b51-c120-08db44d06545 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Apr 2023 14:30:04.5585 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5f4034fa-ed2d-4840-a93f-acb1e9633b93 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: FBYha2kxa5Os7sxylis/W16tSxkZKmmHXliqsdVyz8VFoiLSnZAbGNsAwe6ViiVcxG2bmESNPdVuHwPZ5AUbQK8sNTMYZdX7iobgibh9fu8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZR2P278MB0986 Content-Language: en-US List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 24 Apr 2023 14:35:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102179 Changelog: Changes with Apache 2.4.57 *) mod_proxy: Check before forwarding that a nocanon path has not been rewritten with spaces during processing. [Yann Ylavic] *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not double encode encoded slashes in the URL sent by the reverse proxy to the backend. [Ruediger Pluem] *) mod_http2: fixed a crash during connection termination. See PR 66539. [Stefan Eissing] *) mod_rewrite: Fix a 2.4.56 regression for substitutions ending in a question mark. PR66547. [Eric Covener] *) mod_rewrite: Add "BCTLS" and "BNE" RewriteRule flags. Re-allow encoded characters on redirections without the "NE" flag. [Yann Ylavic, Eric Covener] *) mod_proxy: Fix double encoding of the uri-path of the request forwarded to the origin server, when using mapping=encoded|servlet. [Yann Ylavic] *) mod_mime: Do not match the extention against possible query string parameters in case ProxyPass was used with the nocanon option. [Ruediger Pluem] New patch: 0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch Accepted in upstream, expected to be removed at next apache2 2.4.58 update. --- ...config9.m4-Add-server-directory-to-i.patch | 31 +++++++++++++++++++ .../{apache2_2.4.56.bb => apache2_2.4.57.bb} | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.56.bb => apache2_2.4.57.bb} (98%) +++ 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 +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://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsvn%2F&data=05%7C01%7CValeria.Petrov%40spinetix.com%7Cf10f7ec0432b4f0213b008db44975dde%7C5f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638179189118016079%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=AgfbAoHG4hj%2F9VH1gapiWEqOB8704jdySrtXl08H7Ns%3D&reserved=0. +apache.org%2Fviewvc%3Fview%3Drevision%26revision%3D1909241&data=05%7C01 +%7Cvaleria.petrov%40spinetix.com%7Cdd425f6a28c44f7070f008db40db139b%7C5 +f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638175081881994084%7CUnknown% +7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXV +CI6Mn0%3D%7C3000%7C%7C%7C&sdata=XR38OeEdzVwgIAn0s32t%2F%2BkxnRFiIv1l2ne +51BIRcwA%3D&reserved=0] + +--- + 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 + -- 2.25.1 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 000000000..996eabf58 --- /dev/null diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb similarity index 98% rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb index ed5690a4a..669d27756 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb @@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ file://0007-apache2-allow-to-disable-selinux-support.patch \ file://0008-Fix-perl-install-directory-to-usr-bin.patch \ file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \ + + file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch + \ " SRC_URI:append:class-target = " \ @@ -26,7 +27,7 @@ SRC_URI:append:class-target = " \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" -SRC_URI[sha256sum] = "d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c" +SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a" S = "${WORKDIR}/httpd-${PV}"