From patchwork Mon Apr 24 07:41:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valeria Petrov X-Patchwork-Id: 22947 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 356A8C77B73 for ; Mon, 24 Apr 2023 14:36:02 +0000 (UTC) Received: from CHE01-GV0-obe.outbound.protection.outlook.com (CHE01-GV0-obe.outbound.protection.outlook.com [40.107.23.86]) by mx.groups.io with SMTP id smtpd.web10.45594.1682322114730251360 for ; Mon, 24 Apr 2023 00:41:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@spinetix.com header.s=selector2 header.b=Lj9jr+bp; spf=pass (domain: spinetix.com, ip: 40.107.23.86, mailfrom: valeria.petrov@spinetix.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dwN3U5C6GPcuZcshcUEXEj/FgoRQ7f2r98vo0xUz+vYTH2BWrhMiuXrA1Lu0eLqeRJS6koaUN/7/mHxRpYbJ0m388L/2HufYoa56TygJKpPk/LzG341/vTks7pkGHH+3CePjomlPT/mwwA0TbQQcb7lsZ2dNuJjfBHIw/6HZUYWqc56DVsqjV+ayRuLbjtbHnBBKqiXgvXy1mgCzHKc+c5vrQm0u7DxCn7ag8hkGZGDFzcxAgfzqoUOmPz6QMDy2HAlSMzDbrQll4hHoGCldj6gBCmgraVDRIapTxx5QjwfCg2h+woEZLQzp2r5f07rAFfsiF/C+mh18lcYBa8oJpg== 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=LbPsrvQ0pEx593/de+XAeEoWZkJGP2Zqq+Mki9PPEnk=; b=aKjXQAQuZW/a+as7vr/GgSct2galKyIFypHnXOYsvkUn4+iTInE0uHwpuxNnmzuSPOShaZedDhVUken5ZgSmduNCCiwJYcSi8AQFvSTKdSIpbsVwZCLGwUGZdyQcjh0ysQ5EjTrCAA1exeOu4id5Hnxgsef5BWQwt1BV/RVwcsg731plIkjuX36PtiAqK069mwfkZVhzQUC8T7BJjoMCtYpAcEc9JF48nKBFa+2Ul/au5PsulYMIEXLyg9txAnLPzV1sjHDM9kjzD3Dcb6NKyY/m35ZPMJ/8DWv4i/EBwX7JwK5CAEE5GLA52MeqqarZfCiBCv2U7JT6b78wHzoG6w== 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=LbPsrvQ0pEx593/de+XAeEoWZkJGP2Zqq+Mki9PPEnk=; b=Lj9jr+bpm3uBbCOAzH51iN32pp9uEXABjCKCdv+9UBEtMlZ6Yq9C9EMFJd75CmJUB/ti+npoV97KdQ+1uAexK09pKbXqafFQOztRA0fT4PHZz1mTFLKtLe3+9xO0YZqmyIGsgL91wvpLc/Pb3rXteS992KxSQtp3uzoiMM7rkEE= Received: from ZR0P278MB0379.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:30::12) by ZR0P278MB0824.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:4f::6) 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 07:41:50 +0000 Received: from ZR0P278MB0379.CHEP278.PROD.OUTLOOK.COM ([fe80::5e2d:f1c9:c763:a7f6]) by ZR0P278MB0379.CHEP278.PROD.OUTLOOK.COM ([fe80::5e2d:f1c9:c763:a7f6%6]) with mapi id 15.20.6319.033; Mon, 24 Apr 2023 07:41:50 +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+rPC6686GseA Date: Mon, 24 Apr 2023 07:41:50 +0000 Message-ID: References: <20230419133608.21415-1-valeria.petrov@spinetix.com> In-Reply-To: <20230419133608.21415-1-valeria.petrov@spinetix.com> 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: ZR0P278MB0379:EE_|ZR0P278MB0824:EE_ x-ms-office365-filtering-correlation-id: f10f7ec0-432b-4f02-13b0-08db44975dde x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: UJCWBk7X0P7wpjkfx+zUufLpvdFTbwv/psJ+NgFgV6BAHSX2bRJqpL1pPu/cCPYdux3ODWEt265usrffxWiwgI5uHNc4NXtLTyvWYGTbh8yILLU357UvUMXvNX1/GrVfUWCz50UOx7HT1qdAq+3C2isTjL3yMDmqWj0wlIrUPuk4jjw7xbk0jX/f6dFVObVtfH9Pt7TK6y9IWmWqKfV6Sr1TZAexDvDdUJNKvs6vnQ2tDxYaWmI4383cHACRwAhJcLDz1i+EBcYwWgUqE7Rczx4+HOIOPMH54X7QD9SJEqOO1M2LWH50fk6uQsdVkJyQcfNO29Hlrki1MTM6p1CdXPadjzKKmvPBb1brFDwzu0lfkSJwjqz65XqedegDnlAU/56wJjU/Bl1nE5/GKvCtexQgfoDqRWp/nsCEH2shBSyyxiGWiNJk5jE7XQrfiUfeUjaos6qmd76+V31Gv/c+vSvLaUXtjgnpSioUHG8LXNbZK0eQ1RaaHT+z5Be6SqpcwngNZOznhwwp6W51bCPrYV1fFS47adXbhtauUpzWDse5Vrvij6IVXxfJha/D0MVAzZm7oFA4RlQK8QVgeprlVoL6UVpmFdj1M3hoWjM1Z21MSL2++XPO2ZC6pYRDfyjb x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:ZR0P278MB0379.CHEP278.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(4636009)(396003)(136003)(39830400003)(376002)(366004)(346002)(451199021)(107886003)(9686003)(6506007)(26005)(38070700005)(55016003)(83380400001)(186003)(38100700002)(122000001)(66946007)(478600001)(45080400002)(76116006)(86362001)(6916009)(64756008)(66556008)(66476007)(66446008)(8936002)(8676002)(52536014)(5660300002)(71200400001)(7696005)(41300700001)(2906002)(4326008)(33656002)(316002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?yCWUQFjNA51SL0Qv8Kdo7XtGG5np?= =?utf-8?q?MXDsuv55e7Hpe20Rtl8rfrFhdQosyxyzi80ro5JOkd2OwRzfz+ShOgukKphq1XByF?= =?utf-8?q?ibjysIT3MeG4t8kW4G0v6rl0eocRX1s3CZNjdvUbWZcvA3xWRQxcg41rCMpgaIOwU?= =?utf-8?q?O42riqixboS2hg9OqKcVIx6tR2RZPFZduW/eCJnzByiYPhRa/yz2+DSblpinEgTXP?= =?utf-8?q?UXb44Q0yCqucmMBuB0EFsKz2U9ef7vsrYaX2cVB9LH4zmB7fGfPki/zgWQi4CkobH?= =?utf-8?q?tcTOgQcXlKYT7FssCI5qwXw34/kKtXrI7MP1mF/xYgZ327DbKa5VjurQ5GwzGcCLd?= =?utf-8?q?1JScpFjreKBPMgSsizDikovCK33hxIU9Gl9sO42uiwwjMB736v6Qlk5pTVjZYQw8r?= =?utf-8?q?ojkiDPyHF6YmSi6krE+flCvdddkRlg7xhkrxhraa3zjVX0el5yjUC1ogtD6EMbIAg?= =?utf-8?q?9AECo0CYVzjBluQ90xE/xPnr4YUDr/WmThC+gU1sQSl1U+LNko9prJBvLzFqNdR9l?= =?utf-8?q?zMf4AnY5cL47dFi6CIbwbU3EAfTOXFbK7LH+xms5rcZv0Uv8d/lY3Bd/zcbjfwvuN?= =?utf-8?q?TNUVApwe5cS1LwPYAYvzmLcJgoAuGrRUuW/k20NIOW4R+v7fW4ufGXjoVU/ekLQKD?= =?utf-8?q?B9Lz8eZuaLglGY8nYUdax6/tEHKa0E2Fhw+8EzBGspzqyuDGlWHRUL4FFOFaMyl/8?= =?utf-8?q?PIymzRD/juA86LpxHvD5TvB+Tsl8ExGlqkoj60zM7VRpxmkdFWajPwxGXHhxfWIcM?= =?utf-8?q?9fF91wqXo/c4a2rIHpCGoMcNi1k6xEk4u4hDv+6zTgwrdD0fS1jvdFwggMRLRkKO6?= =?utf-8?q?HLaLUq9ni8hf/HOuXXp6pOX6OBjRCI6wc6K9AcghWC8TkMaf1M7XchcZcL8A0s0m0?= =?utf-8?q?g3ZFY8FQDK2MSW2/1eV3ZvBs2Y+dZMuHf0yAnG0XOlXwY40qFg91XEDbQTSyLkcXz?= =?utf-8?q?zIJsWWIXc2DnMkAM/lhAp6H2G402sg52/7d3z2zsZ34epZX1NHtEc9hPnQYG0nXkI?= =?utf-8?q?3S1PCkZ6neE1y2E6Czr5C0DcBBJQu7JyPehsVQfTC2FgTjLgXNDU3YAVjxxxO6qu7?= =?utf-8?q?a6Xe4/oGKknEZBE2kqRXGRV4IqbRfB1ilGOMTiaf1aq0sN7paitN1/9QIPuJdkQhr?= =?utf-8?q?xPAWYPL9PZdr9eYkz7luybRr3Pbmjo1HvosBrvv421h2Pzb+fXgmIj+sAV9jrSyRK?= =?utf-8?q?Gwv9SB6uDaTU97UUcU+B9okHP3W2FzntwwaB+yscdGJKzNwNv2fPkv2L6n4QdQKzp?= =?utf-8?q?Jr/QS8jypI7KbLEv4/BOnXDqEITTnBJnnpWsUZeRRlHAbO5LwMN21giJAuyJijixW?= =?utf-8?q?vMsCxUUli5NmZzvQmKpL2J3C2at4sHo5acJU4HgeGOSky9VV9jcuMes/ULrc7S6oR?= =?utf-8?q?RhYsfd/CbBJMyksld5fAvWvy3tFf70oxX0Kpt/uOfNkJVE8PvQo4DniWgpPnD+mj8?= =?utf-8?q?899uidM2r0cghy4LYhmrekS56Yg0gcW566aBCa01KrDGwbr2vzBMoLgLpPHMe3Na+?= =?utf-8?q?5cZcto4BLTu+?= MIME-Version: 1.0 X-OriginatorOrg: spinetix.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: ZR0P278MB0379.CHEP278.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: f10f7ec0-432b-4f02-13b0-08db44975dde X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Apr 2023 07:41:50.8468 (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: +6NqT2waaWFsIGY/E0o9QnnBMueR0OzayU3KQzp9F+YQKX74eh8cB7XmzUdARF2Zw40p5EmZYYd0kaeaEVAY1fd2+5NThDY+Pdbv+eRMofk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZR0P278MB0824 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:36:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102181 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. +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}"