From patchwork Thu Oct 10 01:38:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 50189 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 C8B4DCEDDB5 for ; Thu, 10 Oct 2024 01:41:35 +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.33880.1728524483560804771 for ; Wed, 09 Oct 2024 18:41:23 -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 49A0EWoX024568 for ; Wed, 9 Oct 2024 18:41:23 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2175.outbound.protection.outlook.com [104.47.55.175]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4234ykvs0n-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 09 Oct 2024 18:41:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yyqdWcuXXnyS6B165P1OJGpmNrsajjEdVyU4nAF+/pZk3rS9ODRB2Av7H+I3wWfBYyxoSqBsEKx8FQ5CCpW7F9NpougyWEHH7ZagFRb+6pAm+8EnVik5Nb1k8iR/DtskB9u+U0OXLHm+izBGq6z0bMbkbeKUTQG9L+G7F2bVnZNiOrrfxpwCUTwFqCywBxRMKh1j7BLFF0M7GSrzVjGXorpEzfxsXye6RC1vHT2zVYd+eYO8T+Nf1zROq/fY9g6YBF8C+/GobuDzIODNxf1/5F0fJCh+hbAUBT7AObS7J036K8Ft09gK56m4hSkNVznNsN3dc3aEI+yZ1thOk3ZLLA== 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=s2/rp8g6bXvgGYBs+W5uLaRQ5821tyoDvF9CWbRpwig=; b=BLH+WvL8wOW+1LzAwIKaaJ7atuQynPOFlX9ViytX95T6zkqsyF51OJ7DlYuVIwaa8oiJGS3EtnDfiIPH8tgsTLTChVLgZUWcCiNEqfQD2Cra8jTiPtc8kRamg/fb0npYpz6uuQT/wXBG3pru/7BNSz37H2wNI9fNcS6efLYxlClvaFuZS9i7Dq9QVWvs4TwZv5oRZSUXJ0ei/uxMXbogXde86vfM+DhQNtfea3YPEM1UwrKghW/4h2V1NYOZtaoO3cMjG6waJRfDwCwWojUN2xnJcVBoCuXBculCuDC7dgBdNR9MHdCX5HVyfh+2WgI/aFaN/bwyUR+NI0xrq0Jvgw== 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 DS0PR11MB8718.namprd11.prod.outlook.com (2603:10b6:8:1b9::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.16; Thu, 10 Oct 2024 01:41:20 +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:41:19 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 4/4] redis: upgrade 7.2.5 -> 7.2.6 Date: Thu, 10 Oct 2024 09:38:16 +0800 Message-Id: <20241010013816.4084737-4-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241010013816.4084737-1-yi.zhao@windriver.com> References: <20241010013816.4084737-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCP286CA0174.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::15) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|DS0PR11MB8718:EE_ X-MS-Office365-Filtering-Correlation-Id: d66f78bb-1f73-4ed8-37cf-08dce8cca3b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?81SdiCWP6+c3FUndtsTL/Am3fuBiqsg?= =?utf-8?q?+YUXyxdLunrvePl9dN91/JDMMFG1+wS20kv7L4NBljYcNMhiQzECbcirza0HUgdcC?= =?utf-8?q?ZVga/qSh3uOrDuGCU1+Spch3BcHpI3cOsod5GgJPtedQEK7HkqZkJNEYioi5G6SzI?= =?utf-8?q?ja+i9td9Y3CsXxEnO+ubn+gB0plOjHQzRL1OOy5bRavrZYAL4lDiqGWsThyXNb9nE?= =?utf-8?q?dHI9Y8T9aVsKKaPjswI/p15BeYxpSX8lgh7oq/CKnYaMsqLJPYPiSmOsJzfEZyvdh?= =?utf-8?q?nPGCtaa0Y1IDJrGAB4StcChEwhYetFQZglUfcKTcIiQ5rGtWMu36/Va7kBBTboQcK?= =?utf-8?q?v3s1YVt+A29zE4MHtHXgEQDaMWNVkfP8hn75ok9/GUz9XgwTZtPVCUX/n+yhG2vbx?= =?utf-8?q?np5Sy/OF3K2OKasgw3g+PHOuIlmPlGaiQXL/r4Jb47muwT15YnqGrkBeqeAauir0h?= =?utf-8?q?NILlzhVY3JRtP+/f70CLtzTOLLrF3z7MxvraaBFJ2qSLudWmb1kESAHYPKdCpndQc?= =?utf-8?q?gu0KabvvCq3UYf6OiEyYK0OmZLE3kigAXjACfUZbxiP0CdPpOKJrNnEhrDnnPI0m6?= =?utf-8?q?Pga4VqnOgULvS4z4Qb5PI1WubAIAI4JuyvNSFZD7paphRYDhuyyUWTZf+TpvDn6e+?= =?utf-8?q?Toc/gujkrtxoYw80EnI3qT7oexXuQcC+EGXvWEvEPrqBCNpeAjA/JowQPT695kUHK?= =?utf-8?q?FhzIufnX4hHKuz4VBNGaIZ6VXOivyo73AhInZOsuJg5QLMK/UBb1C50QkTp5ix82e?= =?utf-8?q?NWQkDbMYt/lT5Uf0J27kcc1u66Be79zSUDrq7n1uMjoCoCcs6nHx5QqiGt2Iy604E?= =?utf-8?q?7HFlcxCoohEzfE97HOkbmiJHILEjwoKMUxWBXCTepycYzbvjDG+jbUYTVB9FoMcHN?= =?utf-8?q?xbCtpiG9dzoxwQEYQIIMvbhrcZR1ZCB9hxg2ysD8yaZi5KANt93DNIqzTUnkITNrV?= =?utf-8?q?C8vqxj3lludUI4BBGkRixUMnegZqAoyyyrWAFxQMWH3s46hJjpyALBZKjmkQrzr8m?= =?utf-8?q?tcle6J0cGPidyRUeDLAWTMxz0Jmfr0wDBfZTnPyv4k8G5vx08xvU/xXzPbDwEjsWv?= =?utf-8?q?ItfUf4ZnLZsqj1qAprXyhobpQMAVTfjhBJByqOOk55i2hKtVqiEn+DS/5xEIrpJte?= =?utf-8?q?HBVdRssUXTCnUcT94VmbRxezWjLWpzSwFfk1evGADOzF/Jyd54GjSi3wXhlxKH2RE?= =?utf-8?q?HMoDLFGkUHuQza+hsy8FUFXUEzGVpm8jUSRg=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)(1800799024)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?F8+Hgcy4kOx6GkCQxnv9pXkQVp28?= =?utf-8?q?TAZRqiN8FHZoU2CjBNMGsx81OPJNIS/ejP0Jxsd29N5TCZOHVXUxMuTzLG4kW7rpb?= =?utf-8?q?U5iROtrcyUpnz9vwTCrslA5wicW62oWCbcByAZC+AG0tbDgKtvG/jyxlk/OvrOyJm?= =?utf-8?q?c3KMXJ3xWYKbL/lWagoi50jwME/Dwyk5K5G6gaN0kS1zctjMIric7PLZ04L4cSM+C?= =?utf-8?q?xEC6Q6+EtIBN7bMR2rukbqzeM1hG5ty9cifHNCndvrCqBwL6ti1RDaK32rPBpCLl6?= =?utf-8?q?8xzNFMYTMNHvNoeq40Bp+jSuH/PS/PYd2rsvdqTb4CdoQABlZQyMKlXbsSB3xI1nI?= =?utf-8?q?a7D32r1d75NIi4gCp/vTiXB6RSIpnIPfB8oudTUIN3B5DAkuBpb5PrpC12/6+ZdMo?= =?utf-8?q?BgTJ/aXhF3YJx0g65wSUST9oRYS5FUQ0MA++PiFcD8jAew0TUwuXPURN34+tyBh79?= =?utf-8?q?mKgFCNGE1XG97ptRjwrsz86bqbFruCMvUDuo2zv3snm3scSWyeEbYFdQIEWyBO+pe?= =?utf-8?q?U2VWAPz3ug/BvS1CNdOGXJaYgWoNYABTOoNmiFQewUqm7MrNch9AO5kQG9L49nqiS?= =?utf-8?q?PvDkf+nd6zwdwa91Ei/TEn11rtqVqr2Hq1J8VQa4apEoHJCoRjZxH2VMqTv32S0SF?= =?utf-8?q?L82Z5odxtFI1u2dzC+myDRxSgBUktpbxDZPoS7sUVsWVwjVEdqNtGVSVcZPumEVY8?= =?utf-8?q?9O5jUHOGrcJVCmbdh979LuvpJnRmkgHG8tcbxTVYe66V4NHVctBhQWN5xRGt9nqVd?= =?utf-8?q?7OeL8YTilgJpT76R+82ygPeoo8dMWYZyYC8CZcrksJFk170vWUM8PJ2FEt6BvCXks?= =?utf-8?q?B/3xBkek6/t47lJK4hyaN/Kh5foGQ7sa/bLLJ+zOn3ogcSrI9NN55CZ+92Id0g2r5?= =?utf-8?q?/KBQHqbgF99WyqpbhTnv2yaf/WUnMLTSWoj3x2Y0S4gkLJB/7D8nhJX6Vg4kqVVbe?= =?utf-8?q?HgE9r6e8SuucdWHkyJmDBhm7y0NGJ0HBoShFSydzOkmErChCDUeIdZQt2jyFTR7RF?= =?utf-8?q?sHEuUqbM57YcHyJ+/vS2XILiD74Bp5/HQdQFmm2WkzR69CWKTze2ThNezDJmj2aOd?= =?utf-8?q?B+fhW8vCLHW+/ufT/ueGrrUeEOGze77Jy04Mqjz8WHjAVIo3cLGwRwypPsgMQAqQr?= =?utf-8?q?D6lJS4ZXcukKz/8wZzNjChHY7xYv/XZYLUmFPR2M2fVHk8j02BJ989PpFMIqNbS1g?= =?utf-8?q?cTSYHO8hkRlA2gcaKvFsPTiTxDYbTUDa4dzqsXyYNouMN+/7fOgnaSABNlNJmMFGW?= =?utf-8?q?0SB6vZWtiYKcB8nDr5P2PEKrqbdJ/n7yeMX+rFB2qTTEFt6bSbAdv2kvcCb9me1WK?= =?utf-8?q?FNocsw5jieOEB2XfBH9cLF3de1c0ICM+KFut4Ii8sF0ADdox1gmtuuZ4vLuFiag8E?= =?utf-8?q?aZtDL2LHjQcSSfAdfTFNaglUGQeu+vs/6bZXI4e5N369MSLcnjNWJEOK/u/ToYYUm?= =?utf-8?q?Tso1Zl9JhMq1AoHvXd28CCEf3uyT/DSKqUpPuxODtm/dpwJsM97w3NnSSTHmGHxVS?= =?utf-8?q?LoVubCO17oiV?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: d66f78bb-1f73-4ed8-37cf-08dce8cca3b4 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:41:19.9509 (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: EALoa69WzX9OvEXw6c/Cyl7NNaOKrV8m4T4QqWtGo+0o2InxmzjrCyF4ANTkWIaaoDJrGu37NmtcsjuPHCRQQw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8718 X-Authority-Analysis: v=2.4 cv=AKB5nO5v c=1 sm=1 tr=0 ts=670730c3 cx=c_pps a=F+2k2gSOfOtDHduSTNWrfg==: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: xEMxal5H1CC82VgXMq2CsU2fvzmR0TgF X-Proofpoint-ORIG-GUID: xEMxal5H1CC82VgXMq2CsU2fvzmR0TgF 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-2410100009 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 49A0EWoX024568 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:41:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112753 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 --- ...001-hiredis-use-default-CC-if-it-is-set.patch} | 7 +++---- ...kefile-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 ++-- ...SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch} | 6 +++--- .../0006-Define-correct-gregs-for-RISCV32.patch | 4 ++-- .../init-redis-server | 0 .../redis/{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} | 15 ++++++++------- 10 files changed, 24 insertions(+), 25 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} (83%) 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 83% 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..e831bd85f 100644 --- a/meta-oe/recipes-extended/redis/redis_7.2.5.bb +++ b/meta-oe/recipes-extended/redis/redis_7.2.6.bb @@ -10,14 +10,15 @@ 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