From patchwork Tue Mar 22 04:46:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 5636 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 6EEE8C433EF for ; Tue, 22 Mar 2022 04:47:36 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web08.6121.1647924454817585618 for ; Mon, 21 Mar 2022 21:47:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=o0YEegQG; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=00800cfd2b=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 22M4jN2m006470 for ; Tue, 22 Mar 2022 04:47:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=/WVNTokbHsnFNfJjgqLr3yA29qEDQzjpPCm2EZDDs+o=; b=o0YEegQGyFt10Xa6xo6YSxzYPZ5MBcdOn/7jPdxJLC3poXVYss7G6ffGHnfTeMHvySKv F79xrlksnoewTuEsQXZVI3ORS9K4QZ/aaELri3GvyBFfai8ct4qzqyrWCsID17cpxt3R TXlvWj38L6rE7Modi1ItcNWcsGXwqNUTrUd62by19wRSqz4I9jk7S3Z3fEOXz+YXvnsI oNvNesTjhHtkVMwB1ybrEhVWtcoPnBtlqsM+NyxDz5N1qygljrOsO8L1P9PqD3pUm8q4 ffq1wmaGyhDmSC93QUgMpDMuXTr9lF1OGKYBnoDyqmcF5OQ03+HWuYkDgEY0+d1ZXgLx Og== Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2040.outbound.protection.outlook.com [104.47.51.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3ew657a51n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 22 Mar 2022 04:47:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KtkgJDzjFQ6QaCL9gR0MQlYySPOePXBNOs8b2D+h4LVXY13Fmc7GmwYlePoVl6jBDPZa2+lkxFGxFhhMFuJTD4flWRTEjHch+Mdv++6U7+GPb2IVI32zC8+I6XU1QF/QnbTiRB2CeHthJzg8YlhRLBok2jSqF12nz1GkjQ4aXXKubZuLci6BRrszZ7yTjKVjmjymy9R0vfLvZxoHyW0Dw6paGN+mEAe8ifuUebyosvDm3pLHWCxTgmZjY8GWdbnTS2Yx+GPIEEs/V60hbKO9Yhb7lYqeFAMS0L6xU+xljukrKL5Zj8Ab92z0Gtt3UrPWUs49pgnZJxNHRfu6P21IPA== 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=/WVNTokbHsnFNfJjgqLr3yA29qEDQzjpPCm2EZDDs+o=; b=VzjOIJEdZvQgD7FwZrbDIoBZqMXXkiuBpePYyKrRGHTdGS6uJVB2iK2NJtcYFpd8sQsiEbB0QnOZTI6WfbsEp24C7B0TUNf5hyN2MIpEFYRoIPSEQ4VouWHHgEMwJjXfmQpQrgGT7Mxr6q48QovPGw9FgTw550e+YOf4cFtcZAbEKQHpesZmhIeG+xRT83uCUwoh2quY9miDdRZHcbIbBsERSzdD4kgfAVFjPJCyz+qiysZMU17+hFrLyk1hlaFCDZIcecTQRCQKndujF4hKLIYdFxX3h/ISo56I1T3v1fjr9yHtz5pccH+oOckBqo/8P4J5t596akpnxRMYslLZgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by SA2PR11MB5098.namprd11.prod.outlook.com (2603:10b6:806:11c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.19; Tue, 22 Mar 2022 04:47:32 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::8ec:d095:e49b:d875]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::8ec:d095:e49b:d875%7]) with mapi id 15.20.5081.023; Tue, 22 Mar 2022 04:47:32 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 1/4] nftables: upgrade 1.0.1 -> 1.0.2 Date: Tue, 22 Mar 2022 12:46:13 +0800 Message-Id: <20220322044616.867009-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: TYAPR01CA0135.jpnprd01.prod.outlook.com (2603:1096:404:2d::27) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6e67bef4-9175-4950-c04e-08da0bbf1374 X-MS-TrafficTypeDiagnostic: SA2PR11MB5098:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9PvlmjndExuHHquF/PtJAF9XRCr7n3g72lYEA0aHkmwZSs26mhngiqa42r/1d2lQhqc/jHR3khN5vp6IRMl+vQz2ckj8WcMoyDb/8ZF6lHgiGDPfFGahQYFV9m9MjIeqGZxckGyYGzKx04wIpf6QmrwL+R/sZTipQ1N5V/DeLvERANDfCPBnbfTyDXblZ0l8sr7kfYs58NDO0Aw7ZlX+9AqskVrBYyIxo/oa1D8Qp+tjmNDYSm1DaXZEJfp518jWc/J+0kUXYFfd+zve7G4EDTYm6ZHDGM36goiMHfiLZZGHg922PnckOKFSqoDcIqQ24EuYsM45rH9Nt+yWLrc4FLetzfrAtx2lfKxnwXKGN8ZKGIuTfhi1HCuX+9759WKPdu/ObDyBYEzms1/pySeVU0IgI7Iajg1rrKidD5nykIutsYIKIFRlg9DW0AEdTmuDrUgOs0vaRUBCAJdW/GLcvQTOROHCm9TJZq7FHoqywyrIPY5vmI3FZQoHENhr9p97A+0bK4xib/XOgGh4D8arLk6pi6T7bp8ED7DXyoq7v4lIkacsYWvI33BDh4Tay1HQaeNrnSlK3f2OrSuIFq0uQMOFyF5+0xHwm+n39aB07MhYkEsmjeJUUhiVzCZKH0dgA79VSOpOon5axrOCcd0Xjfm2Qp3NdmAUQ9D1zj6BzGbODMAbnhScJFgbIpbURXWYZgdlvujB/5ruHff23kPdSGoXrFcrSbv93KF0jS4OZEsXN7R8aytlN+CuRrckMTKjNNtEOA+cAgNNBjrYY/CAXVTzn53q65B3z0PrFbIgzMg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(2616005)(8936002)(5660300002)(1076003)(26005)(186003)(6512007)(52116002)(2906002)(6506007)(44832011)(6666004)(38100700002)(83380400001)(86362001)(66946007)(66476007)(66556008)(36756003)(8676002)(316002)(6486002)(508600001)(6916009)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Du4cFKgyPh2UUaVwmLhUYUHaOWZ524H8fTicUcAgb6U6rMhPTPRbAYzqYgbPX/hMUk0NF1jwNbOab/MwtldE7vKCi1Q8c3POuEnwzYuz4CgMn3vQeGlbolY+CTDyUQz8PJICdlMTFv2YV2Il/llyHxg8AYlVaOMFUiwRZz+JeM2IjPnYomfSzOQCiWYctI5CkHA4x7QvPRS/bUScTxweXsBNJs1fNYAHRX2S30DZi7r0f9HlxZ/vpZ1c1PUAnkzGIlBjlN1r85Jvjcw+cf5fFyPiM2lQkGKS+vTZTMK/3YbkaHBa1TElskoO+vEJqUf/eiKNSx0TY+6ioSdCzqJbdeYtaeEcwH1ehP72mXsr65yRC91IHarS6rE/9GJJUTvixl+nb9GnJfRKqxzrcQ7ODBsAreK9Naq5ElleYSbqBo+LEK89hoDs05JSdlZIU6K5vlV5WLmzjVhsrQFVPmvva6+koTjBHtYnvc1tJT8htyoI3Of9pzfX52e3svk0XujJFMYHCCjfry2DjXDqrj7aFMKWJ9CdLj4vYLmyRTipFyKLFztYyRyKUBoGmQbvNabwuJUgg6+rNlMsLOmPe/nIJnJFkQyDefX5NV/yMZBWMxFxGxhCjnDCOtlKRT8NNcX2CgPu4aL7kzGfEi+Fa/uOn+hlVd3+tRBU7KN3WwKxs+65KfcMZhJ5cW7/uHsYneIf7vMghdktJaxyvPtYGYmki3YXlA97tM4yvG75dxJWiiIdZYu2OPLaTwYn10uVAPi1/iw5Mm6L2Msy15Y2SRNtWmZ2fpXq7/veHCU4Vb/guAd3mctJgIhyXPwPy9cEhRYIj1Rm1F8CEquShYr5fTSi22Q6RVKsIkWg2Qu+ab0TBzFh5SM6x54BMD7n6tg4SJC9FFkhM8S1h+n3mLE33kWPGx4xp39q7pEjufD7+sncLrIEWQUgCC/OnidUK+QINGakdP7MJwjJpJlTUgVwT9YzsE6ZBcgnmXm1xs0rbgAABCqZu9s3dS5UsUNkkpYMFgycLYafNKFRlALPtSXrfJZgqW+sfQhirGWAopL+6lWHYS06DH+wMTeQ90QZJajV0sMKmKwQWstwL51YwZKjhe8gcxJeeOc8RYa+n+bmvhLPEGgKXEdvGT5/s4vj3O+89NA7tsUeSNAcjxN0d4s5ShNn5LWEsIu8In0LtDMCX649qIX7OLlUJR09Jq9CfcVtN86sDAFR/7zuy9OXFqSX4L3ZVzIepF6ghQeZNoYNU6FCaov+I5fghOgEno92pPecJqFJOjFTRi3UfAmRnMmJv848J9/O+Hiu0FzGdYLjSRv1yxGjcXtIaPQ/TVAU+WSuEN558ikKZ1PpgUVvV7wY/FNfkbUtI7AifhR9ZO8WTXcmNCAPnyoYZ+Eq3u7UwR3b4zQ1p3J9pETTBOvoY53ePN2v5RmdCc0fcX7YiZ7roVklSdTYBGceKSC/Z6+rrh1tDkA5 X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e67bef4-9175-4950-c04e-08da0bbf1374 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 04:47:32.1611 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Lh7vAIarl0qXTBcWMHNWPb51FW5/XwBA0TKtmTMwWcPHwwilKbcTcyVZnaN4YDsUEhMWdBcXiJ3oXZIR3Lxr5Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB5098 X-Proofpoint-GUID: 5LcwWccQxc1-T6tKTfwzpO4eIVk03ql2 X-Proofpoint-ORIG-GUID: 5LcwWccQxc1-T6tKTfwzpO4eIVk03ql2 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-21_10,2022-03-21_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 mlxscore=0 suspectscore=0 spamscore=0 phishscore=0 impostorscore=0 priorityscore=1501 mlxlogscore=920 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203220026 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 ; Tue, 22 Mar 2022 04:47:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96126 Backport a patch to fix build error: ../../nftables-1.0.2/examples/nft-buffer.c:3:10: fatal error: nftables/libnftables.h: No such file or directory 3 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Yi Zhao --- ...-with-make-check-and-add-AM_CPPFLAGS.patch | 39 +++++++++++++++++++ .../{nftables_1.0.1.bb => nftables_1.0.2.bb} | 7 +++- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch rename meta-networking/recipes-filter/nftables/{nftables_1.0.1.bb => nftables_1.0.2.bb} (86%) diff --git a/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch b/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch new file mode 100644 index 000000000..65ab2dfd8 --- /dev/null +++ b/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch @@ -0,0 +1,39 @@ +From 18a08fb7f0443f8bde83393bd6f69e23a04246b3 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Tue, 22 Feb 2022 00:56:36 +0100 +Subject: [PATCH] examples: compile with `make check' and add AM_CPPFLAGS + +Compile examples via `make check' like libnftnl does. Use AM_CPPFLAGS to +specify local headers via -I. + +Unfortunately, `make distcheck' did not catch this compile time error in +my system, since it was using the nftables/libnftables.h file of the +previous nftables release. + +Fixes: 5b364657a35f ("build: missing SUBIRS update") +Fixes: caf2a6ad2d22 ("examples: add libnftables example program") +Signed-off-by: Pablo Neira Ayuso + +Upstream-Status: Backport +[http://git.netfilter.org/nftables/commit/?id=18a08fb7f0443f8bde83393bd6f69e23a04246b3] + +Signed-off-by: Yi Zhao +--- + examples/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index c972170d..3b8b0b67 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,4 +1,6 @@ +-noinst_PROGRAMS = nft-buffer \ ++check_PROGRAMS = nft-buffer \ + nft-json-file + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + LDADD = $(top_builddir)/src/libnftables.la +-- +2.25.1 + diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.1.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb similarity index 86% rename from meta-networking/recipes-filter/nftables/nftables_1.0.1.bb rename to meta-networking/recipes-filter/nftables/nftables_1.0.2.bb index 2c378e8fd..fd8e26ed1 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.0.1.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb @@ -9,8 +9,11 @@ DEPENDS = "libmnl libnftnl bison-native \ # Ensure we reject the 0.099 version by matching at least two dots UPSTREAM_CHECK_REGEX = "nftables-(?P\d+(\.\d+){2,}).tar.bz2" -SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" -SRC_URI[sha256sum] = "3ceeba625818e81a0be293e9dd486c3ef799ebd92165270f1e57e9a201efa423" +SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \ + file://0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch \ + " + +SRC_URI[sha256sum] = "0b28a36ffcf4567b841de7bd3f37918b1fed27859eb48bdec51e1f7a83954c02" inherit autotools manpages pkgconfig From patchwork Tue Mar 22 04:46:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 5637 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 58357C433FE for ; Tue, 22 Mar 2022 04:47:39 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web08.6122.1647924458902637735 for ; Mon, 21 Mar 2022 21:47:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=HsVLAzvi; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=00800cfd2b=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 22M4Uhx1015198 for ; Mon, 21 Mar 2022 21:47:35 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=gEOBxYZrIhWaJoFuXTcW2FGWbNSph0S2kYgFxRmr1TU=; b=HsVLAzviCQ8VA27YudlxbIY2myMQubzP9b5yfSSes1jZPmRI/p2FV0fMNn1tcDnSNhe3 uICXz33danA8aSl/f1GeDIdyV214ZId3XijH6/QXZbbGzYge4p37ZHbIXRSX3cc59W+a oAwuO5mk84dw8pKE09BvrYcXZl+chi12RgFX+M8+n++fJIGS3ml8qnvNr030e273QTqI oH7+qxwYb80OVwiCBDloS5C4nLQVQa1ghlecJvVyrp5YCUG5Wj0ra9R8EaCB0/3f/+DH DOpBh+6xROfmZqaO1r8/ReOIobSK2XzZynFMavO+cIScFyeew45w1HPkFk4yTSPYRKua uA== Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2047.outbound.protection.outlook.com [104.47.51.47]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3ewaf3t1qw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 21 Mar 2022 21:47:35 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nCepmLU08SZ4UO7g3YYZ+cIL10tRvsF8A1ItrgbmDf9/mxiAVSj9+oUXhCEdiOj4Okaoii8TXPZMCHDlRGRbg1t+dhsndGQq81DV5uiv/5F2xSkD8a3ZnWcbjGd/JLr26UYnY63FvXWSK6b0fr/uerz/y78JC6SF1shDCknuIwn1A2p4cmsUM+aMu//og4ggHBdYBQ40+MEKaZsYfC5dT3Xas5v+uihTpNHL0lI29Jf7hOTocF6cAt4AnjN8QywqeDEoWYeUuVVdeZlCoF5NeQHmGfMrKJMZ2GzLbAi3MhegwPCCar9VBoizXuGQAexJoIeS4+jY6OAvJiLIMpXEPQ== 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=gEOBxYZrIhWaJoFuXTcW2FGWbNSph0S2kYgFxRmr1TU=; b=FtrigwwK2VzeQpX+mPGLmtIMzu1Gj09/OJ+J79oQJywRpVbmJNEy0Vs2haMptDpmBy2e1baSmL4VzSBhGAOEHquTxtD7Vpr1Qv41F3JgoKVXrPKWI9hw0U//dzfUSXN+yRgr2uanKYVHHz3PIeeAw2lb2iMHgMSWWBkdARHjNQGUbOwzqV8Y1KbwRCM6LZ5HeOu2iiDvpFytAXN2xJlz2EHc0JVkARg2SpoxzmEkdnV4V79IIo45pNWDNB+0vgBvmYFj/OTOsyW/x4DRbnUdOCw0wr8cVGegzH9iFatWtAHv2ef7NFkjvxwGVnbhGiRRNFh3B0VXOle9z8lra5/SkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by SA2PR11MB5098.namprd11.prod.outlook.com (2603:10b6:806:11c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.19; Tue, 22 Mar 2022 04:47:33 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::8ec:d095:e49b:d875]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::8ec:d095:e49b:d875%7]) with mapi id 15.20.5081.023; Tue, 22 Mar 2022 04:47:33 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 2/4] postfix: upgrade 3.6.4 -> 3.6.5 Date: Tue, 22 Mar 2022 12:46:14 +0800 Message-Id: <20220322044616.867009-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220322044616.867009-1-yi.zhao@windriver.com> References: <20220322044616.867009-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYAPR01CA0135.jpnprd01.prod.outlook.com (2603:1096:404:2d::27) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b7f77f77-6225-4a36-fee9-08da0bbf141d X-MS-TrafficTypeDiagnostic: SA2PR11MB5098:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2a2vIfh3UCuADOirsBUdNiVcQenHMC5yI6WxuFqEzshMfo/0VdACSoMpvrWzeWkSvY2lp5SMpuaI6/hgrfOuhHjZxDIHwtw1kpx1g/w1SzrffCIXvzGlKfRFoHHX4nzIAj0qdfvZ/tCo54RNpVwH5GRYpHK5iEn+YsEVioVqmZ7pZqmNrf6irExEu/f+fSM5M3tWxjBoynDTENTBfMKanXzetchq7uwfOLm9R3XMJU6Mo2bg2Hdigj4Mdw2uTWvupcTcXNyZqzVX1yTfUFfx0NKGj+XaCrQ4xektuu4WuAF22Q/R8uC9J/HW40rKgJcYFfjuu5MX2peWZC5fyIZZXgTShg2RGKVgnjj8m5T0n1DMaVCzb2wNx65Bhh8OkrsTZAK/vMGhWgIjFuANCuiOc0mSSyxmCfb7WVpIOODs875W2SIkiBwljN48p9qXDu64/wV+K+ho4pgoR9Qx/04Ki48cwvWDsTYV7yEjPubzW45/KPxJAB0qXOC9hoaaBgZxKUgo2EaQnAIFlMtAWqhILN0i0cE+88R+UYW3RMVLxcsV4VJqrWWvZhTM3/NoxGfKb23+Ibx7PxQLoJYxilNK13WwDERbxCfGgCgC5bikw+ASpolcIb6N0AD+Ph7oFASGnwblvKiT0Od6ExmyLgqdDCGFecV9UhlKNr+VPJTmJEDx3SnIIiCPKAE5SBLtH1ugl/xsqSABx21egHto0YSTUajukA7yzGA+rlkBl3awKwMVS1jVxZSquHPCNlsB2/ZCh43f8ceY6DnCN/bh+vXl6gVYWxWF+LjVcLjuDulkvuNmQja5Daxkhs5x28nKR60e X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(2616005)(8936002)(5660300002)(1076003)(26005)(186003)(6512007)(52116002)(2906002)(6506007)(44832011)(6666004)(38100700002)(83380400001)(966005)(86362001)(66946007)(66476007)(66556008)(36756003)(8676002)(316002)(6486002)(508600001)(6916009)(38350700002)(21314003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ein7dg8SF8g50Umzz7rsT3ioGrynWQ81ba/NS8tOV+M+Gc6WzmUspOmNPrHkrqnHdoeZp0FaBfZqQSzVFRSfSodwYroPBZk5lWZHunyC4J3bpo/+vPndP3cy3lDP+g3MLc+I7VVgI/OJUDvz8kurtgOk3SQG04y/jGADFyC9YxC5x+Wf0b1xKC00EN64V1L9sa0toRtOQnYlE6rQm64hrdEl7JcMFWVAW/K5TLOhozhmwYKtJUqZIr5ZXeWQ+E3Dp5rdDTlFfYvLI4jMCnIkZUVCVkcKRoXss9dix2SNrOWz3GZhzkWPPRtxcLkBEHy7ox+pWbjADtshR102TzTac644r4xYOXGb4sv4wN+XuP4Y3M1AVw/vZ7GPgm0KXHK+MEd1IT++NybwrQlZe8vsfjjDqolTsTdzxDLsUIxAQ03nEaotF76vioF05B+IU4KBCDWChjok0LMlw7JhYEdXwwNTlEgMPpQ69CJNXhSvt3Z4qa3GwLTI6UQ3UQ216YCH9Fv00XQ3hYhGjRDuKNuNi1uohiBzSH0WrAaxUrklhovvtvD8fwRHVDiQ/OdSmL4Xt4XVDHeEVm69En8lAp2lmAlY6ANj+eu2tpo/EeRxgacOBi6sFeT2K48DOBHbIqKj+f956R5HyKXM0rG/QVMS60FsdPnRusNgWgX5iIKRz3Jg31U7sKOwYBlfreq9P6wt+/YTSmVUZUt06E86AlQFlERd5Mi1aEfqxZWBZSkbn9/DECOB/1YrlYFa2LJbNR+wIcgrGEiUAfxdrL+McL7lxfOwis6tiuHmen9gyvOOWFT1QK2jDsh5k/cLrFYb4Cz7/QqwToODJCpi9V7cgtTpISTqyPdvHJKGABYA792GBSBNCDqd50tiwuibuA23KagWFfVQa/9f+hjK5zAYsNZ7ZVHV5KbIYN5WIG8p59pzzmRUZ1BQBrfksIzlnaMXAb6Ipr44iQSygs62y4rdidJnLfIltHVktH+7XHjsPJCToug2b7mxcaDEGBfcPt7H3wTU8bgIBAB4+6HKv7jwGJZAFb6umReIq6lbJ2k+KWdy6XeulDYUJB6iO1lhhMfbuVZqKgxZMH91nq+GdCYo8d0iPGkvqaK9eCzw6FZnzU23iEfhR3tdKO+oEuO3GWHA8P0OX3dg0E5J+bvgzt4Ytd5aAZjAg7VJkm7nvwcovIjBgv3kIcA8mjl7iNqAu+661huWyVcMI/Qzu+FijUbRLQwr1VlblCE5i6Pe6x1xq6tX5Wbjy8CRILsapqYJFkfBRJi/6LL/jh6jDAAjySzRZgf8G680I3Nb/ebpiGZ50LbHEEKYHp3y5CQ40Lt/jowLkYid3aKhNlENPN17UWOpJmCfOlATWQFLt5dkOnavExYTJOEY/dMoj39B10HR7WfE+Ule3HIm86Nv6pSxwAuGlAOit8wth2V9eE5rVW4reftuUlVCdjHEx0by12URkQhf+n4B X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7f77f77-6225-4a36-fee9-08da0bbf141d X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 04:47:33.3027 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qdqbyQtz4o58Brc3OEWeon0Hm8+dCXHZNZ19biX251Aec7eU1pRLEoox7HP0R69oHVF3wdahYLMhbmgNYnFUUQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB5098 X-Proofpoint-ORIG-GUID: 4mWujKwikQxjsqSlp_-N_BvFR2Zd1lUs X-Proofpoint-GUID: 4mWujKwikQxjsqSlp_-N_BvFR2Zd1lUs X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-21_10,2022-03-21_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 impostorscore=0 mlxscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 clxscore=1015 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203220026 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 ; Tue, 22 Mar 2022 04:47:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96128 ChangeLog: https://www.postfix.org/announcements/postfix-3.6.5.html * Drop 0006-correct-signature-of-closefrom-API.patch as the issue has been fixed upstream. * Update main.cf to eliminate startup warning: postfix: Postfix is running with backwards-compatible default settings postfix: See http://www.postfix.org/COMPATIBILITY_README.html for details postfix: To disable backwards compatibility use "postconf compatibility_level=3.6" and "postfix reload" Signed-off-by: Yi Zhao --- ...6-correct-signature-of-closefrom-API.patch | 104 ------------------ .../recipes-daemons/postfix/files/main.cf | 2 +- .../{postfix_3.6.4.bb => postfix_3.6.5.bb} | 3 +- 3 files changed, 2 insertions(+), 107 deletions(-) delete mode 100644 meta-networking/recipes-daemons/postfix/files/0006-correct-signature-of-closefrom-API.patch rename meta-networking/recipes-daemons/postfix/{postfix_3.6.4.bb => postfix_3.6.5.bb} (82%) diff --git a/meta-networking/recipes-daemons/postfix/files/0006-correct-signature-of-closefrom-API.patch b/meta-networking/recipes-daemons/postfix/files/0006-correct-signature-of-closefrom-API.patch deleted file mode 100644 index 95ca03b22..000000000 --- a/meta-networking/recipes-daemons/postfix/files/0006-correct-signature-of-closefrom-API.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 56bec31c4117fddee3a141bcca6c585aa8ddbbe2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 14 Jul 2021 18:08:30 -0700 -Subject: [PATCH] correct signature of closefrom() API - -glibc 2.34 introduced this function and finds this error which has been -all along. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/util/sys_compat.c | 6 +++--- - src/util/sys_defs.h | 12 ++++++------ - 2 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/util/sys_compat.c b/src/util/sys_compat.c -index 8bf8e58..c87f043 100644 ---- a/src/util/sys_compat.c -+++ b/src/util/sys_compat.c -@@ -286,7 +286,7 @@ int dup2_pass_on_exec(int oldd, int newd) - - /* closefrom() - closes all file descriptors from the given one up */ - --int closefrom(int lowfd) -+void closefrom(int lowfd) - { - int fd_limit = open_limit(0); - int fd; -@@ -298,14 +298,14 @@ int closefrom(int lowfd) - */ - if (lowfd < 0) { - errno = EBADF; -- return (-1); -+ return; - } - if (fd_limit > 500) - fd_limit = 500; - for (fd = lowfd; fd < fd_limit; fd++) - (void) close(fd); - -- return (0); -+ return; - } - - #endif -diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h -index 2e1c953..515de6c 100644 ---- a/src/util/sys_defs.h -+++ b/src/util/sys_defs.h -@@ -1509,7 +1509,7 @@ extern int setsid(void); - #endif - - #ifndef HAS_CLOSEFROM --extern int closefrom(int); -+extern void closefrom(int); - - #endif - -@@ -1563,7 +1563,7 @@ typedef int pid_t; - - /* - * Clang-style attribute tests. -- * -+ * - * XXX Without the unconditional test below, gcc 4.6 will barf on ``elif - * defined(__clang__) && __has_attribute(__whatever__)'' with error message - * ``missing binary operator before token "("''. -@@ -1577,7 +1577,7 @@ typedef int pid_t; - * warn for missing initializations and other trouble. However, OPENSTEP4 - * gcc 2.7.x cannot handle this so we define this only if NORETURN isn't - * already defined above. -- * -+ * - * Data point: gcc 2.7.2 has __attribute__ (Wietse Venema) but gcc 2.6.3 does - * not (Clive Jones). So we'll set the threshold at 2.7. - */ -@@ -1653,12 +1653,12 @@ typedef int pid_t; - * write to output parameters (for example, stat- or scanf-like functions) - * or from functions that have other useful side effects (for example, - * fseek- or rename-like functions). -- * -+ * - * DO NOT use this for functions that write to a stream; it is entirely - * legitimate to detect write errors with fflush() or fclose() only. On the - * other hand most (but not all) functions that read from a stream must - * never ignore result values. -- * -+ * - * XXX Prepending "(void)" won't shut up GCC. Clang behaves as expected. - */ - #if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ > 3) -@@ -1739,7 +1739,7 @@ typedef const char *CONST_CHAR_STAR; - * Safety. On some systems, ctype.h misbehaves with non-ASCII or negative - * characters. More importantly, Postfix uses the ISXXX() macros to ensure - * protocol compliance, so we have to rule out non-ASCII characters. -- * -+ * - * XXX The (unsigned char) casts in isalnum() etc arguments are unnecessary - * because the ISASCII() guard already ensures that the values are - * non-negative; the casts are done anyway to shut up chatty compilers. --- -2.17.1 - diff --git a/meta-networking/recipes-daemons/postfix/files/main.cf b/meta-networking/recipes-daemons/postfix/files/main.cf index e75c6fc0d..22c57485d 100644 --- a/meta-networking/recipes-daemons/postfix/files/main.cf +++ b/meta-networking/recipes-daemons/postfix/files/main.cf @@ -1,4 +1,4 @@ -compatibility_level = 2 +compatibility_level = 3.6 smtputf8_enable = no # Configure your domain and accounts diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.6.4.bb b/meta-networking/recipes-daemons/postfix/postfix_3.6.5.bb similarity index 82% rename from meta-networking/recipes-daemons/postfix/postfix_3.6.4.bb rename to meta-networking/recipes-daemons/postfix/postfix_3.6.5.bb index 54c8eab5c..343a8b2df 100644 --- a/meta-networking/recipes-daemons/postfix/postfix_3.6.4.bb +++ b/meta-networking/recipes-daemons/postfix/postfix_3.6.5.bb @@ -12,7 +12,6 @@ SRC_URI += "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \ file://0004-Fix-icu-config.patch \ file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ - file://0006-correct-signature-of-closefrom-API.patch \ " -SRC_URI[sha256sum] = "8de0619dcf2fa7c215a80cf84b82ab71631d4d4722cba0949725ce3e18031d4e" +SRC_URI[sha256sum] = "300fa8811cea20d01d25c619d359bffab82656e704daa719e0c9afc4ecff4808" UPSTREAM_CHECK_REGEX = "postfix\-(?P3\.6(\.\d+)+).tar.gz" From patchwork Tue Mar 22 04:46:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 5639 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 45E57C4332F for ; Tue, 22 Mar 2022 04:47:40 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web09.6097.1647924458551115738 for ; Mon, 21 Mar 2022 21:47:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=ZIzN6zkq; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=00800cfd2b=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 22M4Uhx2015198 for ; Mon, 21 Mar 2022 21:47:36 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=gYu06v+oO4vgK3KU7nfO+91XPr/Dimaq5q+7xHNUUN4=; b=ZIzN6zkqGIOLgOFmjhZondCf+K8aEY9E/fjXEAHmNuBvJTvLDln0zQWFo5q4wmVUsyJn p1Om8BOKnz9x4/P1fyVhAfd2kd5j6lfe1RylxW/Ot4xFiz2Prx9E0RWTKuVqELtYroba CNAYHjwp3eZhoAasFN6USXIp/a9RLvdSI8KS52ZxXL0zhQZHry8Z5UxpHBJrtBjsrTVu /Z6Ptd9r2CYQojcyklMXUY+8uBZjs39gZmh8nvsIGSdc5g9E+TBz9Sk2by3LbLBQr+bE aYJO6n1ALpGt6BypPLptHlQGu1nAvL7mA9R7un4VTZ/dOxY/7XKFtAsweE/2Ox2+fKcn YA== Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2047.outbound.protection.outlook.com [104.47.51.47]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3ewaf3t1qw-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 21 Mar 2022 21:47:35 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L7rfYz12kh7+53PFu900gnai3EyEeulOsUA/sIojiD3rWkzB9RBNkC061gHoxZBnYKuKMVzs6bM1yAl2M5sm8vg2dXHRYI/kOeE0qzYHvl2speAymQk1KljXP1I3wDJcOsxNTthSxCZKORm4oS/Q5cSFQWQsfOOwPWlkZ9kEyeUksGFJDYFyOw7Y5yC/+yReI/x7McUlfGeVPmLM43LMP0DrkUSxWgZblqNc/HMWVKPjajFPyZiCc8r7MzpsQTOnHOi6oYDLtai7k+BfPm7IYE3EHFmltHmU6h3Y2mVNLFyoNcEDNtlx6Grx8WlvS0Xx4TySspfeT+ONHJ8WnXejLg== 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=gYu06v+oO4vgK3KU7nfO+91XPr/Dimaq5q+7xHNUUN4=; b=m9aTAR8rvz+Ud+ru/APMKsANcnVLRqCvhMZOgHwr/TR3O5XIN/1vB4DMhlRPVYOErLwJn4stC2O/1wirwxcSRZoRFjBT7/qS8BNdLJarEGJ76ihDVxZ59WQnVClXqXZ9/kcpdix4DQSyqeEjQnTnliXEUVZGCMBj8jGYNiDbRKciCCpPYIo4VuQhCcuRO7oFv9DvZkw75B8EOXlgkyRuBtQbo/xfdGzT1hEO73TytrBMYc8UYCGwyAy2ehkIHRh094IfEwGjNHtc0VfHgk7BYyA+1itmU2X1IeFif+0N+8NiUhcY8+si/AOOby6x150MNM6qdqX2CMuf3Z+4dl/tjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by SA2PR11MB5098.namprd11.prod.outlook.com (2603:10b6:806:11c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.19; Tue, 22 Mar 2022 04:47:34 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::8ec:d095:e49b:d875]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::8ec:d095:e49b:d875%7]) with mapi id 15.20.5081.023; Tue, 22 Mar 2022 04:47:34 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 3/4] dhcp-relay: upgrade 4.4.2p1 -> 4.4.3 Date: Tue, 22 Mar 2022 12:46:15 +0800 Message-Id: <20220322044616.867009-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220322044616.867009-1-yi.zhao@windriver.com> References: <20220322044616.867009-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYAPR01CA0135.jpnprd01.prod.outlook.com (2603:1096:404:2d::27) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1d26b7be-aa45-45c5-3193-08da0bbf14cc X-MS-TrafficTypeDiagnostic: SA2PR11MB5098:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 39LNQ0v7XvEzmm6tPEq3qJoSEmEQr/KZogJ2CQhv15itxc7As8RxcqqC0Gg+tWOU7fTW8DjQlNcyMKqO4qvwjE4FT5iIM6AQY4EfEy3qnozMtktb9C+op0Tw5UI2SAa/hbNr4tFuZ5SUBUB6JTDVc7Eep85GqtJDso3AZm1A8zoDRjhRQVhRjltbjRCnNegoxGdnP4+eYJLXmDsNCR3dg2WXVixJOe1uxu7sZmER6g55LIilMSLpdZLtZHJgMkXfWt1aF8Yx1OVKlQ1RzWDhYZ4a5PznmaN5i/XgBaWA3UNcGg9PuiFhdtIxnZlYVsPgtGsavmOwEa1fHxO2d1IESsi+EXcoQMXxdZHe2r2y5alNYd4o/lAkWic2S3ou2nSUXAjAr0Rrp+FcYOxWaOhAlj9M2s4BfBzQRRWWDlJCgcftAvs8jRPM7JYLX2cloWIXxMuX3Cc7l65zMRVVz6D1EzsDQxzZukpM6pNfEWOG9H3zKEPh2iSeThK0qPTWSugDH4TzYO4h2JvvxjpBWgNzsWp3Fj8BNEYw1vs+P3Q1aYnuoXyvlvFJ3AtZOin7W/voJML2+aFfGvjtACHk4vdBprND00HQN6FUdrGRz2+ff55XCAI3jV1VGcxbyPmbssyQnMAap8j5OUL34XIX7kAqd20vxX+1JC8Mw5NGOk0Fi1xbhyJEsBFOAkpjEGiQ9ohauPaDjdkoliPeMjR7Zv3DXOzp5HTR0t4q+tFwyiFFR5FkJXGExPL8/M10WW2jRyNOH1eUYu/T2uB1DrJQyDio3Hgaw+BNPCJh7vjroMUKUSg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(2616005)(8936002)(5660300002)(1076003)(26005)(186003)(53546011)(6512007)(52116002)(2906002)(6506007)(44832011)(6666004)(30864003)(38100700002)(83380400001)(966005)(66574015)(86362001)(66946007)(66476007)(66556008)(36756003)(8676002)(316002)(6486002)(508600001)(6916009)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tDqyDuYGyPoC+QEQ0c88a3uiAGUQsfw4AFoluiZViUQxpm/xeSo1nsb1o5wS7QapHvRm6pzus3HAyx7n6ysbZRXw68N6cK0ZCFdbzGU8CmTwdvo6abb6UckYBRE/nQAC3eqGskvj2/Ws2sPMCgb92MrI1OKFXGqX3IQ3USBD0wk3Rw2D03dvJFtM3t6+ToXuAqjkJieKJzVvLyGpxgmDAQmcvuGbw/AsBvkkS+em7nEH/18he+F1pH9hOR16m0uuYSvHhNldHMyn48QrtioQn2PB3aw25I4pgaap6UvecSr8S69WFHTHi8Mm8Ktbwqi+YpY2ECU6N/+Xnz3MmYPeJu4Qk9/xZkqEHa8rv9NyaufvyKmtS7DWE0g8VXy/VZVe1UyNBdjxPcubtIxd7tpnbnX1azvEfsgEo3bn0DSBQjUpkWmYC4eEcXY34OgMLWdbvZ14sXexrUE6LK3JzuO9l5kAJ+3bN44xXRCvkwFXXDLG6YSL1TaE9kTj7OmORyWv+Qv/D1SGjDqzHCfYb3wbT0rlc1J+tS+WD0hmBoPHUrHM6YFxUk6dVAwWi+G8FF8w+kCW4jBMHo9dDOVPpVGx0jHoNnv9i2pzdE+GKFX5t2aLqT8UH8SQ+gKT9O5DI3b8azdQ+4Evq76sEW8FNT277YljxNwP/fnmtkqThkv3DNJPaoGQCD9OVGayyZSYSdP+jHT4fHPb5CRDuEyrW/SflcC1tbyfgTBApU6m655d+YA+sZvApm9umy6UOozGr6+IQuEkV6L9WMbst6bcKdS24oXSWXdPDm3aXJnefjnKk31qv1S+QEvA1Te+tCvC90rBhWi/UCPl2v9Qvu0xjjYZVtA/ERql0VQttUaXsrOGQY03B3e6xyStof1pFsjkOtvzxu87RcGB2urr3039SCl4A7RB4/3551gFM6vxk+lK+5YwV44J4C3bHMYKQa/5sQhKJtUbtMpSXTWUhltbhy2mkaOjrBPHPAHbNeReB1fb2giRAgEZ+j23ZecgVq4UrzSLtoZLy7HmQpP4a2AmxjzbJemBehca/sVpvRX1X4J6dKDxD6ylhdimc5aIgOXhGa4mY371TWofqcD4+9PhWI/1ygMQGTgMsW8Z12thR/Os5GCFRo4QFtbqi6oJan5P2NTekbN6x8b1jLXmPuu0jn4959A5WFvU4gFCTtrGTl4hxFC572IvnsFayl/7zh/GfnOjl8Y84MC3Xo0+mHWHWuBbBGVgWruv0zettlLER8oY0CDWjkIGHtBrAuB1KB3LCKULHdc4pMGVNlQ5GnVmZlirji/9KUfb/YlnzQ2qE6RWmNAACrbovbh+VTDA+c7JHOjnjitr4zJ5jdOm6ITpVMdvNFpnoB37P/wFnFslFglf9MQN0RQcw2bkdEwd7fPpX6BhcmgGyf/5vd16LclBhrZ5i3ngmVpPhyLz9t0OacVehbdKyOx1lQE4iyyHMjNVIcIF X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d26b7be-aa45-45c5-3193-08da0bbf14cc X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 04:47:34.4275 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: u44VTjzNHY5axYNqTa+GsmWMenUsQ8+vZyskLvTaIZ6Xm0XSmGi7sjd4jpeiDjHmkVUwexd7Q1HmeVb0Y4Dngw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB5098 X-Proofpoint-ORIG-GUID: vZBNhjXkJytMadmHsiulO-OXvP8cIep4 X-Proofpoint-GUID: vZBNhjXkJytMadmHsiulO-OXvP8cIep4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-21_10,2022-03-21_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 impostorscore=0 mlxscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 clxscore=1015 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203220026 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 ; Tue, 22 Mar 2022 04:47:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96129 License-Update: The ISC DHCP is licensed under the Mozilla Public License, MPL 2.0 rather than ISC License now[1][2]. [1] https://www.isc.org/licenses/ [2] https://downloads.isc.org/isc/dhcp/4.4.3/dhcp-4.4.3-RELNOTES The bundled BIND has been updated to 9.11.36. We don't need to download it from external anymore. Signed-off-by: Yi Zhao --- .../dhcp/dhcp-relay_4.4.2p1.bb | 83 ------------------- .../dhcp/dhcp-relay_4.4.3.bb | 62 ++++++++++++++ ...0001-Makefile.am-only-build-dhcrelay.patch | 4 +- ...-bind-Makefile.in-disable-backtrace.patch} | 6 +- ...ind-version-update-to-latest-version.patch | 30 ------- ...ind-Makefile.in-regenerate-configure.patch | 30 +++++++ 6 files changed, 97 insertions(+), 118 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb create mode 100644 meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3.bb rename meta-networking/recipes-connectivity/dhcp/files/{0003-bind-Makefile.in-disable-backtrace.patch => 0002-bind-Makefile.in-disable-backtrace.patch} (89%) delete mode 100644 meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch create mode 100644 meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch diff --git a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb deleted file mode 100644 index 8d4be95cf..000000000 --- a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb +++ /dev/null @@ -1,83 +0,0 @@ -SECTION = "console/network" -SUMMARY = "Internet Software Consortium DHCP Relay Agent" -DESCRIPTION = "A DHCP relay agent passes DHCP requests from one \ -LAN to another, so that a DHCP server is not needed on every LAN." - -HOMEPAGE = "http://www.isc.org/" - -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01" - -DEPENDS = "openssl libcap zlib chrpath-replacement-native" -EXTRANATIVEPATH += "chrpath-native" - -SRC_URI = "https://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz \ - https://ftp.isc.org/isc/bind9/9.11.32/bind-9.11.32.tar.gz;name=bind;unpack=0 \ - file://default-relay \ - file://init-relay \ - file://dhcrelay.service \ - file://0001-Makefile.am-only-build-dhcrelay.patch \ - file://0002-bind-version-update-to-latest-version.patch \ - file://0003-bind-Makefile.in-disable-backtrace.patch \ - " - -SRC_URI[md5sum] = "3089a1ebd20a802ec0870ae337d43907" -SRC_URI[sha256sum] = "b05e04337539545a8faa0d6ac518defc61a07e5aec66a857f455e7f218c85a1a" -SRC_URI[bind.md5sum] = "0d029dd06ca60c6739c3189c999ef757" -SRC_URI[bind.sha256sum] = "cbf8cb4b74dd1452d97c3a2a8c625ea346df8516b4b3508ef07443121a591342" - -UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/" -UPSTREAM_CHECK_REGEX = "(?P\d+\.\d+\.(\d+?))/" - -S = "${WORKDIR}/dhcp-4.4.2-P1" - -inherit autotools-brokensep systemd - -SYSTEMD_SERVICE:${PN} = "dhcrelay.service" -SYSTEMD_AUTO_ENABLE:${PN} = "disable" - -CFLAGS += "-D_GNU_SOURCE -fcommon" -LDFLAGS:append = " -pthread" - -EXTRA_OECONF = "--enable-paranoia \ - --disable-static \ - --enable-libtool \ - --with-randomdev=/dev/random \ - " - -# Enable shared libs per dhcp README -do_configure:prepend () { - cp configure.ac+lt configure.ac - cp ${WORKDIR}/bind-9.11.32.tar.gz ${S}/bind/bind.tar.gz -} - -do_compile:prepend() { - # Need to unpack this now instead of earlier as do_configure will delete the configure script - rm -rf ${S}/bind/bind-9.11.32/ - tar xf ${S}/bind/bind.tar.gz -C ${S}/bind - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/bind/bind-9.11.32/ - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/bind/bind-9.11.32/ - cp -fpR ${S}/m4/*.m4 ${S}/bind/bind-9.11.32/libtool.m4/ - rm -rf ${S}/bind/bind-9.11.32/libtool - install -m 0755 ${S}/libtool ${S}/bind/bind-9.11.32/ -} - -do_install:append () { - install -Dm 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay - install -Dm 0755 ${B}/bind/bind-9.11.32/lib/isccfg/.libs/libisccfg.so.163 ${D}${libdir}/libisccfg.so.163 - install -Dm 0755 ${B}/bind/bind-9.11.32/lib/dns/.libs/libdns.so.1115 ${D}${libdir}/libdns.so.1115 - chrpath --delete ${D}${libdir}/libisccfg.so.163 - chrpath --delete ${D}${libdir}/libdns.so.1115 - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcrelay.service - sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service - else - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay - fi -} - -PARALLEL_MAKE = "" diff --git a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3.bb b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3.bb new file mode 100644 index 000000000..92c648708 --- /dev/null +++ b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3.bb @@ -0,0 +1,62 @@ +SECTION = "console/network" +SUMMARY = "Internet Software Consortium DHCP Relay Agent" +DESCRIPTION = "A DHCP relay agent passes DHCP requests from one \ +LAN to another, so that a DHCP server is not needed on every LAN." + +HOMEPAGE = "http://www.isc.org/" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c463f4afde26d9eb60f14f50aeb85f8f" + +DEPENDS = "openssl libcap zlib" + +SRC_URI = "https://downloads.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ + file://default-relay \ + file://init-relay \ + file://dhcrelay.service \ + file://0001-Makefile.am-only-build-dhcrelay.patch \ + file://0002-bind-Makefile.in-disable-backtrace.patch \ + file://0003-bind-Makefile.in-regenerate-configure.patch \ + " + +SRC_URI[sha256sum] = "0e3ec6b4c2a05ec0148874bcd999a66d05518378d77421f607fb0bc9d0135818" + +UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/" +UPSTREAM_CHECK_REGEX = "(?P\d+\.\d+\.(\d+?))/" + +S = "${WORKDIR}/dhcp-${PV}" + +inherit autotools-brokensep systemd pkgconfig + +SYSTEMD_SERVICE:${PN} = "dhcrelay.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" + +CFLAGS += "-D_GNU_SOURCE -fcommon" +LDFLAGS:append = " -pthread" + +EXTRA_OECONF = "--enable-paranoia \ + --disable-static \ + --enable-libtool \ + --with-randomdev=/dev/random \ + " + +# Enable shared libs per dhcp README +do_configure:prepend () { + cp configure.ac+lt configure.ac +} + +do_install:append () { + install -Dm 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcrelay.service + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service + else + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay + fi +} + +PARALLEL_MAKE = "" diff --git a/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch b/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch index fed85d2a8..5320d7c9e 100644 --- a/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch +++ b/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch @@ -1,4 +1,4 @@ -From 17cc080e58894644dd18664ac6f3451096d5f065 Mon Sep 17 00:00:00 2001 +From 4fd67b6adb7c1d8524ba17d1a0b3894f901555a9 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 13 May 2021 15:23:16 +0800 Subject: [PATCH] Makefile.am: only build dhcrelay @@ -26,5 +26,5 @@ index ed692a5..34f9772 100644 DIST_SUBDIRS = $(SUBDIRS) keama -- -2.17.1 +2.25.1 diff --git a/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch b/meta-networking/recipes-connectivity/dhcp/files/0002-bind-Makefile.in-disable-backtrace.patch similarity index 89% rename from meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch rename to meta-networking/recipes-connectivity/dhcp/files/0002-bind-Makefile.in-disable-backtrace.patch index 51520bc62..631a640ec 100644 --- a/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch +++ b/meta-networking/recipes-connectivity/dhcp/files/0002-bind-Makefile.in-disable-backtrace.patch @@ -1,4 +1,4 @@ -From bc9c5d64ad4829c7830ef70fcaff94470974247c Mon Sep 17 00:00:00 2001 +From 6c6bbfe6b33e5c7e46a4260d656593dbe610fd8a Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Tue, 8 Jun 2021 10:13:57 +0800 Subject: [PATCH] bind/Makefile.in: disable backtrace @@ -14,7 +14,7 @@ Signed-off-by: Yi Zhao 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bind/Makefile.in b/bind/Makefile.in -index 8fe8883..1058160 100644 +index 2e60091..533d55c 100644 --- a/bind/Makefile.in +++ b/bind/Makefile.in @@ -22,7 +22,7 @@ prefix = @prefix@ @@ -27,5 +27,5 @@ index 8fe8883..1058160 100644 @BINDLT@ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report -- -2.17.1 +2.25.1 diff --git a/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch b/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch deleted file mode 100644 index 5c7a5f058..000000000 --- a/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch +++ /dev/null @@ -1,30 +0,0 @@ -From edb68972f8dc636e6208e78f02dec6f9805e4c0b Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Wed, 26 May 2021 11:39:00 +0800 -Subject: [PATCH] bind/version: update to latest version - -Update the bundled bind from 9.11.14 to 9.11.32. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yi Zhao ---- - bind/version.tmp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bind/version.tmp b/bind/version.tmp -index cf52f1b..4cc538e 100644 ---- a/bind/version.tmp -+++ b/bind/version.tmp -@@ -5,7 +5,7 @@ PRODUCT=BIND - DESCRIPTION="(Extended Support Version)" - MAJORVER=9 - MINORVER=11 --PATCHVER=14 -+PATCHVER=32 - RELEASETYPE= - RELEASEVER= - EXTENSIONS= --- -2.17.1 - diff --git a/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch b/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch new file mode 100644 index 000000000..71be0276a --- /dev/null +++ b/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch @@ -0,0 +1,30 @@ +From 6ca1b224032355521b35471d222d0b09c08369a0 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Thu, 27 May 2021 11:38:36 +0800 +Subject: [PATCH] bind/Makefile.in: regenerate configure + +Run autogen.sh to regenerate configure. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + bind/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bind/Makefile.in b/bind/Makefile.in +index 533d55c..fdffe15 100644 +--- a/bind/Makefile.in ++++ b/bind/Makefile.in +@@ -55,7 +55,7 @@ bind1: + else \ + echo Configuring BIND libraries for DHCP. ; \ + rm -rf ${cleandirs} ${cleanfiles} ; \ +- (cd ${bindsrcdir} && \ ++ (cd ${bindsrcdir} && ./autogen.sh && \ + ./configure ${bindconfig} > ${binddir}/configure.log); \ + fi + +-- +2.25.1 + From patchwork Tue Mar 22 04:46:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 5638 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 46535C433F5 for ; Tue, 22 Mar 2022 04:47:39 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.6121.1647924458552964869 for ; Mon, 21 Mar 2022 21:47:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=KZWUHJGF; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=00800cfd2b=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 22M4Mc12028800 for ; Tue, 22 Mar 2022 04:47:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=kyxSD/HjE/FF/x0eklJshP4OjIYp5Sbf40KoonbkHS0=; b=KZWUHJGFYpZU+cWLbX5Peub5iZs0nwFDHboh0d3qx+5MPdCne+NBDNXBeduv5v2tIVDT 5Wy9JGmqQ/CXxPAgecUAxbELN4inN+g1DinciB0KQy7urOvPZyHcQQb4n80j0oAWX8f2 kxYlWFwQh4USLF00AR/bwRF1M3iCHN3yHpnODahlF+AUx/7MYlEZ6vxHjvfrwYBPyVWI q+3oq79/qkTat38bpOBJtUnaPXcd+ML9V83uEyox47yNWfEaWjffUsQzc7Po+XR4h1E7 ow2u+tP/fipcbnOrIUzcqwbOMrYnJKfkT0bFT79HwoVyMJxakU4uM8yKMG0rhfsaq17U jg== Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2048.outbound.protection.outlook.com [104.47.51.48]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3ew657a51q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 22 Mar 2022 04:47:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gLJQ9wsDiJcvurfpuc5XDW1uyJy1+SRD221DG5meYMGDdIbRLuEd83zWxzqwwQ2pFUcBL4Q6bSPovZGZik5CRMNqu2b7NNVi87C+uMmRT4K2z66IgBcFGBi1wwMS1B21XDC8E3bbJLcak/2Jpd3nZRgAwDCmztYqpf6Qso5iAnPoNPGd9AJt/g9hc1sL/IGkFFJWRXtPZJkqiWx5dmb3DKJYBg+ttKNSBMUtFgdIsuMFTcRxrdlA9qC76az1pqz4tUVfou5fRBVxuqGLmXVbsWBbC78yPQtOSVzuzUvZwe2jVIuoCOBStfayVLiH60432HZPTzHaKhhRhVz3XZlHUA== 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=kyxSD/HjE/FF/x0eklJshP4OjIYp5Sbf40KoonbkHS0=; b=hmH0wLCj38Odjm6k//lzpkPK+4dzTgTsLrWlnei/OIUXn/oiaoKoV7CcsXjV6dbQ6trI4oDutAuUlVlkjqcWofhUIg1L++AfQALCW6AAFI2FJWOUV899bXP188pUscmYq3T4Byz+7D+pbJd0Umb+OqWSxXaEeidqk+aogO6fDJSNek0FGTbkWbQCqvQEx/Yn4E1p1rOh2c+JNlG3DTHT/dKSB1G9w0+dPNnaQzql3mjX/7xqWLGCGlXALaz15WPhz0ZD3yzHzJPZziJrd30JmeqoCwjH/Zppce5GhKEEbf+neJWLjrpzuBmQbTUxnJSQJHzSyprGVuZK3Tq1Xt6Dvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by SA2PR11MB5098.namprd11.prod.outlook.com (2603:10b6:806:11c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.19; Tue, 22 Mar 2022 04:47:35 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::8ec:d095:e49b:d875]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::8ec:d095:e49b:d875%7]) with mapi id 15.20.5081.023; Tue, 22 Mar 2022 04:47:35 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-webserver][PATCH 4/4] apache2: upgrade 2.4.52 -> 2.4.53 Date: Tue, 22 Mar 2022 12:46:16 +0800 Message-Id: <20220322044616.867009-4-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220322044616.867009-1-yi.zhao@windriver.com> References: <20220322044616.867009-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYAPR01CA0135.jpnprd01.prod.outlook.com (2603:1096:404:2d::27) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dae4aa55-1299-4f23-fd0e-08da0bbf1577 X-MS-TrafficTypeDiagnostic: SA2PR11MB5098:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1/fNFQE1ZxO1K2xVpgVs02u7jvGhZy3nZ0YoRLTByUrKHIqZAXSGLJSYbbkKE9VFXtAZwpvJ/jiWxG0lEy3HodwWkwYoPQhZC0Lc6pXTZQ7H6AXS+T/eZc0lejyqpnlsSSdxCS8cu0W+WNi0CnEhbmi3VxQsl1mnFGVcRWKaaAZAVdOcMxUobVGVz+FcfRnpD41Q5uqVt8oHx7jJdeAnICRwol0cl9CCDO18M+QHDpFaDcD+9T24fOnrjlMOnvBAguNGPjUe50HSepA7m5M0OY7pJ23AVV0sK3brTl5rAep+oxmFe6w1PuMys9WxBCwDTHctyZ1i0W5tEGrJNdIuIIiklqFrJXZFOriFY1ISHToxR43CYzZmwUG6LlYEJi5QKNXClvYnPQhzb+xdsol8bDBkpzt9pwDp2UJtCnWLePSXhVjp/+8ltSVDuGaSsTfv9oS6TnTOP6R5Hi2dLc0DFKSGVPIIhoVsuyeQOR+1fivQRyMEJR4m/s53cfT43k4BNWAAaxnPQnsZyuqzBhbeRCpOXSmy0wEQDicGv+NFjgquUDTtlFtkO/IutX581JlrCincZLywMOMek7z4ZFcCqdqk6o7H4ZTxoet04M7KRFmukaKKFi0Bd7UDD3vwCe09G0bmsuuDTCpZLx1Ww/GQaURMa8CXsiO21Ccwj/b8Zq/iceDO8tJZjpdhOOgnxrJI5th8OeXcj1Hk2TXz/g42/yPxbgVOz0u3FWMrozPSMpG4RiNzCnqNjM/7Unl/sjW0/vhCRbnCNTTgVVO4s5A2MZvm4/fECWNWWdWhf2Bg7ag= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(2616005)(8936002)(5660300002)(1076003)(26005)(186003)(53546011)(6512007)(52116002)(2906002)(6506007)(44832011)(6666004)(30864003)(38100700002)(83380400001)(966005)(86362001)(66946007)(66476007)(66556008)(36756003)(8676002)(316002)(6486002)(508600001)(6916009)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jm0my4OqLXtVJfC2yhutlSegz5c9GmT7GXmADvO7WC4uvxBgtrhAOeSMTViNJ8pvNYC6YtIR942FOB3NgRnLao+zIl88PtnNDqJ3uzIYKmkGuxwECh8+uAULxjRGnEFV+sNrfjWPV6ZxhldkPppQrF5/f3hM5g739tVBra99CUzyI5mTeCT0juUazTRb3yHLGXkMgtqEoB6qQKWZVqOn3ZDxmgCymnIKamfZMWfIJT12HQkiel6+Cd70zKQAkpGnI8cFPf79QtlfrpNqM3rG4pTQ/N9gKZXS3woU46Q4K3NUq6TMAYcOkojHoWTnmtNm9cnzLcoHFbUEOOO7p9wGiZ0tip9UXtW3DWKEF81hxQci/MoYLWEsQR7dE6hn7hn8IbW1UFUCLaDqyJDhmbnxEsdRVaVxOh+VkScPoKW+x1dH39wUaly77pHKv8mIMp8KVaBZuCKOHMZ1W2yUJbJmITH0QPL1v1f6UgjtbghnNrpyxhXUDR5bXTolsG/RZLJQnCh3hA2RsMB2ZRwpZN72w3JGbjTXa5Citpin2Pshw+8vAb6RoRVlSey9p++5fTgyenK7dTKcdzpx6wfS9ZbtUB3VfmM6DfM/N+0j7FPh/2ROoyjHIUg/7XJAQjJ4NMlKKX34igLXAKuJcqlnAEb3zHhd/2xdh7lwJAcbobRAAhf4SWQXfHYu5nBzT3eFccsMiw4KHTtYfGSleZJmA+QsGZoazxR1MQlUVfCvcu17g+dmnbJ8yXj8bcsFpdVa3IfjM121mu7kkNpEFq8Yzfoo+qqEgbUEO9L8gqoLm6cuBlTnpIQKcDlJGhhArBofs+KiSebpQ+pD1p5NytKTpKzzngHcC3BFCFWjbRO4kLGmO+E3tyF6qkx+DqLyoMkUNG3zzhXQt52wIagYoMnw8EqogAy7bj3dyPvfA++ur9XzGGGA+r0wFTV82kFegV1rnhsESi220y6fE1Ch7yVmSxZE8BiFOfLp6Ff40Kl5czyi+uvr3yyfJMAop6jtsVwIfgRQOdCzC2xI9fqMdAPtPlMLegs5x7/4T8VYw3C+PQ3INvvwGJwANTje2ejbL0mWfiR5Y0S8u7gcuT5xJ9jC0i1CI3IPFCa4dUnRArEH75QPQlfEld0vDGk+1MNPvmcaOQBlwDwCgz0rpK0rWhGeUxcLCBAldfta5Eg7uXnLHPvJwxbbd/EJO/27MJ6SDjiFEqV/qGNj2L+B/fK4O2Tv0JPs56uMeHLqpvae/4fKUNF5cAwSFuha+5xiNs+laZ0DiGydjJUiu+eduoC0vJOFMsINPbL/BUzP+K/FIV/rUannxKm9JFvEKrYS1X50wb67wpVd/tk6KeaqzLM3kKHdWGgFqwLQ2M98L+Z1I60AzcGqoY4tbVIPcoCdFt6VFEA4+IFoK8yHNoKAzfV4OyM0MUZcjDWNLAXJPTfDzxBqQi1YhLtxDMsFJ9dXYD1E5UwA/WEZ X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: dae4aa55-1299-4f23-fd0e-08da0bbf1577 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 04:47:35.6315 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: IgSR6o3n56IsqIzL7eHXdZ95RdnE3N+SGnFacOfp/hqFLC3Ebk9TQae4EngVV5KYfaHrWujD5RBkCaVmemP2Pg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB5098 X-Proofpoint-GUID: rnH8VnUp-6QtUjoFmMGai-dhXyv2GZ__ X-Proofpoint-ORIG-GUID: rnH8VnUp-6QtUjoFmMGai-dhXyv2GZ__ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-21_10,2022-03-21_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 mlxscore=0 suspectscore=0 spamscore=0 phishscore=0 impostorscore=0 priorityscore=1501 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203220026 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 ; Tue, 22 Mar 2022 04:47:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96127 ChangeLog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Security fixes: CVE-2022-23943 CVE-2022-22721 CVE-2022-22720 CVE-2022-22719 Refresh patches. Signed-off-by: Yi Zhao --- ...re-use-pkg-config-for-PCRE-detection.patch | 37 +++++++++---------- ...the-core-size-limit-if-CoreDumpDirec.patch | 13 +++---- ...xport-apr-apr-util-symbols-when-usin.patch | 11 +++--- ...2-log-the-SELinux-context-at-startup.patch | 15 ++++---- ...ace-lynx-to-curl-in-apachectl-script.patch | 4 +- ...-race-issue-of-parallel-installation.patch | 4 +- ...he2-allow-to-disable-selinux-support.patch | 8 ++-- ...x-perl-install-directory-to-usr-bin.patch} | 10 +++-- ...in-force-destdir-to-be-empty-string.patch} | 10 ++--- ...use-relative-path-for-gen_test_char.patch} | 7 ++-- .../{apache2_2.4.52.bb => apache2_2.4.53.bb} | 8 ++-- 11 files changed, 62 insertions(+), 65 deletions(-) rename meta-webserver/recipes-httpd/apache2/apache2/{apache-configure_perlbin.patch => 0008-Fix-perl-install-directory-to-usr-bin.patch} (85%) rename meta-webserver/recipes-httpd/apache2/apache2/{0001-support-apxs.in-force-destdir-to-be-empty-string.patch => 0009-support-apxs.in-force-destdir-to-be-empty-string.patch} (90%) rename meta-webserver/recipes-httpd/apache2/apache2/{0008-apache2-do-not-use-relative-path-for-gen_test_char.patch => 0010-apache2-do-not-use-relative-path-for-gen_test_char.patch} (86%) rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.52.bb => apache2_2.4.53.bb} (96%) diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0001-configure-use-pkg-config-for-PCRE-detection.patch b/meta-webserver/recipes-httpd/apache2/apache2/0001-configure-use-pkg-config-for-PCRE-detection.patch index 6c0286457..50775be53 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0001-configure-use-pkg-config-for-PCRE-detection.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0001-configure-use-pkg-config-for-PCRE-detection.patch @@ -1,44 +1,43 @@ -From d2cedfa3394365689a3f7c8cfe8e0dd56b29bed9 Mon Sep 17 00:00:00 2001 +From ba9015386cbc044e111d7c266f13e2be045e4bf1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 17 Jun 2014 09:10:57 +0200 Subject: [PATCH] configure: use pkg-config for PCRE detection -Upstream-Status: Pending +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Koen Kooi --- - configure.in | 27 +++++---------------------- - 1 file changed, 5 insertions(+), 22 deletions(-) + configure.in | 26 +++++--------------------- + 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/configure.in b/configure.in -index 9feaceb..dc6ea15 100644 +index 38c1d0a..c799aec 100644 --- a/configure.in +++ b/configure.in -@@ -215,28 +215,11 @@ fi - AC_ARG_WITH(pcre, - APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library)) +@@ -221,27 +221,11 @@ else if which $with_pcre 2>/dev/null; then :; else + fi + fi --AC_PATH_PROG(PCRE_CONFIG, pcre-config, false) --if test -d "$with_pcre" && test -x "$with_pcre/bin/pcre-config"; then -- PCRE_CONFIG=$with_pcre/bin/pcre-config --elif test -x "$with_pcre"; then -- PCRE_CONFIG=$with_pcre --fi +-AC_CHECK_TARGET_TOOLS(PCRE_CONFIG, [pcre2-config pcre-config], +- [`which $with_pcre 2>/dev/null`], $with_pcre) - --if test "$PCRE_CONFIG" != "false"; then +-if test "x$PCRE_CONFIG" != "x"; then - if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else -- AC_MSG_ERROR([Did not find pcre-config script at $PCRE_CONFIG]) +- AC_MSG_ERROR([Did not find working script at $PCRE_CONFIG]) - fi - case `$PCRE_CONFIG --version` in +- [1[0-9].*]) +- AC_DEFINE(HAVE_PCRE2, 1, [Detected PCRE2]) +- ;; - [[1-5].*]) - AC_MSG_ERROR([Need at least pcre version 6.0]) - ;; - esac - AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG]) - APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`]) -- APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs`]) +- APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs8 2>/dev/null || $PCRE_CONFIG --libs`]) -else -- AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/]) +- AC_MSG_ERROR([pcre(2)-config for libpcre not found. PCRE is required and available from http://pcre.org/]) -fi +PKG_CHECK_MODULES([PCRE], [libpcre], [ + AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) @@ -49,5 +48,5 @@ index 9feaceb..dc6ea15 100644 AC_MSG_NOTICE([]) -- -2.7.4 +2.25.1 diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch b/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch index 85fe6ae4b..bbe8b325b 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch @@ -1,8 +1,8 @@ -From 7df207ad4d0dcda2ad36e5642296e0dec7e13647 Mon Sep 17 00:00:00 2001 +From 5074ab3425e5f1e01fd9cfa2d9b7300ea1b3f38f Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 17 Jul 2012 11:27:39 +0100 -Subject: [PATCH] apache2: bump up the core size limit if CoreDumpDirectory - is configured +Subject: [PATCH] apache2: bump up the core size limit if CoreDumpDirectory is + configured Bump up the core size limit if CoreDumpDirectory is configured. @@ -11,16 +11,15 @@ Upstream-Status: Pending Note: upstreaming was discussed but there are competing desires; there are portability oddities here too. - --- server/core.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/server/core.c b/server/core.c -index eacb54f..7aa841f 100644 +index 090e397..3020090 100644 --- a/server/core.c +++ b/server/core.c -@@ -4965,6 +4965,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte +@@ -5107,6 +5107,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte } apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper, apr_pool_cleanup_null); @@ -47,5 +46,5 @@ index eacb54f..7aa841f 100644 } -- -2.7.4 +2.25.1 diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch b/meta-webserver/recipes-httpd/apache2/apache2/0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch index 081a02baa..adb728ba3 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch @@ -1,8 +1,8 @@ -From ddd560024a6d526187fd126f306b59533ca3f7e2 Mon Sep 17 00:00:00 2001 +From 9c03ed909b8da0e1a288f53fda535a3f15bcf791 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 17 Jul 2012 11:27:39 +0100 -Subject: [PATCH] apache2: do not export apr/apr-util symbols when using - shared libapr +Subject: [PATCH] apache2: do not export apr/apr-util symbols when using shared + libapr There is no need to "suck in" the apr/apr-util symbols when using a shared libapr{,util}, it just bloats the symbol table; so don't. @@ -10,13 +10,12 @@ a shared libapr{,util}, it just bloats the symbol table; so don't. Upstream-Status: Pending Note: EXPORT_DIRS change is conditional on using shared apr - --- server/Makefile.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/server/Makefile.in b/server/Makefile.in -index 1fa3344..f635d76 100644 +index 8111877..8c0c396 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -60,9 +60,6 @@ export_files: @@ -30,5 +29,5 @@ index 1fa3344..f635d76 100644 exports.c: export_files -- -2.7.4 +2.25.1 diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch b/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch index 78a04d9af..5d8291968 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch @@ -1,4 +1,4 @@ -From dfa834ebd449df299f54e98f0fb3a7bb4008fb03 Mon Sep 17 00:00:00 2001 +From 37699e9be04d83c5923644e298f400e077f76e85 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 17 Jul 2012 11:27:39 +0100 Subject: [PATCH] Log the SELinux context at startup. @@ -8,17 +8,16 @@ Log the SELinux context at startup. Upstream-Status: Inappropriate [other] Note: unlikely to be any interest in this upstream - --- configure.in | 5 +++++ server/core.c | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/configure.in b/configure.in -index dc6ea15..caa6f54 100644 +index c799aec..76811e7 100644 --- a/configure.in +++ b/configure.in -@@ -466,6 +466,11 @@ getloadavg +@@ -491,6 +491,11 @@ getloadavg dnl confirm that a void pointer is large enough to store a long integer APACHE_CHECK_VOID_PTR_LEN @@ -31,10 +30,10 @@ index dc6ea15..caa6f54 100644 [AC_TRY_RUN(#define _GNU_SOURCE #include diff --git a/server/core.c b/server/core.c -index 7aa841f..79f34db 100644 +index 3020090..8fef5fd 100644 --- a/server/core.c +++ b/server/core.c -@@ -59,6 +59,10 @@ +@@ -65,6 +65,10 @@ #include #endif @@ -45,7 +44,7 @@ index 7aa841f..79f34db 100644 /* LimitRequestBody handling */ #define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1) #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 0) -@@ -4984,6 +4988,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte +@@ -5126,6 +5130,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte } #endif @@ -75,5 +74,5 @@ index 7aa841f..79f34db 100644 } -- -2.7.4 +2.25.1 diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0005-replace-lynx-to-curl-in-apachectl-script.patch b/meta-webserver/recipes-httpd/apache2/apache2/0005-replace-lynx-to-curl-in-apachectl-script.patch index 47320a9ee..7b4a1b932 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0005-replace-lynx-to-curl-in-apachectl-script.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0005-replace-lynx-to-curl-in-apachectl-script.patch @@ -1,4 +1,4 @@ -From 7db1b650bb4b01a5194a34cd7573f915656a595b Mon Sep 17 00:00:00 2001 +From e59aab44a28c654e518080693d573ca472ca5a08 Mon Sep 17 00:00:00 2001 From: Yulong Pei Date: Thu, 1 Sep 2011 01:03:14 +0800 Subject: [PATCH] replace lynx to curl in apachectl script @@ -48,5 +48,5 @@ index 3281c2e..6ab4ba5 100644 *) $HTTPD "$@" -- -2.7.4 +2.25.1 diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch b/meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch index 227d04064..dbaf01d2c 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch @@ -1,4 +1,4 @@ -From 4f4d7d6b88b6e440263ebeb22dfb40c52bb30fd8 Mon Sep 17 00:00:00 2001 +From fb09f1fe4525058b16b3d4edb2e3ae693154026e Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Fri, 25 Jan 2013 18:10:50 +0800 Subject: [PATCH] apache2: fix the race issue of parallel installation @@ -31,5 +31,5 @@ index e2d5bb6..dde5ae0 100755 pathcomp="$pathcomp/" done -- -2.7.4 +2.25.1 diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0007-apache2-allow-to-disable-selinux-support.patch b/meta-webserver/recipes-httpd/apache2/apache2/0007-apache2-allow-to-disable-selinux-support.patch index fed6b5010..3ff689440 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0007-apache2-allow-to-disable-selinux-support.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0007-apache2-allow-to-disable-selinux-support.patch @@ -1,4 +1,4 @@ -From 964ef2c1af74984602f46e7db938d3b95b148385 Mon Sep 17 00:00:00 2001 +From 0686564f64130f230870db8b4846973e3edbd646 Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Mon, 1 Dec 2014 02:08:27 -0500 Subject: [PATCH] apache2: allow to disable selinux support @@ -11,10 +11,10 @@ Signed-off-by: Wenzong Fan 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in -index caa6f54..eab2090 100644 +index 76811e7..4df3ff3 100644 --- a/configure.in +++ b/configure.in -@@ -466,10 +466,16 @@ getloadavg +@@ -491,10 +491,16 @@ getloadavg dnl confirm that a void pointer is large enough to store a long integer APACHE_CHECK_VOID_PTR_LEN @@ -36,5 +36,5 @@ index caa6f54..eab2090 100644 AC_CACHE_CHECK([for gettid()], ac_cv_gettid, [AC_TRY_RUN(#define _GNU_SOURCE -- -2.7.4 +2.25.1 diff --git a/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch b/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch similarity index 85% rename from meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch rename to meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch index 61669e364..dc5b5c88f 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch @@ -1,4 +1,4 @@ -From 5412077c398dec74321388fe6e593a44c4c80de6 Mon Sep 17 00:00:00 2001 +From 443d15b91d4e4979d92405610303797663f31102 Mon Sep 17 00:00:00 2001 From: echo Date: Tue, 28 Apr 2009 03:11:06 +0000 Subject: [PATCH] Fix perl install directory to /usr/bin @@ -11,16 +11,15 @@ error: bad interpreter: No such file or directory Signed-off-by: Changqing Li - --- configure.in | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/configure.in b/configure.in -index d828512..be7bd25 100644 +index 4df3ff3..4eeb609 100644 --- a/configure.in +++ b/configure.in -@@ -855,10 +855,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", +@@ -903,10 +903,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", [Location of the MIME types config file, relative to the Apache root directory]) @@ -32,3 +31,6 @@ index d828512..be7bd25 100644 AC_SUBST(perlbin) dnl If we are running on BSD/OS, we need to use the BSD .include syntax. +-- +2.25.1 + diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0001-support-apxs.in-force-destdir-to-be-empty-string.patch b/meta-webserver/recipes-httpd/apache2/apache2/0009-support-apxs.in-force-destdir-to-be-empty-string.patch similarity index 90% rename from meta-webserver/recipes-httpd/apache2/apache2/0001-support-apxs.in-force-destdir-to-be-empty-string.patch rename to meta-webserver/recipes-httpd/apache2/apache2/0009-support-apxs.in-force-destdir-to-be-empty-string.patch index bdedd146c..d1f9bb0f4 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0001-support-apxs.in-force-destdir-to-be-empty-string.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0009-support-apxs.in-force-destdir-to-be-empty-string.patch @@ -1,10 +1,10 @@ -From 705c0a7e9d9c1e64ee09fc0b54f6b5a4e27de1ca Mon Sep 17 00:00:00 2001 +From 43a4ad04e0d8771267a73f98b5918bcd10b167ec Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Fri, 17 Apr 2020 06:31:35 -0700 Subject: [PATCH] support/apxs.in: force destdir to be empty string -If destdir is assigned to anything other than the empty string, the -search path for apache2 config files is appended to itself, and +If destdir is assigned to anything other than the empty string, the +search path for apache2 config files is appended to itself, and related packages like apache-websocket will be unable to locate them: | cannot open @@ -24,7 +24,7 @@ Signed-off-by: Trevor Gamblin 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/support/apxs.in b/support/apxs.in -index 65e1288527..9d96e33728 100644 +index b2705fa..781f2ab 100644 --- a/support/apxs.in +++ b/support/apxs.in @@ -28,10 +28,12 @@ package apxs; @@ -45,5 +45,5 @@ index 65e1288527..9d96e33728 100644 my %config_vars = (); -- -2.17.1 +2.25.1 diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0008-apache2-do-not-use-relative-path-for-gen_test_char.patch b/meta-webserver/recipes-httpd/apache2/apache2/0010-apache2-do-not-use-relative-path-for-gen_test_char.patch similarity index 86% rename from meta-webserver/recipes-httpd/apache2/apache2/0008-apache2-do-not-use-relative-path-for-gen_test_char.patch rename to meta-webserver/recipes-httpd/apache2/apache2/0010-apache2-do-not-use-relative-path-for-gen_test_char.patch index 82e9e8c35..ced8469f3 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0008-apache2-do-not-use-relative-path-for-gen_test_char.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0010-apache2-do-not-use-relative-path-for-gen_test_char.patch @@ -1,16 +1,15 @@ -From b62c4cd2295c98b2ebe12641e5f01590bd96ae94 Mon Sep 17 00:00:00 2001 +From d9993cbc33565c0acd29b0127d651dafa2a16975 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 17 Jul 2012 11:27:39 +0100 Subject: [PATCH] apache2: do not use relative path for gen_test_char Upstream-Status: Inappropriate [embedded specific] - --- server/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/Makefile.in b/server/Makefile.in -index f635d76..0d48924 100644 +index 8c0c396..3544f55 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -29,7 +29,7 @@ gen_test_char: $(gen_test_char_OBJECTS) @@ -23,5 +22,5 @@ index f635d76..0d48924 100644 util.lo: test_char.h -- -2.7.4 +2.25.1 diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.52.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.53.bb similarity index 96% rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.52.bb rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.53.bb index 39407b8a1..8413f5379 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.52.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.53.bb @@ -13,12 +13,12 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ file://0005-replace-lynx-to-curl-in-apachectl-script.patch \ file://0006-apache2-fix-the-race-issue-of-parallel-installation.patch \ file://0007-apache2-allow-to-disable-selinux-support.patch \ - file://apache-configure_perlbin.patch \ - file://0001-support-apxs.in-force-destdir-to-be-empty-string.patch \ + file://0008-Fix-perl-install-directory-to-usr-bin.patch \ + file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \ " SRC_URI:append:class-target = " \ - file://0008-apache2-do-not-use-relative-path-for-gen_test_char.patch \ + file://0010-apache2-do-not-use-relative-path-for-gen_test_char.patch \ file://init \ file://apache2-volatile.conf \ file://apache2.service \ @@ -26,7 +26,7 @@ SRC_URI:append:class-target = " \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" -SRC_URI[sha256sum] = "0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9" +SRC_URI[sha256sum] = "d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63" S = "${WORKDIR}/httpd-${PV}"