From patchwork Thu Oct 10 01:58:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 50191 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 08DD8CEDDB7 for ; Thu, 10 Oct 2024 01:59:16 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.34114.1728525550444384832 for ; Wed, 09 Oct 2024 18:59:10 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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=00130c5401=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49A0EWpA024568 for ; Wed, 9 Oct 2024 18:59:10 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2044.outbound.protection.outlook.com [104.47.70.44]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4234ykvsdn-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 09 Oct 2024 18:59:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=c4qk1QondzfGTt676eXn3uQewMfdh5PvWZ1r+MR/v6r8ytu18gbdc/GS+8i3bViRNG4XqpJ7UnJdnEiIjKriOc9dk8GeKdsWg0eO2dtqVRMI5jgTwxpf0tk5L6oSap/QdUFkCPzSlbqLSdwXchBSS4Z+Z/CQ5oN5DulTWAZzLuQWzWBQQLNvg+hhtFFwVhB8jZINW7ZiN0zC/Fh/Mmjk7zfRYEqCvT6PZ2ZKepn0O0cX79sgS200lF9HiKgE4iHTJwPAONqTT7aTtMvr8QKbZNZcZpfdLVZgCnXEzc3/QJQGK8dCF+q1INud/UKI7M7rIHk6iOIGZSBIoug9xDro2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=qywF3CQpWECO1ef6SW2Q6KFMlGxaCIYLr/aF/HKcuv4=; b=eK7qgcFj5nNxCQ3/0FXINWJP6N+dm5tAZBzncoJGm6EdYHcGI002vK1ZC/xoRBuo2wHavxNU3LiR199a5yAsY+bg5MsRDW8XfK95iKKphBsQe5orgogLDtU95K5rbz5Tnb2TJSHwB/uheM1BSVraMCS6uZBFNMkGgYAKP/L+2W8L+zTIfRGQJ1q64WaV1jSByY1Hl6ZDCq+n8HMuOyrlBGM1TAA0ayIGs7HEh1CGmTvI6t7wlHotNK6bVol70jrcuHFg7JeMPF/hx4X2gwRqfxvZJWVwtZWu9lOo+NlyYr1YB3VTCsSv5i2OWy14OuIZLF1y7vtt8c0kvjF9+ML4Cw== 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 DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by SA1PR11MB8491.namprd11.prod.outlook.com (2603:10b6:806:3ac::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.23; Thu, 10 Oct 2024 01:59:06 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%5]) with mapi id 15.20.8026.020; Thu, 10 Oct 2024 01:59:06 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 2/2 V2] redis: upgrade 7.2.5 -> 7.2.6 Date: Thu, 10 Oct 2024 09:58:45 +0800 Message-Id: <20241010015845.4140358-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241010015845.4140358-1-yi.zhao@windriver.com> References: <20241010015845.4140358-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCP286CA0092.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::10) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|SA1PR11MB8491:EE_ X-MS-Office365-Filtering-Correlation-Id: 486b5251-d933-4422-471c-08dce8cf1e9d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?CgdrfiUI+Eef4OMlBNEFnPyPHQSkB9n?= =?utf-8?q?cDHF4Yuj5zCHQiFYfONt0KxJbyakvIwL4rUXUoAp2UfvYXbo4UvBYtvWv7Xxl324v?= =?utf-8?q?0X15LB59G4mDhXvkWebZcNJ/Gaqylnj6vLlWAfQGPhgqcOz21yuoQSkBbJ1nzCOhk?= =?utf-8?q?0KbwrzvP41Bf3I4io7zmkgQ6MD5P/u72zXhuUefzI5m0mkl9H8d/3M3ONq8xXk2Io?= =?utf-8?q?JA6ZXwz9CNTTwepE5KrF+4AXf7JBtoJGvoazfR4z9WyKhaMZEjNxky+P2DmikeT5d?= =?utf-8?q?vvLvu3KUiebPxA592UocLYp9p2r6OBb8eFveSnf0IHb9jfBURvVgpxnMS6vfHEf5v?= =?utf-8?q?9XSAXnHMaMSAFr7FdgzfYXSvK6SBO0qdQYaUEncowy5eFh52dPngngfTjjNMJjkzY?= =?utf-8?q?ANK0kSwieVjW/aAlovnynmYyavnyE3O+bGYMwOTmDeJq09dliPt1dRJcPsEJ33n4y?= =?utf-8?q?A5Y26+4yDDN0WRkBCvbVAkVs4NtMA0zs6CrrSJLANH/0tn/l+3r2vJY05uqFZtino?= =?utf-8?q?5TqO950wqhsm6LnXtQrALLu0H8hZOuFaXEQE0sid0pYRc6HwuOdiBpFP9/i0E1pGT?= =?utf-8?q?mW4l9ov+nvZNcTqKh+BhVS0gHkAi5JH76EQb3lfZnhw0OyvlXCMZNy8cXBOv5qFWd?= =?utf-8?q?m9CYE2p4km5MVo+iLv8SeCNQMovugT1pxETXfGoww9xzYtQXmC4dACEGNSbTEvbZ4?= =?utf-8?q?KXI+BVQGftfVhANQMfuFTqajn/fUmfFJzmPOcc4KeSq/Mlc2YrdDX97ReJNxSlWeq?= =?utf-8?q?0d7GhTiDjLzn21QbyEQ1LlIGLmEtZo815gXcvuIogRK4ymKRC+6E66NhPfqyy9rcZ?= =?utf-8?q?+Pn0cYX8QT4ejA4QBqFEfZ+vh8UYmQ4dBytAdop/SfqmYJjnyUhx5eM30irFc+619?= =?utf-8?q?EtqmPiPP1rqC4iV3NnWmvIWdx/xvVkJk4mSdtV5qbcwDk85MwFv0SSVdO55w+/LKp?= =?utf-8?q?xi6CE8/hoz0zuVm+wij9A8rRaYvcP9sv7LJT1CIFf1Itu0i011Xb01w4AwvOw1Y/N?= =?utf-8?q?Ao3Xby/YaFbyN+kTBfoR/kQNbNm76ww7L6pHg4p6e/hrt5We21xokWr4IQ3p2cU4B?= =?utf-8?q?hgiJUOPl6dVIItzCMmwUQMap5AwZ16pfuKS20V8k32jM36/dknoKvEBUdtOjmDgz7?= =?utf-8?q?WD3UNdRCpx4uwXLlhKunHtAm/AWLCKXzqOtGHlwJBr05C8qNP0OlM59LfLyPbVyFY?= =?utf-8?q?RRKknx3q5TzOuPQNSLLhTq214m5Dobsk5mxA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?LYKHdBGfZYcEM1DvFIIkv9g9+UL+?= =?utf-8?q?Hi5bUKk8Os9arhhfhzOtTz16PjTGBEN0x4ya5RL/M5ZrNXBxwv2sAlZy7stNaNX0n?= =?utf-8?q?C2Oc7BCdZOxg3PKXYFFuv7TuLH4J3VfM39Pnz9Bi92IK9m6bj3OsH7ezPLgBDIs6B?= =?utf-8?q?jXMAWzkndWjdFwUFdKFDY2La4Z2LPO2XSsQmHbENWdwZMbkkbaEMEtr2J3UXUN6TU?= =?utf-8?q?WURMrdzYOJX+4FK/ms3KlggcFFR9PS0tBuNznRqcVjOqjpWsCrNq0OOr5XRtu+4mT?= =?utf-8?q?bDFS3zc8hjltLX32FJ5H/6y1YOGM/W6PerPCC0m6lqPLicZMCg8lnCyItUGXbZwEr?= =?utf-8?q?rY9MaHqtQ199ALQ3rwZuvTwBi8nPU842Swwp4r8n4ODe1gqMaylD1mCiD2S3BGlmD?= =?utf-8?q?Dm995ZLAvMsLmq+dZ6to45qRpP+mGHhdo4bVIS7xsYwapSYLp6doqwUoGkMb0snbG?= =?utf-8?q?0FRjufdiayRxReCnNd0G3fYsNeZD/Z72FyR+3eDB9+yKeo27FwuHxXsiU4NoliIvm?= =?utf-8?q?pR6efOp/bCJMHJl9UFSDjnK/t1zm3UMrQ8C3CZ1ViEAyDXlHVZzfjW4NRpxL51Mxe?= =?utf-8?q?IFQfJLsx2Wiu//LxG1yxOPWeMh6BQK8EOKmRdRIOGxQNBuic8580O6pa7HxSZKfDP?= =?utf-8?q?o8JROd7phmMLbdjduP10+rERJZ+wsqTlPi8rqBQBo/XjC5wInBn3BmC8rFOFi2/iB?= =?utf-8?q?8xosKf68YHYtmawpKDdkGTYyXtjn2LaZgLcw+HPWfYL6BqcMNhAsF4oH3W2ScWV0Q?= =?utf-8?q?iXVH1IygE+rW+ZPn0X253HZleH4JFl8O8hqZN+pqzIHmB1t+A8MT07/veLT9q/kFe?= =?utf-8?q?TPE3l57BrVaSUtqO0/3/9vfeEHH+IhhguaxQ/kSOIlR4XVs+hGDl75tt6i7g11/9t?= =?utf-8?q?WLGAmqlvy5ySV2b8jq5Phepk2LUnLaBApo+DxFu8w/83C21a4gnXpfrsrzYcJuRcx?= =?utf-8?q?5FXjKPgbc1nMxLduj7Mrll9+eSTJc1lKfpkoB/u1tSat9oSx8Tt3HOHQBwCT6gjbR?= =?utf-8?q?MTmMnsgL6+ZTnwOG8rnL+ElUHfYcxehYkhuUCi48sS4k+yQMhBOyP2SYu8jorzEFd?= =?utf-8?q?lgfLokr4ySLJF2ONZQ72LQvOE36zcwIq4aZAlmoRuPb9DImm0785KupGapjrvzQHS?= =?utf-8?q?GshRcxHg6LEdHEgocp6FwPEbZ43mwrQzhjlDYGwTUwH00Qg9w0VtyZqc0I3X6sask?= =?utf-8?q?AZirMJxMrhV5MwagE6lV6FyJjK6e6+6R2I8z6MIe0k9eHj+zg8iuM9VHmFUtWJlZA?= =?utf-8?q?KHcpyvsE8igOrZ0XSt5Y5UErjVIwG3Kj8vc3yEfPOMO+vTwhaIg7aB9TWUZmsY6UA?= =?utf-8?q?AzOgoQeJGpq33NeWOadJVH0Da+KoZ8MYFX/qvSQUw2MbjhQycCq0oAz7985b8bMKn?= =?utf-8?q?v7pcseQruPXamNIVUwXanHrV+3znzie+B6ha1TSKoVbJH10rhvfFurtPH3Btp51DF?= =?utf-8?q?cgRKrmzlcs2rvu46uVzi6o+Zh63/pZdoIXBxRou9gkGsNo7Kbk8XTpfP6l8Gw82Ez?= =?utf-8?q?NPfhTn2Zq/QR?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 486b5251-d933-4422-471c-08dce8cf1e9d X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2024 01:59:05.0864 (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: wNTM2XI6CdOXbGtf6VmCtAdtb7J1T8yxuwqxqggBVfaTU/1JuYUmfGcgYWnJDPvAR5CgZpZl4ox9k2RzBudojA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB8491 X-Authority-Analysis: v=2.4 cv=AKB5nO5v c=1 sm=1 tr=0 ts=670734ed cx=c_pps a=zz2QubYGG/9FVtTd3zWqHQ==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=DAUX931o1VcA:10 a=bRTqI5nwn0kA:10 a=t7CeM3EgAAAA:8 a=1KubnttrAAAA:8 a=JF9118EUAAAA:8 a=pGLkceISAAAA:8 a=7UKGVgRVAAAA:8 a=szgukyCE4hRqUtCBftgA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=FdTzh2GWekK77mhwV6Dw:22 a=H0t3PWKhy-h45uLjrunQ:22 a=xVlTc564ipvMDusKsbsT:22 a=8Ox4Rr8FuIIqx5qz5MW0:22 X-Proofpoint-GUID: wZ68tSn-M4e0ONxrlq4u6ODxjvPDzbRc X-Proofpoint-ORIG-GUID: wZ68tSn-M4e0ONxrlq4u6ODxjvPDzbRc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-09_23,2024-10-09_02,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 bulkscore=0 clxscore=1015 spamscore=0 adultscore=0 priorityscore=1501 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2409260000 definitions=main-2410100011 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 49A0EWpA024568 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 ; Thu, 10 Oct 2024 01:59:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112755 ChangeLog: Security fixes ============== * (CVE-2024-31449) Lua library commands may lead to stack overflow and potential RCE. * (CVE-2024-31227) Potential Denial-of-service due to malformed ACL selectors. * (CVE-2024-31228) Potential Denial-of-service due to unbounded pattern matching. Bug fixes ========= * Fixed crashes in cluster mode (#13315) Signed-off-by: Yi Zhao --- V2 change: fix build on riscv2 ...1-hiredis-use-default-CC-if-it-is-set.patch} | 7 +++---- ...file-to-use-environment-build-setting.patch} | 6 +++--- ...0003-hack-to-force-use-of-libc-malloc.patch} | 7 +++---- .../0004-src-Do-not-reset-FINAL_LIBS.patch} | 4 ++-- ...URCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch} | 6 +++--- .../0006-Define-correct-gregs-for-RISCV32.patch | 4 ++-- .../init-redis-server | 0 .../{redis-7.2.5 => redis-7.2.6}/redis.conf | 0 .../{redis-7.2.5 => redis-7.2.6}/redis.service | 0 .../redis/{redis_7.2.5.bb => redis_7.2.6.bb} | 17 +++++++++-------- 10 files changed, 25 insertions(+), 26 deletions(-) rename meta-oe/recipes-extended/redis/{redis-7.2.5/hiredis-use-default-CC-if-it-is-set.patch => redis-7.2.6/0001-hiredis-use-default-CC-if-it-is-set.patch} (95%) rename meta-oe/recipes-extended/redis/{redis-7.2.5/lua-update-Makefile-to-use-environment-build-setting.patch => redis-7.2.6/0002-lua-update-Makefile-to-use-environment-build-setting.patch} (97%) rename meta-oe/recipes-extended/redis/{redis-7.2.5/oe-use-libc-malloc.patch => redis-7.2.6/0003-hack-to-force-use-of-libc-malloc.patch} (94%) rename meta-oe/recipes-extended/redis/{redis-7.2.5/0001-src-Do-not-reset-FINAL_LIBS.patch => redis-7.2.6/0004-src-Do-not-reset-FINAL_LIBS.patch} (92%) rename meta-oe/recipes-extended/redis/{redis-7.2.5/GNU_SOURCE-7.patch => redis-7.2.6/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch} (88%) rename meta-oe/recipes-extended/redis/{redis-7.2.5 => redis-7.2.6}/0006-Define-correct-gregs-for-RISCV32.patch (97%) rename meta-oe/recipes-extended/redis/{redis-7.2.5 => redis-7.2.6}/init-redis-server (100%) mode change 100755 => 100644 rename meta-oe/recipes-extended/redis/{redis-7.2.5 => redis-7.2.6}/redis.conf (100%) rename meta-oe/recipes-extended/redis/{redis-7.2.5 => redis-7.2.6}/redis.service (100%) rename meta-oe/recipes-extended/redis/{redis_7.2.5.bb => redis_7.2.6.bb} (82%) diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-7.2.6/0001-hiredis-use-default-CC-if-it-is-set.patch similarity index 95% rename from meta-oe/recipes-extended/redis/redis-7.2.5/hiredis-use-default-CC-if-it-is-set.patch rename to meta-oe/recipes-extended/redis/redis-7.2.6/0001-hiredis-use-default-CC-if-it-is-set.patch index 7785acca5..63bf40341 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.5/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.6/0001-hiredis-use-default-CC-if-it-is-set.patch @@ -1,4 +1,4 @@ -From 41efa2f0cf08c91ff935bbb2d16ab233df7f5811 Mon Sep 17 00:00:00 2001 +From af4fc632c03b2a68be4206b4896f27fc4bb865ae Mon Sep 17 00:00:00 2001 From: Venture Research Date: Fri, 8 Feb 2013 17:39:52 -0600 Subject: [PATCH] hiredis: use default CC if it is set @@ -9,6 +9,8 @@ Content-Transfer-Encoding: 8bit Instead of trying to automagically figure out CC, which breaks with OE as CC has spaces in it, just skip it if one was already passed in. +Upstream-Status: Pending + Signed-off-by: Venture Research Update to work with 4.0.8 @@ -16,10 +18,7 @@ Signed-off-by: Alistair Francis Reworked for 6.0.4 Signed-off-by: Andreas Müller - --- -Upstream-Status: Pending - deps/hiredis/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-7.2.6/0002-lua-update-Makefile-to-use-environment-build-setting.patch similarity index 97% rename from meta-oe/recipes-extended/redis/redis-7.2.5/lua-update-Makefile-to-use-environment-build-setting.patch rename to meta-oe/recipes-extended/redis/redis-7.2.6/0002-lua-update-Makefile-to-use-environment-build-setting.patch index 20708eda1..46330f506 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.5/lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.6/0002-lua-update-Makefile-to-use-environment-build-setting.patch @@ -1,4 +1,4 @@ -From aa3d31355f3cc140b1dc2f4fcff8e3c0aa261549 Mon Sep 17 00:00:00 2001 +From 45ae5eb5c3482054073e06ab1a78e0aa9b96447f Mon Sep 17 00:00:00 2001 From: Venture Research Date: Fri, 8 Feb 2013 20:22:19 -0600 Subject: [PATCH] lua: update Makefile to use environment build settings @@ -6,6 +6,8 @@ Subject: [PATCH] lua: update Makefile to use environment build settings OE-specific parameters, instead of overriding all of these simply use the ones that are already passed in. Also configure for only Linux... +Upstream-Status: Pending + Signed-off-by: Venture Research Updated to work with 3.0.x @@ -14,8 +16,6 @@ Signed-off-by: Armin Kuster updated to work wtih 6.2.1 Signed-off-by: Yi Fan Yu - -Upstream-Status: Pending --- deps/Makefile | 1 - deps/lua/Makefile | 1 - diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-7.2.6/0003-hack-to-force-use-of-libc-malloc.patch similarity index 94% rename from meta-oe/recipes-extended/redis/redis-7.2.5/oe-use-libc-malloc.patch rename to meta-oe/recipes-extended/redis/redis-7.2.6/0003-hack-to-force-use-of-libc-malloc.patch index 7b601e02a..1f97f9783 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.5/oe-use-libc-malloc.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.6/0003-hack-to-force-use-of-libc-malloc.patch @@ -1,4 +1,4 @@ -From 38a5f403b033d03cdac3ff814687d83f61527d8e Mon Sep 17 00:00:00 2001 +From 7a98e3ac480413ce7db3a5edd5dc70458b921b29 Mon Sep 17 00:00:00 2001 From: Venture Research Date: Wed, 6 Feb 2013 20:51:02 -0600 Subject: [PATCH] hack to force use of libc malloc @@ -9,14 +9,13 @@ removed in favor of magic. Note that this of course doesn't allow tcmalloc and jemalloc, however jemalloc wasn't building correctly. +Upstream-Status: Pending + Signed-off-by: Venture Research Update to work with 4.0.8 Signed-off-by: Alistair Francis - --- -Upstream-Status: Pending - src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-7.2.6/0004-src-Do-not-reset-FINAL_LIBS.patch similarity index 92% rename from meta-oe/recipes-extended/redis/redis-7.2.5/0001-src-Do-not-reset-FINAL_LIBS.patch rename to meta-oe/recipes-extended/redis/redis-7.2.6/0004-src-Do-not-reset-FINAL_LIBS.patch index 01e53e3f2..974cf5169 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.5/0001-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.6/0004-src-Do-not-reset-FINAL_LIBS.patch @@ -1,4 +1,4 @@ -From d9d1f9a501ef7caa80d1e6595218898e9989ec2b Mon Sep 17 00:00:00 2001 +From 50fc46a12f6cf97e7b927d3ea29eecc9ebdea34d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 Sep 2019 20:04:26 -0700 Subject: [PATCH] src: Do not reset FINAL_LIBS @@ -9,8 +9,8 @@ environment to get it going e.g. -latomic is needed on clang/x86 to provide for 64bit atomics Upstream-Status: Pending -Signed-off-by: Khem Raj +Signed-off-by: Khem Raj --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/GNU_SOURCE-7.patch b/meta-oe/recipes-extended/redis/redis-7.2.6/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch similarity index 88% rename from meta-oe/recipes-extended/redis/redis-7.2.5/GNU_SOURCE-7.patch rename to meta-oe/recipes-extended/redis/redis-7.2.6/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch index 6e07c25c6..8e5f30993 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.5/GNU_SOURCE-7.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.6/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch @@ -1,4 +1,4 @@ -From a22512ac1cbd6de1f5646219722e49752d1f60ac Mon Sep 17 00:00:00 2001 +From acd832d76002a1916b3128ac05bc0296425aea6d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 21 Dec 2019 12:09:51 -0800 Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER @@ -9,14 +9,14 @@ Fixes | | ^~~~~~~~~~~~~~~~~~~~~~~~~ Upstream-Status: Pending -Signed-off-by: Khem Raj +Signed-off-by: Khem Raj --- src/zmalloc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/zmalloc.c b/src/zmalloc.c -index ba03685..322304f 100644 +index bbfa386..93e07ff 100644 --- a/src/zmalloc.c +++ b/src/zmalloc.c @@ -32,6 +32,7 @@ diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis-7.2.6/0006-Define-correct-gregs-for-RISCV32.patch similarity index 97% rename from meta-oe/recipes-extended/redis/redis-7.2.5/0006-Define-correct-gregs-for-RISCV32.patch rename to meta-oe/recipes-extended/redis/redis-7.2.6/0006-Define-correct-gregs-for-RISCV32.patch index 93c359526..700904817 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.5/0006-Define-correct-gregs-for-RISCV32.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.6/0006-Define-correct-gregs-for-RISCV32.patch @@ -1,14 +1,14 @@ -From 634f62be6c135ece93cb4e44a69ce3cb66f394ca Mon Sep 17 00:00:00 2001 +From dd3ecb07bbf80b986b8f2c656ea11d1346e212f6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 26 Oct 2020 21:32:22 -0700 Subject: [PATCH] Define correct gregs for RISCV32 Upstream-Status: Pending + Signed-off-by: Khem Raj Updated patch for 6.2.8 Signed-off-by: Changqing Li - --- src/debug.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/init-redis-server b/meta-oe/recipes-extended/redis/redis-7.2.6/init-redis-server old mode 100755 new mode 100644 similarity index 100% rename from meta-oe/recipes-extended/redis/redis-7.2.5/init-redis-server rename to meta-oe/recipes-extended/redis/redis-7.2.6/init-redis-server diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/redis.conf b/meta-oe/recipes-extended/redis/redis-7.2.6/redis.conf similarity index 100% rename from meta-oe/recipes-extended/redis/redis-7.2.5/redis.conf rename to meta-oe/recipes-extended/redis/redis-7.2.6/redis.conf diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/redis.service b/meta-oe/recipes-extended/redis/redis-7.2.6/redis.service similarity index 100% rename from meta-oe/recipes-extended/redis/redis-7.2.5/redis.service rename to meta-oe/recipes-extended/redis/redis-7.2.6/redis.service diff --git a/meta-oe/recipes-extended/redis/redis_7.2.5.bb b/meta-oe/recipes-extended/redis/redis_7.2.6.bb similarity index 82% rename from meta-oe/recipes-extended/redis/redis_7.2.5.bb rename to meta-oe/recipes-extended/redis/redis_7.2.6.bb index 930c1cd9a..dcfd532cf 100644 --- a/meta-oe/recipes-extended/redis/redis_7.2.5.bb +++ b/meta-oe/recipes-extended/redis/redis_7.2.6.bb @@ -10,19 +10,20 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://redis.conf \ file://init-redis-server \ file://redis.service \ - file://hiredis-use-default-CC-if-it-is-set.patch \ - file://lua-update-Makefile-to-use-environment-build-setting.patch \ - file://oe-use-libc-malloc.patch \ - file://0001-src-Do-not-reset-FINAL_LIBS.patch \ - file://GNU_SOURCE-7.patch \ + file://0001-hiredis-use-default-CC-if-it-is-set.patch \ + file://0002-lua-update-Makefile-to-use-environment-build-setting.patch \ + file://0003-hack-to-force-use-of-libc-malloc.patch \ + file://0004-src-Do-not-reset-FINAL_LIBS.patch \ + file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ - " -SRC_URI[sha256sum] = "5981179706f8391f03be91d951acafaeda91af7fac56beffb2701963103e423d" + " + +SRC_URI[sha256sum] = "fb10d67a2fe2b4556f6cb840064dd6e6e3175ce8ca035f0726990ec2da9f3d0e" inherit autotools-brokensep pkgconfig update-rc.d systemd useradd FINAL_LIBS:x86:toolchain-clang = "-latomic" -FINAL_LIBS:riscv32:toolchain-clang = "-latomic" +FINAL_LIBS:riscv32 = "-latomic" FINAL_LIBS:mips = "-latomic" FINAL_LIBS:arm = "-latomic" FINAL_LIBS:powerpc = "-latomic"