From patchwork Thu Oct 10 01:58:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 50190 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 0A950CEDDB8 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.34112.1728525549678449465 for ; Wed, 09 Oct 2024 18:59:09 -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 49A0EWp9024568 for ; Wed, 9 Oct 2024 18:59:09 -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-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 09 Oct 2024 18:59:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZqOPDtLqQHy+bzSZ36uLRfjoQhY1cPIO+j6SOKgbm4YvoueKs+fS5SJFxftdb9PwIOmJQ80BEEx2xzDilx8yycGvNfd6TKiYUQEuM4ecd+dA1uGgvnEjNo7oSsSpr8mdKyoI/1ThVXtYENiVjaJHIm2krT/7nD7PjyKhUFXeMtNbv+VbYoscPxJm3RYZ7NaJAOD3GCFGonFjEhkqlvLOi25rwfUykiuRmsL5RiA0Y2HZ6LWa+5rHkpKPK7MZ3ULgwy48u+Hn/aXQjlZzFRhg/HWtrIfwxgu2KM6fUeEq5n+aTyi533f2zEOwsgAbpYMrrUhk80qERxghItu2/kOmXA== 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=bmufxqp4yQVLDkrd5uCWljEskpY0L7dG0KVoJsRh9ek=; b=qtHiPJPjQXLAazxDbLOgcmV6XzJPXcpY3foF+fTjIuioZ/anmoi3Pv++66quW7Pz7YK2Wr6xgUEgEOO7Bf2LoQQX/CJvfxPg/eSRIRkxP1cm5SPAT1FstooOtxZn5GRjOCXWIm6G+gvF4SuwgjS+cArS3J0JuDbzFJI2RYuOPMHwH9GBQVmwQ1LfRiahxyEYTsiu3/b6pPi6tYU2hc5owlkIB0aINyKpnpZtAThgb8xWq1TNWNHstyUcEZ/MacNeRQk7ge5ikTsjW5Q0MwdppT4euE65kNiJx0wbs541GQ1LagN2rsU0aHZUZkipVr4S53xJzFDd1Jlec4sS88ZMfg== 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:05 +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:04 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 1/2 V2] redis: upgrade 6.2.14 -> 6.2.16 Date: Thu, 10 Oct 2024 09:58:44 +0800 Message-Id: <20241010015845.4140358-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 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: 1fd8569c-8c13-444f-729f-08dce8cf1dec 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?uT7GM7dIMcIab0wZDfP5OzujuWHGA5q?= =?utf-8?q?VzATkmlxsMQZ5mD0u3eo7O/WFR0zhv0FOdVUJS/4VUB+mb4o6wVDtPEVjeYiiYWvg?= =?utf-8?q?xbAJvqW7JVeOdyww0M24JOe8RwQMVvaeA35C+m4F0ZD4y8stlbu6gFHtje2F1A34V?= =?utf-8?q?wnht09+d/l+Xxw6X5S8GrF87Oy0flUwTu4GwBa1+QHUUdNbSI/Tzs52khi0vicKvp?= =?utf-8?q?rxKxCgWtyXL+YsRKFvxuiAdfsKNisLZnxia+s5U1Fql/QTkXcEWoH6Vcjj0rm3qMj?= =?utf-8?q?MhxNElsrLO9RieHnYTQeB2yRbEERI3M8RKUuIB5ZI9aFWWAsS2Os1V9CIbGOiFI0l?= =?utf-8?q?RNznEO3CcSgI9Rt1RGZSfpVMv7LwSTWFBSPLQ06wDoBk5gPVktRt/u9IQ8Mw873a1?= =?utf-8?q?WetXpnUGJ4aYFWpHFzxfW/aD8JPvXlDKJF+JbdI0Llw7915s7wgnZiCkpwW6nESPf?= =?utf-8?q?aD/IH18/wB5Au8gu9KJK04M05U/vJUb0Z2nnQjmF3902qm3scqPhbovWB+ujqL1aL?= =?utf-8?q?vocMkVgJmU5m6Qfi9HZjMQ7OG6CWF4L7yhblfEb0GWkzqJ/Do3LEAAmkVVu34CjAZ?= =?utf-8?q?H69PI6/Knqp0AMbefs3J6705dJltjBYZ3n7Aeg6JLa3IAZScq8F3TWEiZYrf1dAs4?= =?utf-8?q?GglIXRL5vBgAvmG5wPjcuXz1MuGTVDpPb/KHwdeRbmNG1LIihObDMSB7rMkH26Pyr?= =?utf-8?q?1YDC8bYp4Ay5Ce/7AcBpo/kt9N2HnsVIQhUbiIUyUtalkU2lIjqhJ/B7emVMiR3BC?= =?utf-8?q?aYp6hbmLms+fhDECAVYBF7bX9F3ZDn01yN3hGm+90KvcGn3zskFt+vkOA085cXv+L?= =?utf-8?q?rF8tPs0HjhgwbkepaH34Ggrr23M4ev0QaslJzIH1EY7SqXUp6b/IhQItmpxixr3p0?= =?utf-8?q?wGaji2laXt9/ZrdP8KeV14tqEY4zGIj9cdeGauAbd5S1US88TIpv/qDXaifBrRDVl?= =?utf-8?q?xbxVaBfIOsY0/Wuf5v4NuRE3e08/ka7Pu9/Ef+EufRxTKhL0um0T2FdCKmMv6z2Jy?= =?utf-8?q?rE2qR6i/Ggk9KCBajgkX9JohxhkhZUKr7Fyli2rtkp4b2j+TBb1hyR8uQkvomEX8F?= =?utf-8?q?6XtjSTTiYYXLxUlWOsLTXAFQhR9PXjg+gmhYbENfb2G+gzzfUPIhkelQA0T7UQ+AC?= =?utf-8?q?7SbTSaaqsnIY8QNlDG+88Kf55/bRHDpx2Yg55WGwqthpgO8sMJtYAPz0JqqzAgB3W?= =?utf-8?q?wwnWOMZd/Pyb2Wf/6ee52bnd6RVvJRC3whNg=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?jT+o7dkhvSwZA02OzbJ5i6Kkshas?= =?utf-8?q?cusfPm2vC/tztcPirGOmXuhIBfwB+8S0zGa5NxYhpAP9T7sBQjslKR04tW/7X+MW9?= =?utf-8?q?r31s0b7kA3LURdikBSoeyMBbm8q8OE3xS+Jj1rX/opxoTXG4aPXembXrYWod4nPZk?= =?utf-8?q?P0DYK912PJ3434Nuncamiaezuz+z9IHM+NyQurWGV0Eo+AVyX6H+T3aEHDZzXDsIq?= =?utf-8?q?Ub80D/VVLh6XKWGiOCVVD1go5tlzXZ8dHH+4tTJd+Y638SB+lPQ+EX5JZo2sof/w1?= =?utf-8?q?FC6ObXZNUUIrDSITTvzu3ppZTOhE7Oap9rjjJjk8P0qQKHTL6w21wdhHl0XiC+ndi?= =?utf-8?q?PQJUTxAIhUoxLQ/V+MKnPHqcbWajruIYiop6O01dvGDvhlHxFO4hlgR0uR0XXftzi?= =?utf-8?q?HnV50r3xRk78VtW4Wp9YIjrxF5bRs2q4PNjY7J8h+X4aZBki5LwLLUYBo64KbP3aS?= =?utf-8?q?+CBWR/G8iBi5tc+t02yPLgFba5LSDyU1Z8k2+1yzHdXrUZk/ruP8iBPIoKqHRwRku?= =?utf-8?q?CLDDa7Bijnt5FrSBcv68S4qrozlaVEpVG/99sFETaNFASvBxnkIJiX/Fd92ck5xjc?= =?utf-8?q?Qz4y30MHCfESV+oZNJ+qkr1Kyo31ddlZHKohoBS4MqN8yzm6/Mk00xNd1xdfUOm7G?= =?utf-8?q?Utsz5pnJUQIgeA5s7Wwp8i62exJVIClODkdnbI+unV2Qpix1Fotqp1CCidhOYYg4/?= =?utf-8?q?iOk83eNd2gwxhx62ahtd3aGHIIe9/P506KSIXbrqZ+qvKkx0fmYkp+gNohtW8p4FP?= =?utf-8?q?V/wwS+4PVvrtfguk9rX/RwQJ4TKouqPU8FiL/NGq/pZ6ai+VWofuftJeBTI0tyWlJ?= =?utf-8?q?GWSJXuouIHMQUBDXZRLw6xBhuAJ3QmaRk6ottm23ZiDfwmPgkXJrWSjP3XsNf9IL0?= =?utf-8?q?7G9SVcKkH0B7ExaZr/vl6kfHAUQDtldGu6KTJaPi9fvntzx8jJReOwjhfNp9K1n8R?= =?utf-8?q?iDSCjLpQdyo16+G+EW7iNsPSZ0qAyLHjRMoQYZvG3udWSea3PtK2aA4nIenFqCPBF?= =?utf-8?q?pgSxrVwIM8bXBdYdX1vCimuOE26art8xb+5HZFDECkZoeM+OdV3UyuGyOviKGuKro?= =?utf-8?q?vU8gwMWDLPvcVtqgDZzuQWXsYEGGL23QshwNahXwV5HGG15dRo4xAHDDj/7TuJs49?= =?utf-8?q?n+qkq1GvjdWoahioeqY0OuVcVVPzBfluUOGq21u3YSW/h0cGt14tmBuW5RZlz6XGV?= =?utf-8?q?IcL+T6TmSQyyM7brgt+pNKasu5nM14AC/Z1h8ZzydZ9X6M9m67FC6tHpJl1IhPpdc?= =?utf-8?q?Y3igI1/5K0loJWF7tCewWUvfiy7TDIonHri63CWUFZqq3mYXSZB3OmeIqM0F/KqyM?= =?utf-8?q?dGml0ydVHvmM1tWFkjqrch59GGlbMn8ZEqGRJzXuCcX4yiOvyqK041kOOTDDJEFv0?= =?utf-8?q?KQmBovE8rSfuHiHa9ZyaZaCOcyvLwLmQCR13YIwFFXgogqCO4y+p/EY/6eIkaMjHH?= =?utf-8?q?wnriyULdeEgDXQp+hWuM9wl7IVTz/N0/le42s+N8D0hmREu2u37KfP6WtpfI2t7MB?= =?utf-8?q?3+404NLZKtZT?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1fd8569c-8c13-444f-729f-08dce8cf1dec 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:03.9925 (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: vjnaRbiRjoXegaWtROYiSfnqJUEqAeu1n8WUSHHpfa+J7pKzYGL3Z4Xf5zzrnQ+yAyRj3vsnuNvfhT73d+l+Dw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB8491 X-Authority-Analysis: v=2.4 cv=AKB5nO5v c=1 sm=1 tr=0 ts=670734ec 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=V4tb18-pIKpFZfX4vkcA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=FdTzh2GWekK77mhwV6Dw:22 a=H0t3PWKhy-h45uLjrunQ:22 a=xVlTc564ipvMDusKsbsT:22 a=8Ox4Rr8FuIIqx5qz5MW0:22 X-Proofpoint-GUID: mTZihLw0xENQkKsH9zgbiGLZQvGJMbBB X-Proofpoint-ORIG-GUID: mTZihLw0xENQkKsH9zgbiGLZQvGJMbBB 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 49A0EWp9024568 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/112754 ChangeLog: Security fixes ============== * (CVE-2024-31449) Lua library commands may lead to stack overflow and potential RCE. * (CVE-2024-31228) Potential Denial-of-service due to unbounded pattern matching. Signed-off-by: Yi Zhao --- V2 change: fix build on riscv32 ...1-hiredis-use-default-CC-if-it-is-set.patch} | 14 +++++++------- ...file-to-use-environment-build-setting.patch} | 10 +++++----- ...0003-hack-to-force-use-of-libc-malloc.patch} | 9 ++++----- ...h => 0004-src-Do-not-reset-FINAL_LIBS.patch} | 8 ++++---- ...URCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch} | 6 ++---- .../0006-Define-correct-gregs-for-RISCV32.patch | 12 +++++------- .../redis/redis/init-redis-server | 0 .../redis/{redis_6.2.14.bb => redis_6.2.16.bb} | 17 +++++++++-------- 8 files changed, 36 insertions(+), 40 deletions(-) rename meta-oe/recipes-extended/redis/redis/{hiredis-use-default-CC-if-it-is-set.patch => 0001-hiredis-use-default-CC-if-it-is-set.patch} (85%) rename meta-oe/recipes-extended/redis/redis/{lua-update-Makefile-to-use-environment-build-setting.patch => 0002-lua-update-Makefile-to-use-environment-build-setting.patch} (93%) rename meta-oe/recipes-extended/redis/redis/{oe-use-libc-malloc.patch => 0003-hack-to-force-use-of-libc-malloc.patch} (92%) rename meta-oe/recipes-extended/redis/redis/{0001-src-Do-not-reset-FINAL_LIBS.patch => 0004-src-Do-not-reset-FINAL_LIBS.patch} (86%) rename meta-oe/recipes-extended/redis/redis/{GNU_SOURCE.patch => 0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch} (91%) mode change 100755 => 100644 meta-oe/recipes-extended/redis/redis/init-redis-server rename meta-oe/recipes-extended/redis/{redis_6.2.14.bb => redis_6.2.16.bb} (79%) diff --git a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch similarity index 85% rename from meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch rename to meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch index d2a1b45e6..51a6e9c95 100644 --- a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch @@ -1,11 +1,16 @@ -From dc745a33f3875cc72d41bd34ed490b352e546352 Mon Sep 17 00:00:00 2001 +From 67990f216f2fbbc8a6699c700dfc089aa617905f 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 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-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 @@ -14,13 +19,11 @@ 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/deps/hiredis/Makefile b/deps/hiredis/Makefile -index 25ac154..569f82b 100644 +index 7e41c97..54717e3 100644 --- a/deps/hiredis/Makefile +++ b/deps/hiredis/Makefile @@ -42,8 +42,6 @@ endef @@ -32,6 +35,3 @@ index 25ac154..569f82b 100644 OPTIMIZATION?=-O3 WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers DEBUG_FLAGS?= -g -ggdb --- -2.21.3 - diff --git a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch similarity index 93% rename from meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch rename to meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch index aade7afd0..17b533669 100644 --- a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch @@ -1,4 +1,4 @@ -From 097a2b259cb266c2c861dc74fa6f80712d6138c5 Mon Sep 17 00:00:00 2001 +From ef989aab052510bfda32b2b325a5f80b76c42677 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 @@ -15,18 +17,16 @@ 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 - deps/lua/src/Makefile | 16 ++++++---------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/deps/Makefile b/deps/Makefile -index ff16ee9..d8d64aa 100644 +index cbe3aef..76bc222 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -74,7 +74,6 @@ LUA_LDFLAGS+= $(LDFLAGS) +@@ -81,7 +81,6 @@ endif # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more # challenging to cross-compile lua (and redis). These defines make it easier # to fit redis into cross-compilation environments, which typically set AR. diff --git a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch similarity index 92% rename from meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch rename to meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch index e76bdbc26..f1021eef6 100644 --- a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch +++ b/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch @@ -1,4 +1,4 @@ -From 1fa047162983d4a7e0576f0837a73a6027a783bd Mon Sep 17 00:00:00 2001 +From b9586abcb803747301f6cc4ff93c7642bef693ea 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,19 +9,18 @@ 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/src/Makefile b/src/Makefile -index ecd6929..c7f43c5 100644 +index 7d75c83..35dd314 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,7 +13,8 @@ diff --git a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch similarity index 86% rename from meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch rename to meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch index 66ab0ee33..958106e26 100644 --- a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch @@ -1,4 +1,4 @@ -From 97584e1eb78dc18599534b47b6670c20c63f5ee2 Mon Sep 17 00:00:00 2001 +From a4d87aca1c00c53b386ee7490223971e00873add 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,17 +9,17 @@ 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/src/Makefile b/src/Makefile -index 5564351..83ccd76 100644 +index 35dd314..3770f96 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -91,7 +91,7 @@ endif +@@ -93,7 +93,7 @@ endif FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) diff --git a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch b/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch similarity index 91% rename from meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch rename to meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch index 20f689bd0..d73c66c9d 100644 --- a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch +++ b/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch @@ -1,4 +1,4 @@ -From 98d526f76049be21bf3d77158236b2189419a78e Mon Sep 17 00:00:00 2001 +From 2e6311c9c7cd85bf63eab8fe92c08ec1ec01b6fc 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,6 +9,7 @@ Fixes | | ^~~~~~~~~~~~~~~~~~~~~~~~~ Upstream-Status: Pending + Signed-off-by: Khem Raj --- src/zmalloc.c | 1 + @@ -26,6 +27,3 @@ index 1f33d09..5e182d1 100644 #include #include #include --- -2.25.1 - diff --git a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch index 9d7e50271..bb3f5c607 100644 --- a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch +++ b/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch @@ -1,9 +1,10 @@ -From 26bd72f3b8de22e5036d86e6c79f815853b83473 Mon Sep 17 00:00:00 2001 +From 6149911f7a6fbaef3ed418408e2b501fa9479ffa 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.1 @@ -13,10 +14,10 @@ Signed-off-by: Yi Fan Yu 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/debug.c b/src/debug.c -index 5318c14..8c21b47 100644 +index bb76c5d..55a0696 100644 --- a/src/debug.c +++ b/src/debug.c -@@ -1055,7 +1055,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) { +@@ -1067,7 +1067,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) { #endif #elif defined(__linux__) /* Linux */ @@ -27,7 +28,7 @@ index 5318c14..8c21b47 100644 GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip); #elif defined(__X86_64__) || defined(__x86_64__) GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip); -@@ -1222,8 +1224,28 @@ void logRegisters(ucontext_t *uc) { +@@ -1234,8 +1236,28 @@ void logRegisters(ucontext_t *uc) { #endif /* Linux */ #elif defined(__linux__) @@ -57,6 +58,3 @@ index 5318c14..8c21b47 100644 serverLog(LL_WARNING, "\n" "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n" --- -2.25.1 - diff --git a/meta-oe/recipes-extended/redis/redis/init-redis-server b/meta-oe/recipes-extended/redis/redis/init-redis-server old mode 100755 new mode 100644 diff --git a/meta-oe/recipes-extended/redis/redis_6.2.14.bb b/meta-oe/recipes-extended/redis/redis_6.2.16.bb similarity index 79% rename from meta-oe/recipes-extended/redis/redis_6.2.14.bb rename to meta-oe/recipes-extended/redis/redis_6.2.16.bb index 2433abba5..40473461a 100644 --- a/meta-oe/recipes-extended/redis/redis_6.2.14.bb +++ b/meta-oe/recipes-extended/redis/redis_6.2.16.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.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] = "34e74856cbd66fdb3a684fb349d93961d8c7aa668b06f81fd93ff267d09bc277" + " + +SRC_URI[sha256sum] = "846bff83c26d827d49f8cc8114ea9d1e72eea1169f7de36b8135ea2cec104e7d" inherit autotools-brokensep 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"