From patchwork Fri Mar 21 12:59:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 59729 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 908B6C36007 for ; Fri, 21 Mar 2025 13:00:30 +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.20499.1742562021489225598 for ; Fri, 21 Mar 2025 06:00:21 -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=5175c14ca8=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 52LAo2cP015434 for ; Fri, 21 Mar 2025 06:00:21 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2049.outbound.protection.outlook.com [104.47.70.49]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45eprrd1ac-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 21 Mar 2025 06:00:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=h2kVO/yb10YTeBkjqTDQfLqNDXJ2WA7S1vIa6t/rAlGb2J0aQGZexFQ1BbT4qMct4raCpUwuQfbZW7zEyB4BrtqkXr3Da5EplsGSYfKQe/aH57jJfXRqmmrpP2NjojULx4r62tRCJ2x/m5dluUhjuTA9UXAH2NiBEc/zr5uwsAXtbdsheUwYKKiCTOtkByQ9VupVFNZlpMPrZTJSHoVe1loAbAiDWBM2TqNxdbjH/tYqEkwezHCpoC20iOb3qtxBw/m0fCRswrAKJhOfrSW8KbskM+kMEr5LxB9lxdJypqL1jlJriPMkRSpAfO2oBQOnPIDLnhzgr9ZO1HtIFiAHvw== 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=lIFkUijeJ7HYq2jKDv+Q/DapHhdswl6903o/PeLLqO8=; b=e2x0e9Bdnh0urPM/eU9VkOImZZF9sofPnFMqX81+jPxU2kipMik0ytGJjHeBlHp/m/9vBcRi4aRUC+DShp57N85FuWoCd0CdgCdSDQfcf8p4kiFbX1RPIwORbCVez039btd0wUfUa+4a8z0fLiY66p5JhoV1N69uhTN3Hr6wPELCa7GYf7ZkoTQwZVkjrJivGalZCfn1582LCmXNm8ybkm76YUCgMB/TQRskZs2fYsOaLF/ZhMJXbXF3WLKx5oh8dxIjk3V/cyM1vqBkNZ/sORo585XxCw09kKsWbaD1vIHncbUyjhs0Snu0SMdWV+wdWxtgtADoGUYtcZ8NcwQ84Q== 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 PH7PR11MB6953.namprd11.prod.outlook.com (2603:10b6:510:204::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Fri, 21 Mar 2025 13:00:18 +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.8534.036; Fri, 21 Mar 2025 13:00:18 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 1/3] strongswan: upgrade 6.0.0 -> 6.0.1 Date: Fri, 21 Mar 2025 20:59:58 +0800 Message-Id: <20250321130000.667251-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: SGXP274CA0012.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::24) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|PH7PR11MB6953:EE_ X-MS-Office365-Filtering-Correlation-Id: cfca13e3-f078-4850-ed83-08dd6878545b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: WjJtGtLgJhRXr0P6ckKYC8JYImmR4isKqyPj/2WhpJPQdwNxmwn5Xmq2hkqycd5sC8q5pt+cjSzKJyRo1tL+lG0BHmSuyocD5Az3SL/OaESdfg38PhjSeAEFRZX5+Y/PWPONXVKLXSu8DND52yHhbcEl5XGsxzT4DEqNaGls57Z6ctZvgnr4nY3Xt45NjDxRpzjv89UQu5aBEt1tDfiIxqRoUXnZyZZWflRl2xry2srJi4FhHU02/ir6dq7Zyq7JggwHMksOST6VMYqAm0s6jLpkdWVbvaXzi1tul3ZahdLU3MrCu6Vf4pQiVg3dzHEbD3XkfgKhMkZaVcJqBH2y1nEprspJOd2jGU9aznwg8nm6tol7Ufllz3N1IXMC7HTBCyWZX2kqPL2aU9/SP5aU8OMVFpwAz0Za0hJSWZ/XFBiferfGc8CEzGcfJcxxUYVSUMfRyP/34rnL7qIbVHjDo7UQ0J1z0x+8bKdVOrvO7dFWkonsAg64ntaqheTpaMvjCFMnNaxuI5BV1CYxVFFDZl9iQF56RFitRIJWTYrcmuV0fI+NHs352fmEXbnHI0H+lz04+hE58fXmsFzs1US5PVifi0QK+jWafDfuekUMjC52OF8NrDrrrJiaDUMyX6OQhvqFha23KGEE9va+2jdVuevQI50+xqq3TxQwlZVIFkoIuch5lr1KpqXcgT6/HIRgdSucmf+DwoVQL1RZ05E66+AW3FGKrC/jof2CahC4Yudaw/xPj+gPEheNZhDeOZp7Jase8PHkg7HVpy5nx96XIGiTJBdP9wafrGtlhJgExTL4H7kCSDFrBPGi6QKl9OXAqQr5CBXYlC6FFZLgQuS051UYRUsY6/hzI//QbTOB5h79i98/FgAzbNO8QKGpWuvBbqqhvojSUebip8nlSuKLuQIFz5uZsBSh5TVQbL/so31WP54XfhWuQQ9wxMc/gXOGpf0ehjhs4PdpKgEk1DRuWixVXUpjjWyK7ATtir2I8bPSEq9BGHVWo+8JssGzehfku7QytkShWNNbv9KfoyxXzyOwSd+9dy+biSjUCD1SQY3Z2fG2a5jlXtxR/czBRf03sa6u8+5M54Lq+hE8T8ZNEW8kRmnMSbzgLOCwsEBO4mN9Y1UMS0VpLWyzjJf3MI4z0xkMAHOcGSL6ZQR9+DC9AVdhqB9z1+fJwV/s0+tDZrtMu6uEjoo68I/tRN15aw1szvm+cBr7NLd/TE6QcqMFz1Zh8dzO9cfZkHWwVZt6M9rYeOxSTA/kpY0bl8gzd2AoSLbyjXcsMqhaFwe3kqKEBp2UEES1FwX4VysVInTXZ2mbLTQzKu7a8dMR316pgGBHF5xRSJW4kXPtt6qHKeE/sk9RpEg5tKNXQ4+5yKwpqoUNhUWwObX99NgLvGf+9kJ6b6Nj7rtoHO2o7kX7QrBoaw== 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)(366016)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: m+kVbftJGnF1TQBTiZg4qerVdRhc3aJkgVpr91v+VE5DO+hwshyrzRNV1Q3XW+lzCtwzwER2eAfBPMTuttV8r9+5JnBFQtzXBlXSlEC7ktcKmKn3bMvYpsnxVLDQqCR+jcdNSpGx0tw+35eGG6ZiuapNamiow6pS1KLCMs47kVTZjGC34D3G3ZB5i1KRewp58E5ULnhmLaWCTNZLo4B1oLsunLPza24nrslVNEcxF5xbVCm0CwiBdD0fQgX+UqYFHYlH+FTrvDcUQmQP8m5hMbcrbWuFY/E9KkjS5WHoiC5X/6dAJyH0JyCMbgjCuS4PRDILwjKtt4OH0qVJD+Xc+5NPPxZl26Y/lqEQs62Z/AWP2axLtyoGZXxPSZ1F3UDsGVKpV4WzvcYH/pO+AmEgTDfR7V9mfVR34oFm2SF0VSzHV3u+f6Iz86fB9ZZwOEm0Cn9LtUds0lS7cVh929waN57WUUvj+nm93SSQvz9XXXQiBNBOymcEYe6h9coHiO4VF54AAbwYa1eD60/aed1M4LnmNzOPl4T9nJqrD8+I82xhRNMdbs67MbrNQMN6LnmPcRha95tbkw8uY4FmED6qOPSrTg6S/20F8z+6hFpyNTuTZrwLeJidWc/740XQFVoQDxvtZe0t0NsJFFC0gSnQy8rq+AC3J2j3f8rmyHaEvq3sq53GoIi/yDX3QhPHTzTvNDfcT7euGWSpWzrUhut3l1mGQfbAEuhBFJZgIdoNNfNMflKqXPOBoA4wVAy6VR15kNCQf1mjLL+Rb8mOCJvm2AdyIG+3M+AzebDce1aO+Z/oJHhMjU2BPSwe+LAOfL7ypvqrI2G1TZ9/XjAmlYXlRawm9P5k9mSM/5693bPfgJpJ79YwFwzx6kkcVHQhoKuhbpWGRnBkpkbtUehFPfgkCGOSizmFoAA7RAEJrECrs5XkhdYvM5PqUEfVXtOJ79rqoDpxnDf3bpPXfBIZHX/OllXi/tj7aUYLIWN0iit3owQCtK+Af0o4OUz+O5dBjJhWDV98z8Fozzjl5dZqpQSMFHEwmBYyIYivnMhVWQC1MEvHhBuNUO3zSUONPsxAN4z5YNbYJj+PSPUd2/MeuU7uVQm5/n8sydJEDf9pq+V+83J2YTAvvJZr8ByGQsD9rGfxuaxrjgGLExBjUiMkzf9U+fiDlDM3xewG41ZxbUXoEEhLtfEaLNmf1J9yZ6xaGMCB3r2L8ag/cVAUm7bbB9pm0alePhj/zaTqs4clGMDKH1rSY48egKeM/ZgBlf6qVlgwYeyfsFI1tfave5o0ypgYsDMkLCndZXr2e9CM0PoVxaWIE1dsb58W8PxBZIu4qtLcrJHoRCSGl1zpjFwWvpwCuJlQcMgSCZrS6vs5CNO0bl7Rpd4u3MWkilRXQn13Lj15jLxLH964+aFBkMe2m3ZJCmI/26P7WUNi1fN9rgvXOC5vbik/PM59AWbQmWkud8kfzTt6iq+omh1pVZ4L5rPY9A3zAYoMrmHm46+e/b8dr43/lfpGev1WYOQRev0bxvF1QllPcEFPEuqtrpeM2YewYY19fSNVSA9WahHxCPQIwr7qvjCupCdHqOu8Od5LYzt1 X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: cfca13e3-f078-4850-ed83-08dd6878545b X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2025 13:00:18.0756 (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: KAbD1ensBwknPJbVC3+wCexNNjlPY4alvPujbYNR/0evbA/fYxJgB0PS9s8ofRG2615bEYWtC+Id1+KE5WT85Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6953 X-Authority-Analysis: v=2.4 cv=LZw86ifi c=1 sm=1 tr=0 ts=67dd62e5 cx=c_pps a=YkRwJB1Lcas13D3J5+BQ6w==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Vs1iUdzkB0EA:10 a=H5OGdu5hBBwA:10 a=NEAV23lmAAAA:8 a=KiMCiSwjAAAA:8 a=t7CeM3EgAAAA:8 a=zNXjhLrgNjjuMfKTFokA:9 a=sPCYT0qwnquSfqsKqTDE:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: cf3fS-ikRVev63bHinURfPCzSDc6w-Ws X-Proofpoint-ORIG-GUID: cf3fS-ikRVev63bHinURfPCzSDc6w-Ws X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-21_05,2025-03-20_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=999 priorityscore=1501 impostorscore=0 lowpriorityscore=0 malwarescore=0 bulkscore=0 clxscore=1015 adultscore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2503210096 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 ; Fri, 21 Mar 2025 13:00:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116184 ChangeLog: https://github.com/strongswan/strongswan/releases/tag/6.0.1 Signed-off-by: Yi Zhao --- .../strongswan/{strongswan_6.0.0.bb => strongswan_6.0.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-networking/recipes-support/strongswan/{strongswan_6.0.0.bb => strongswan_6.0.1.bb} (99%) diff --git a/meta-networking/recipes-support/strongswan/strongswan_6.0.0.bb b/meta-networking/recipes-support/strongswan/strongswan_6.0.1.bb similarity index 99% rename from meta-networking/recipes-support/strongswan/strongswan_6.0.0.bb rename to meta-networking/recipes-support/strongswan/strongswan_6.0.1.bb index 5cf456990b..9baf219cea 100644 --- a/meta-networking/recipes-support/strongswan/strongswan_6.0.0.bb +++ b/meta-networking/recipes-support/strongswan/strongswan_6.0.1.bb @@ -11,7 +11,7 @@ DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', SRC_URI = "https://download.strongswan.org/strongswan-${PV}.tar.bz2 \ " -SRC_URI[sha256sum] = "72fe58b7523155703b65b08c3cc559c2c9a5c96da54afebd8136f6623e7dda82" +SRC_URI[sha256sum] = "212368cbc674fed31f3292210303fff06da8b90acad2d1387375ed855e6879c4" UPSTREAM_CHECK_REGEX = "strongswan-(?P\d+(\.\d+)+)\.tar" From patchwork Fri Mar 21 12:59:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 59727 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 88319C36000 for ; Fri, 21 Mar 2025 13:00:30 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.20529.1742562022240380719 for ; Fri, 21 Mar 2025 06:00:22 -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=5175c14ca8=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 52LAo2cQ015434 for ; Fri, 21 Mar 2025 06:00:22 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2049.outbound.protection.outlook.com [104.47.70.49]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45eprrd1ac-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 21 Mar 2025 06:00:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lhjl6ZTcfyDtQHQ6+SnJvkhQEcJ4uU37XunWL3YjdR5et3nNHenDxKqQydZQKXHhe78szvNT5AuvMvA1c9WW4FqhbMzCZVBbTEJ+yVb/Zs9yDUsr7LAUaOfFzAt0Nyg4354ybVr1VrzHclLD9N8H+IAiZQfS/HIo63ke3OAcFgwE0WW15zVg8DpVCn+gN+wNJ/k16w28TILmoLfbBFXSmchzWO6CtT2BmxNLm7rOh1+GfvYK5gVDuvy76obuV4qfIOGyG9nadD1oiK9LxuqJy+fkEVIO4APlFXihT+xD2nZZWgOPFIhEk/rfWbg6n/6D6evib+ncTnl/jMCyTGO5nQ== 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=vCxZCpEymm+jZywQsdzarEr5MsbmT/zi0g0btgfny/Q=; b=qq8pfZCbugYvFdEz6pdO1XCmt5cAyUu3ck4S5lB3QMFdrZxt2ZPtG6gvaniwbzWjkhTzTETdJbJ3q17q1i5Ebmb1tyWZ2Fj2V668AxX9htl3B1gD04u4BGEIB2cCkw6zB7Qh7PBYfz0ZVPY8yxxQoVjNdUJ/jKW62U0q++ESIQ30f1oMxOu02q6RAiRNa/mPlTHI0vtrUrCnutcZt269xJSJiMYOiTgoOmEOC1qTa3xaDQCCpgfolZLO+xAs6AFFMQPmT3f5wzD1SpWPZetd0/U1bTNjFwd3KqJ7TRcfJsB8OG8yCDDfmtXfdNyOcD1WK0anKL+ZxUNtHTk45Q/8yg== 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 PH7PR11MB6953.namprd11.prod.outlook.com (2603:10b6:510:204::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Fri, 21 Mar 2025 13:00:19 +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.8534.036; Fri, 21 Mar 2025 13:00:19 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 2/3] drbd-utils: upgrade 9.28.0 -> 9.30.0 Date: Fri, 21 Mar 2025 20:59:59 +0800 Message-Id: <20250321130000.667251-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250321130000.667251-1-yi.zhao@windriver.com> References: <20250321130000.667251-1-yi.zhao@windriver.com> X-ClientProxiedBy: SGXP274CA0012.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::24) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|PH7PR11MB6953:EE_ X-MS-Office365-Filtering-Correlation-Id: 7d680fc0-985f-46b5-df65-08dd68785564 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: yapLr4ghV5m1m6QA/UWO3zVNPlZNEYKquJU/FjsmDujXCZ9wUHRlCkzgzBajtys1SD7vlOXVqBPUEDyebjAJ5Zc6qRtD0xIVYida0glGk1vCugcFq9AOuVXP6MRGiggFRCPqwycLCCGkmY0oP9XFGRzyHrvPd52hwbgnf0WWsTpzVOcIl7eZxuVs9DaEbDKdsjI/6gs8MmdosYerupAoTVYi3HM4rY0eYTYnhnIsDqi9xX6vHwhSy7/YA7ElK7OAIxqcCOwwPZoTwccPPkldUWbG+Hcxrwr9PQ+ovFlLZqimL220nuCpZIYbnoqrffWPE7YGEpC8dqag+SUOigkkFspziYj73sxAfKvOKo/eczNmUFvqmYrlEiAEHlPRY1fQ6cGxTwrJnso/rrnKAf+qE6CZ0pxFefXhCyatRpKU4vP4HT4DjhffEihwAyb+lEejgHXwnN2gVOoshxsaPlJ1hxT7IatDTcfsNUbsqxbGlGChxT3yu2zVAX4r9cX68S52SrFjSHAnK0OsvH4RStYKYTDD68vu8NUJMC4RcH369LuAULOn1JnlNOtDF1xtYv2RbZBcrrsRk9xVZD0SHm9NKdOdXtZhBGey56FI2w5HRZys/kwwiBIDk5fGTcGD4WUISq3bQfwZ6cBjNB/m4UM4DYDCWGOra/PCjIPQ2xX7IKikDC+/q2U8CKrDogu7HPZn9ZO0xd7BbcCEczXUiuJ1poGeW30YdMWHxN6L7tOPVXzIBFp5MU8n0VXkLhyTj7MygfJxbaGZgrRc8pFbgo7qMhmZrhd8EBW0Z7ZjpmiI417pIUuOdHkwgk/4yptz7huu9BiP3X2UDSRFxFZ+Bii8hOfISIOmE9saJvE8VSkazBYS8Un6joolTuwnk1RB3cM/lrTw85/IB6qTPpEjN9CE4/ITw9CeWqQyTYDByYD+Iz28lgvDGr4ZhiFhto03pLIYiFLuoCrGXzA1wto4v3GIjksrZUm4o105LLvlmJb3vxb/JQVQZa3ti3HVbX2dhOEhesr0/IIGvlX5nJPAO9vliukI2bbMtNarNdSD1v5hEGI/F49vIoojggX8NnWj4OR2ANPgj24ixjhPJATmaFy+g3c+cxwBkkrX4HY/Q23WsJSDmoqWAyVK7WPX05L/ENWAvD9e7sL6LflKz3m4oZvUudTvY6UanezVC160ZnKAsMC2WF4Qda8EaiZqt7EBNjlHrJ0v6rH2p1+CZbu539TspUePVNEY29gx8XxQMjnE7UW6TdlAacX4TjQgIbKMXTuCgEWQ5CgH2NiE4ze5efgx7X5s3SYH61vU7zwjzVhcDcBqYBqrTJPxKebNAfhknojUi9CJS7/scAIMSOwfMFMCu3mDKacbwSOole8BdzIfcBeKuqqaZBaOk9BU9vZ/xunXdtzVGfM+Md+uXUSxgnVOgCcznrtx775UyyLatGb821mx9O/wI/va2In8LX+psCU3 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)(366016)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MKwoGUNjKShGDp5X5H6N9V95Z7TvAC1TadgeW9pbelrFi8HfasXLd5f567x7QK9FfzyVy4h9KraKar3K4dAAlMJvalnKFSG/f+WZuC4lWFNW+L09vdhpuujefAqpmF0Ntr2PntJQjEfhEJpiSR8cEd7llwZGsyvSmO7sFOcoSMM6uqcGyLJ0L9gvw7UvJDxYril1S8Ak3HgAh8h91MvYHuU1SQJyfxiUjlNlmAlpn+p2/spHb8ionW2pdXvcvXdwotQqvB3PLJyclNaVDF6quyLWfea/IetpZgeAn1QJS0DZc/UACAyjezbGX8Vufj65AID3CgUfklkkaeH+p3f2IKWouiDZfTnlaRanYy2pnVtBydYuEy4pT2X81HnDcGLTz8HuuEjJBTZIKAnCUF8f4jUaoyK3kQk/i97iZg5FSHJKzrrkQYO2zUnSuolLB4AcpKSRClXLxsPlu9r3s8n25jJ5/hy/lqrsRIJboEoybH9x1mcgXCQTdSsmW6hY9qAyfbB9vGvDIxXcIVhAgiX5yt1mL+2faiglMnFlhx1qgowjrzRZybwz54eKqo9xWZEde5fnse5UUFihrIvhn43QD6iP4S6scA/naWpMCMo8z0cJLTqbxLyTjjoSc67lxIri9Dv1HcXellh1JA+mc8MmSW6aRuMJcn/Zcn+ERSrLU15bVeBuTP1379EDy3ZEJ4OSADURMsFbxI8VN4MSzEzZOucq9j0T5AkFod6AvgCz423xlXQ550ToBLkmd00pwdiMJpB/I+bqSlCTYbERs1kC73LoX74sv4ihgBSi7JoCSYh5I87MllHiR5krB4W4Q9qLrt9CpBgahtGf3IgnUn8NbbzNmA6EDU8hx9mbX0dcHbpEV2Je45JT4o8JtqqEyymPp3MKiMqbo9GcnAvDv1C8320DSZ75ifXEHOAqE1YfarPJyNFlvlGhVU8l5OWiBuMp4+5/Mwgs2e+1oCchy0ZV/iYYy3JaEmGxKIra2cXyJbf0WkuDTuELCPvz0W9zvRvXfSCKLImKdbO5e6oG0gynkP8e4v473z8o42LZddp6dkTsrehIoJQ4QdwvWPWlX9MGHUBicVlgOZcn0U1ZXW6XXq4v4D8M+MmpgYPM4Nht79L/lAlQZktPNShEG27871iVTsiNSS8eOPvz2OL2xRcdSpF1Um1OQvQpOSRJIJ0cZCitwepoI6uxqNsqCMT2L+QrOBA7x6xODbhn1InEMgZyViHvKPLkZDxgxgWvbQuM/FkkDSwIqsaMD5F7YuIJMPvsZOwlXMLFBKaaF59buaqzL39uqUSeL7KTlJ6G1euJIpaEwmXYtuAVxe39hxWarKqyoawGyVe2AfJoJMwnmkHHMDIcOXzkHf7Z/dO+HnCq4CTnvDm7jwqbFRY/4v6LIcDJ9bEbiUKCfbj5t95T/Am6fci/pW9H1RasSCQ4JBHyLFgF5cfzESOk1sx4GVgfI9unlWFysZJGz5xVezZ94NZIVhiQMcGsBojMbljCpcZeaeYWt29xtVXXeFrsLLR4sX7jM+30FsS+ZfCWBJwjBdA/A2Gzh8O8E04mf57c3sdg3a0lj+xnbNxV4z/KaMp1wWIR X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d680fc0-985f-46b5-df65-08dd68785564 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2025 13:00:19.5664 (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: ro/v5jZRND6fb7VMmpy7nuPGfm5Itu/DYhZrBKlaKcFjyPm2pBgF+fJ656EF8CxuGixOUAEFcAbR1/TRk5bKNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6953 X-Authority-Analysis: v=2.4 cv=LZw86ifi c=1 sm=1 tr=0 ts=67dd62e5 cx=c_pps a=YkRwJB1Lcas13D3J5+BQ6w==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Vs1iUdzkB0EA:10 a=H5OGdu5hBBwA:10 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=heqRTPqWGWpZfsG9C6YA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: _FcfsCO7JGdGXRLKrac_GZ_1IWwJ7jym X-Proofpoint-ORIG-GUID: _FcfsCO7JGdGXRLKrac_GZ_1IWwJ7jym X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-21_05,2025-03-20_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=999 priorityscore=1501 impostorscore=0 lowpriorityscore=0 malwarescore=0 bulkscore=0 clxscore=1015 adultscore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2503210096 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 ; Fri, 21 Mar 2025 13:00:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116185 ChangeLog: https://github.com/LINBIT/drbd-utils/blob/v9.30.0/ChangeLog * Refresh local patches. Signed-off-by: Yi Zhao --- .../0001-drbd-utils-support-usrmerge.patch | 155 +----------------- ...001-drbdmon-add-LDFLAGS-when-linking.patch | 17 +- ...d-utils_9.28.0.bb => drbd-utils_9.30.0.bb} | 4 +- 3 files changed, 20 insertions(+), 156 deletions(-) rename meta-networking/recipes-support/drbd/{drbd-utils_9.28.0.bb => drbd-utils_9.30.0.bb} (96%) diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch index ef0229d5bb..93cb8e185e 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch @@ -1,29 +1,21 @@ -From 9109f15f5b8ae142823194b9ef50c392615fe38d Mon Sep 17 00:00:00 2001 +From a019fbe36ab965e754b818fe1bdb0cea0e3ffb60 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 21 Apr 2022 17:22:35 +0800 -Subject: [PATCH] drbd-utils: support usermerge +Subject: [PATCH] drbd-utils: support usrmerge Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Changqing Li Signed-off-by: Sakib Sajal --- - configure.ac | 2 +- - scripts/Makefile.in | 10 +++++----- - scripts/drbd-demote-or-escalate@.service | 2 +- - scripts/drbd-promote@.service | 4 ++-- - scripts/drbd-wait-promotable@.service | 2 +- - scripts/drbd.service | 6 +++--- - scripts/drbd@.service | 6 +++--- - scripts/ocf.ra@.service | 4 ++-- - user/v84/Makefile.in | 14 +++++++------- - 9 files changed, 25 insertions(+), 25 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d3ec5ff1..910232b1 100644 +index 37148597..52015fb2 100644 --- a/configure.ac +++ b/configure.ac -@@ -178,7 +178,7 @@ AC_ARG_WITH(tmpfilesdir, +@@ -217,7 +217,7 @@ AC_ARG_WITH(tmpfilesdir, AC_SUBST(tmpfilesdir) # set default early @@ -32,141 +24,6 @@ index d3ec5ff1..910232b1 100644 if test x"$with_udev" = x || \ test x"$with_udev" = xyes ; then if test x"$PKG_CONFIG" != x; then -diff --git a/scripts/Makefile.in b/scripts/Makefile.in -index 15a26f37..ff028310 100644 ---- a/scripts/Makefile.in -+++ b/scripts/Makefile.in -@@ -90,11 +90,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) - install -d $(DESTDIR)$(systemdunitdir) - install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/ - install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ -- install -d $(DESTDIR)/lib/drbd/scripts -- install -m 755 drbd $(DESTDIR)/lib/drbd/scripts -- install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts -- install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts -- install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts -+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/scripts -+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd/scripts -+ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts -+ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts -+ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts - install -d $(DESTDIR)$(tmpfilesdir)/ - install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf - endif -diff --git a/scripts/drbd-demote-or-escalate@.service b/scripts/drbd-demote-or-escalate@.service -index 20932238..8b5ce4a2 100644 ---- a/scripts/drbd-demote-or-escalate@.service -+++ b/scripts/drbd-demote-or-escalate@.service -@@ -28,5 +28,5 @@ TimeoutSec=60 - # "Type=forking" would be an option to have it retry a number of times, - # and then only escalate to FailureAction if that did not help. - Type=oneshot --ExecStart=/lib/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I -+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I - ExecStopPost=-/bin/journalctl --sync -diff --git a/scripts/drbd-promote@.service b/scripts/drbd-promote@.service -index 71345d9b..678e0703 100644 ---- a/scripts/drbd-promote@.service -+++ b/scripts/drbd-promote@.service -@@ -24,5 +24,5 @@ RemainAfterExit=yes - # (ab)using systemd features - # if we cannot configure and promote, that's a condition, not a failure - # See the comment above wrt. FailureAction vs OnFailure --ExecCondition=/lib/drbd/scripts/drbd-service-shim.sh primary %I --ExecStop=/lib/drbd/scripts/drbd-service-shim.sh secondary %I -+ExecCondition=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh primary %I -+ExecStop=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary %I -diff --git a/scripts/drbd-wait-promotable@.service b/scripts/drbd-wait-promotable@.service -index 81c3789f..3416abc6 100644 ---- a/scripts/drbd-wait-promotable@.service -+++ b/scripts/drbd-wait-promotable@.service -@@ -10,7 +10,7 @@ Type=oneshot - - # on first start, wait for access to "good data" - # let systemd handle timeouts --ExecStart=/lib/drbd/scripts/drbd-wait-promotable.sh %I -+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-wait-promotable.sh %I - RemainAfterExit=yes - - [Install] -diff --git a/scripts/drbd.service b/scripts/drbd.service -index 96c599e7..c81e95a6 100644 ---- a/scripts/drbd.service -+++ b/scripts/drbd.service -@@ -12,11 +12,11 @@ RemainAfterExit=yes - # A check for INIT_VERSION already exists, just set it to something. - Environment=INIT_VERSION=systemd - --ExecStart=/lib/drbd/scripts/drbd start --ExecStop=/lib/drbd/scripts/drbd stop -+ExecStart=@nonarch_libdir@/drbd/scripts/drbd start -+ExecStop=@nonarch_libdir@/drbd/scripts/drbd stop - - # Re-adjust everything on reload --ExecReload=/lib/drbd/scripts/drbd reload -+ExecReload=@nonarch_libdir@/drbd/scripts/drbd reload - - [Install] - WantedBy=multi-user.target -diff --git a/scripts/drbd@.service b/scripts/drbd@.service -index 0fad10be..556f3857 100644 ---- a/scripts/drbd@.service -+++ b/scripts/drbd@.service -@@ -35,8 +35,8 @@ RemainAfterExit=yes - - # depends... do we want this as ExecCondition or as ExecStart - # failed start is "failed", failed condition is just "not startable yet" --ExecStart=/lib/drbd/scripts/drbd-service-shim.sh adjust %I --ExecReload=/lib/drbd/scripts/drbd-service-shim.sh adjust %I -+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I -+ExecReload=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I - - # can only succeed, if you first stop all depending services --ExecStopPost=/lib/drbd/scripts/drbd-service-shim.sh down %I -+ExecStopPost=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh down %I -diff --git a/scripts/ocf.ra@.service b/scripts/ocf.ra@.service -index 9c2268a6..1666c482 100644 ---- a/scripts/ocf.ra@.service -+++ b/scripts/ocf.ra@.service -@@ -22,5 +22,5 @@ Environment=monitor_inverval=30 - # Only the first argument is used by the wrapper, - # the %n is just to identify which is which in the process list. - # All parameterization is done via Environment= in per instance override.conf --ExecStart=/lib/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n --ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n -+ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n -+ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n -diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in -index 0fcefc5f..81f7d5ec 100644 ---- a/user/v84/Makefile.in -+++ b/user/v84/Makefile.in -@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes) - install -d $(DESTDIR)$(localstatedir)/lib/drbd - install -d $(DESTDIR)$(localstatedir)/run/drbd - install -d $(DESTDIR)$(localstatedir)/lock -- install -d $(DESTDIR)/lib/drbd/ -+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ - if getent group haclient > /dev/null 2> /dev/null ; then \ -- install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ -- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ -+ install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ -+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ - else \ -- install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ -- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ -+ install -m 755 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ -+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ - fi - endif - - uninstall: -- rm -f $(DESTDIR)/lib/drbd/drbdsetup-84 -- rm -f $(DESTDIR)/lib/drbd/drbdadm-84 -+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-84 -+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-84 - - spell: - for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ -- 2.25.1 diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch index c7766067a1..ac2626c1c8 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch @@ -1,4 +1,4 @@ -From bb044160faf4ae7615ddfdb17641dd88c33cde57 Mon Sep 17 00:00:00 2001 +From 26ed5003847a14a16d0c1d4030aa1a361c0289fb Mon Sep 17 00:00:00 2001 From: Sakib Sajal Date: Thu, 31 Mar 2022 15:09:58 -0400 Subject: [PATCH] drbdmon: add LDFLAGS when linking @@ -7,11 +7,11 @@ Upstream-Status: Pending Signed-off-by: Sakib Sajal --- - user/drbdmon/Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + user/drbdmon/Makefile.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/drbdmon/Makefile.in b/user/drbdmon/Makefile.in -index 7bd8987e..115a81b8 100644 +index 9c5427e9..0101a60b 100644 --- a/user/drbdmon/Makefile.in +++ b/user/drbdmon/Makefile.in @@ -1,6 +1,6 @@ @@ -22,12 +22,19 @@ index 7bd8987e..115a81b8 100644 CXX = @CXX@ LIBS = @LIBS@ -@@ -72,7 +72,7 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h +@@ -76,10 +76,10 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h drbdmon: $(ls-obj) - $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS) + $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) + drbd-events-log-supplier: $(supplier-obj) +- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ ++ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ + # do not try to rebuild Makefile itself Makefile: ; +-- +2.25.1 + diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb similarity index 96% rename from meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb rename to meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb index af0afc2a91..d9f1ae3f77 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb @@ -12,8 +12,8 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;prot file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ " -SRCREV_drbd-utils = "ba2ce9037989b6141222c7901d1219cf852949f1" -SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a" +SRCREV_drbd-utils = "36ea199f38b543b2da92219109c2832e122e5bf9" +SRCREV_drbd-headers = "94f4472513f351efba5788f783feba6ac6efe9fc" SRCREV_FORMAT = "drbd-utils_drbd-headers" From patchwork Fri Mar 21 13:00:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 59728 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 8B8C1C36001 for ; Fri, 21 Mar 2025 13:00:30 +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.20502.1742562024727019510 for ; Fri, 21 Mar 2025 06:00:24 -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=5175c14ca8=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 52L885n4005889 for ; Fri, 21 Mar 2025 06:00:24 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2043.outbound.protection.outlook.com [104.47.70.43]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45eprrd1am-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 21 Mar 2025 06:00:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=c9fgXz+opwa7olxx7R/fDPbfvep1FJlCauQCGAKDCMVTSoiVvINdphXWBjlLDG3NDF+R7lgGFzl0AAUZgyIIu9DxdkHMptuh71wa8MJdFFG+A/y0dfv03HzS29Z1L7CNuRA1oIupLPnkMWZ+qFg2wbAv2tf0vGQsTiYhLOh7oCVH6OpiumzsYnBHzdr4o3P/fbTOk2iBS9Ij0i/pD4A/b0vIseEcpUGWn7rWrW/b2LZCukzclIksZQTL2V0Kp0x22n0PdOmwX6LohV8c7Xc5xDqHrjETgQcXSPHrk8f82LZ1hnREAGpYNCPALvbKeDMGk+L7c8jqxyc2+kmCkjU97A== 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=9rdV7XaLtwfFyXwqq9Zem+uVQIT3kAB6tQ7FnzEbyDU=; b=B/FnLkhe8+48tShJi9AGP0y1TCLgeh/pXTbZbVy/MIzE7r72JPpA274ht5HzraF21ZR4DcVt9LK7kYxjPopH5QzafTXe5kSF1wgpblkNRdcimnScgLuTmXtRYBrF/OD/hv+qpOzeKFPFzOzH1+MrbjCqA9rfriBgya4eIij4Cq/DFItmBu4GYjWONKroA4HH3h1EX+RtxO68CGjwlffBg3ml5wJitC0qGp1jT5gE0h/G/VKYXkYpXShWA+Hetv8kIrAnfB00wR7qb+NJ0kW11Hb/Vw3JdiqhHDBjFmKVmNSNM/M1QYxY+le8t24DBlFvAe/++l3mA6GGLllrILt8nQ== 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 PH7PR11MB6953.namprd11.prod.outlook.com (2603:10b6:510:204::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Fri, 21 Mar 2025 13:00:21 +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.8534.036; Fri, 21 Mar 2025 13:00:21 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 3/3] freeradius: 3.2.5 -> 3.2.7 Date: Fri, 21 Mar 2025 21:00:00 +0800 Message-Id: <20250321130000.667251-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250321130000.667251-1-yi.zhao@windriver.com> References: <20250321130000.667251-1-yi.zhao@windriver.com> X-ClientProxiedBy: SGXP274CA0012.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::24) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|PH7PR11MB6953:EE_ X-MS-Office365-Filtering-Correlation-Id: 6215a8e6-9c65-41b6-395a-08dd68785637 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: AxteeRnVS3+XgbJ/0FGD/liwaIC0f4VQZNmKP4K5bWSDfw1wOAkZx579+WCjHO9XtrEnBwCj/RgS4/BfJkj7uw6YU6T+BXfanz4G07mrbM87s4imn2uDg0DmTQ8JhVHH1fvtSSzKg/MWFT4VWYPT1XVWoqEnposItTucHFSMbx+pAJeowYEKX8ys9r75RoPbK6FxhvpnMfw5OlmS7WstSZoEiitFwCqSqBXDTexrLN1d4Jy+tHk3FRc2bc5RhasQjnoBUj/drYIoONr4X8ppHvvqZyZRj8bKQCs2C+jeXGq1QLlJlNr2sxWbUKuzODTTBTphD5815+ar9mNH1/Mf44m94LtPm1iIltk0lsSnaLflKDoVUAMf/xePUFseanJKyWSXGjSQ8qZhxGhTte7POmPrQC83XI//TmihZQz7HAB8fis6RIsN2XCiORwZZEZ3VM8IO7pTOICTy9BslkZzeYcxhFFvaltOo4grp4ZrvHptg0sZR4CIYTSY7tthT4E8EIsEei8fbRrxdzubno4ox2Tw4ikRtGMk063LcXUifNaAfA8OJ+NgFzKXWjDqGxWUNCwNMF5ULbNmdLKSaNqKy6JWfSON92bmJFKw8sWTO9d2C1zbgmQMRzIz3LGXPsLbrj8BkBZ0XCI50KxpSskeZgr/L4OgRETQNG+1hiZ5W0Z4yiKS5ujFyqUwMxv9QWCN3oAMJ/ZGUay/Krnh1JJvL+sqGHm+WVPzW2KbisFcn4yLzMpaUfe+afePRxLmmRUPY7SgrGBLwwVYWRt/Z8+0LCf2F3RSffn9N12e9mwWMqDB21/KyowVy4UCD4n2cXJgMVvqpqGjt8Z4Z+Aa5ueHv4Baqa5zFV1D/ttMrtlaWuHm9YhoVwHr2jYswUXVZHHauSE+TJf+ba0Gl7N5BKgkeXcgjrdh9+tcbqf4VuKEtt6GIVW575mLTabieGnqW93iVlEyxstSwcMpJbZNdFcDBPrzuHcjH154/fhzNVmsrHvPiU5iO1uBl8YaXy5/HFxOp1iHeArKisGW/GZEXCNMqp1YrN0wP/wYN6gxBFnu2YUsCKN0NH0QOXc1ET8/ts5Yf/CCMieFmaC4n7q27Nmgwzfzi/RLFbiW2+O4iU2TZsikrRyKCqJ+URJjYkS7rFdAdrGC9Td7s0Tu1aD/vZHplqZAquq7cpWnvJD7R83kvTL6B80nVBodXIbQlqXSOY4mL9EevVnpBD4vELusVNypAHyZbkTmwXcIFGSk9LbPdFWcYtdoyE/dnEYXXfWKrTwWL0fan9qmcRF7zB4xMBjdn/gx+eESm74VWJhKtvqhohyE2U1ml2fex5g1qqkGmuPpHi5ibiNpKRjO3PYDx1jNV0+j6Jb2f3i8iVJ7XwMdofZiTU02QyhcovWNQLnUsP6Ns/zGBTMUK6eYj3UdNohCYtFReq+12muAkePE1YAd/kQMEHYS7wvVs0jhLq1qBTQ1 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)(366016)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0kw2C7nEDn/E8FZ8SHoQ93aqfvkxlwRtjuUTfIALp/xF0JEqzKfI77DZF/hG31fq9hDwfY8UEeQc/mB0adkaLikaA2ttz1m9bMDsRPUVajzdNzdI9hKJlUwFq7hQCgG00KT2yo5hG0mVQ8sIhW/4roZK7nJ6BKewFQhs5TN33JDWkIPyATU2DNXVecDoyFR0oUwxcuxbmVEYdUVB4FUL73CkXUDqCQ02P6AlfTqQfEsH1JEUhWQdaBHAVvz+G+7pKiydyl3NywhuIjiCoF9kReWX2nLsmza6x+lkrQ6vaZjOE9sNOJ5ZfL6S/ieHXG5/9oC9qJnlFh+odp8gis4bcAgFJm7LgweRS1S7PmPHv3DRtRTIyiTZ2z6onFXXCjeooYWSek94ThH65kvdDt5AQdlB9DltbtZCVhp0F/mVOxiNwQ5gppMoOWckjGAJkASEx2f7K0sx3KZL9T4CyaNMtQ5u7v8Ulxl1fGp6f/Q204WX7eh6KA0psFarguw9SXka9KHW8LDrt57de3xatM/S0MY7jyO6xf/KsiitEOBoYxAV8wWF01PsDpLbSaiXxL6AKIRi6la0EDGNb46uUskR5nN00y99N/ogHPvzDnNWof5WwPZhFRW7obUpBOFLSSCZ9HQqIUknVU7ggMu+GhzjBq+bB3TGwRY954mXRFFS1ETW6ueN6F9wXEC/5uaXPXn5Xl9WLH7Q7uJQhkRRizbmkpoZNXwjJua2TS8QPMvlXsyYD1ZW2xj9tsnIkauxuEQRnvb7C9/HJk2lDC86xQqkRWTdictfTzPqgmxcV913FF+CB6S/hMmaluQjWVH6pMcLB/NAV0/jbxFD0Hx3XMOoMUWX4JOOsE9N5YwPB4zQ0h0yCs+9GCtVDath+Xj9W+cCWVxL2BeuE+vbltXtgEqo74/6lxx45Cq2om4JrejBRCGyMxm7E6qVhPNjj5+4TIb3EoHKZCid4smVqR6VcaMUS7P/oKku6dZE2VJLw8wwA45Q9bhsjirrNJp80TGlcfrPvzAOuyaPO1x0kVaARjaXX+8Cw0EsnUE08U7uUKoCzHDyjIQNxwGktTk92AaLFhCOC5U71Y2No2J63gqZeCaEFuAdh8LsxSuT3BOvVIz5o4VMldz03JTWs5hvtad+fQFX00P8Q7gNJIuoWmYtjLDnrAW3HszroOe3SFHSl3dCc23wTUDdQ8xKUQVw71wPocsvwLKP6f6VAFgFFV/dVm5g4bp9thgtDvVmPObsaR7uswvEEJ762dmwfebeYQ8WAt5hYD2MX147sqIR4O/yzc0vt5Pd406ev4loSvX/gzzbSjWTU9vSqIWCXNOpPQXp6w+y4W/9GvWSecbQM1VVyhUO0FpD+5qTmZ8ADO5kKD0/mp+rkuKAE5CdxWQaXUYFtjNJQI3BRBUk2NooMespmCN41PgX7yashEqWAeNdnby2/6DeslNlNmlMeOurPHk5E+2FEEy61305400IOEFiZMqvjmiP+j60XSMc2hAn/xT/FvAym+F/goG6PLx/pd2LedES3KqIBQYvy267yFYbDKbB8Gm9+zL2YbeP9DsMa6xiEuVoythbSsXSS3IjUuwBVkOX X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6215a8e6-9c65-41b6-395a-08dd68785637 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2025 13:00:21.2311 (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: N1hnqRQq68LQfFQKxJQ9/CEIJU1JxedRpTv86S9+92KJKzG/bKvzDnaexcHXt3VyCkba9W1WyW2NPYf5/6ukdg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6953 X-Authority-Analysis: v=2.4 cv=LZw86ifi c=1 sm=1 tr=0 ts=67dd62e8 cx=c_pps a=GoGv2RwMe+/7w9MjyR+VRg==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Vs1iUdzkB0EA:10 a=H5OGdu5hBBwA:10 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=OA-qDgz8yoi9TB8ewloA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: coHoriWfSJhuAzfx19wGQIXOB1qgLgfG X-Proofpoint-ORIG-GUID: coHoriWfSJhuAzfx19wGQIXOB1qgLgfG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-21_05,2025-03-20_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=999 priorityscore=1501 impostorscore=0 lowpriorityscore=0 malwarescore=0 bulkscore=0 clxscore=1015 adultscore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2503210096 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 ; Fri, 21 Mar 2025 13:00:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116186 ChangeLog: https://github.com/FreeRADIUS/freeradius-server/releases/tag/release_3_2_6 https://github.com/FreeRADIUS/freeradius-server/releases/tag/release_3_2_7 * Refresh local patches. Signed-off-by: Yi Zhao --- .../files/0001-Add-autogen.sh.patch | 2 +- ...e-user-and-group-of-freeradius-serve.patch | 6 +- ...configure.ac-allow-cross-compilation.patch | 6 +- .../files/0004-Fix-libtool-detection.patch | 6 +- ...5-configure.ac-add-option-for-libcap.patch | 8 +- .../0006-Avoid-searching-host-dirs.patch | 93 ++++++++++--------- ..._python-add-PY_INC_DIR-in-search-dir.patch | 5 +- .../0008-libtool-do-not-use-jlibtool.patch | 48 +++++----- .../0009-Fix-quoting-for-BUILD_WITH.patch | 2 +- ...r-for-expansion-of-macro-in-thread.h.patch | 8 +- ...ncludedir-instead-of-hardcoding-usr-.patch | 5 +- ...file-fix-the-existed-certificate-err.patch | 4 +- ...file-fix-the-occasional-verification.patch | 4 +- ...4-Workaround-error-with-autoconf-2.7.patch | 8 +- ...trap-check-commands-of-openssl-exist.patch | 2 +- ...16-version.c-don-t-print-build-flags.patch | 6 +- ...nclude.m4-to-include-required-macros.patch | 4 +- ...reeradius_3.2.5.bb => freeradius_3.2.7.bb} | 2 +- 18 files changed, 118 insertions(+), 101 deletions(-) rename meta-networking/recipes-connectivity/freeradius/{freeradius_3.2.5.bb => freeradius_3.2.7.bb} (99%) diff --git a/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch b/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch index e1228c2ebe..3e83b4d04c 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch @@ -1,4 +1,4 @@ -From 3be3b9a1345942d1578ec73efa9b2e3c41bd67c5 Mon Sep 17 00:00:00 2001 +From 1e43b309183f2cca627d1995908aeb9bb0b5bf97 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 21 Jan 2022 13:22:24 +0800 Subject: [PATCH] Add autogen.sh diff --git a/meta-networking/recipes-connectivity/freeradius/files/0002-Enable-and-change-user-and-group-of-freeradius-serve.patch b/meta-networking/recipes-connectivity/freeradius/files/0002-Enable-and-change-user-and-group-of-freeradius-serve.patch index c57ee93c33..801ff90ac9 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0002-Enable-and-change-user-and-group-of-freeradius-serve.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0002-Enable-and-change-user-and-group-of-freeradius-serve.patch @@ -1,4 +1,4 @@ -From 2a74c10836c0d2d19248ca40d113936f4a56b039 Mon Sep 17 00:00:00 2001 +From 77e9dbe0d0d175deead427793192ffb4ffad2825 Mon Sep 17 00:00:00 2001 From: "Roy.Li" Date: Sun, 8 Jan 2023 22:47:11 +0800 Subject: [PATCH] Enable and change user and group of freeradius server to @@ -13,10 +13,10 @@ Signed-off-by: Jackie Huang 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in -index 154b50d610..4594d6d2d2 100644 +index 376892e151..63c49a224c 100644 --- a/raddb/radiusd.conf.in +++ b/raddb/radiusd.conf.in -@@ -557,8 +557,8 @@ security { +@@ -562,8 +562,8 @@ security { # member. This can allow for some finer-grained access # controls. # diff --git a/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch b/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch index 3635412d3b..33a77233d1 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch @@ -1,4 +1,4 @@ -From ba1390a80662ff2ab7bfda978cde7df9a871f6ae Mon Sep 17 00:00:00 2001 +From 0a9e26096b1e93f9202f83ecf7302cfcf138b7cf Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 24 Jul 2018 15:03:39 +0800 Subject: [PATCH] configure.ac: allow cross-compilation @@ -18,7 +18,6 @@ Signed-off-by: Changqing Li Rebased for 3.2.3 Signed-off-by: Randy MacLeod Signed-off-by: Robert Yang - --- src/modules/rlm_krb5/configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) @@ -37,3 +36,6 @@ index 9ee6379ea4..1dad481da8 100644 fi else krb5threadsafe="" +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/freeradius/files/0004-Fix-libtool-detection.patch b/meta-networking/recipes-connectivity/freeradius/files/0004-Fix-libtool-detection.patch index 479e1ba76f..41d8ff3ce8 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0004-Fix-libtool-detection.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0004-Fix-libtool-detection.patch @@ -1,4 +1,4 @@ -From 5ba3d140842268cbbdd983266efecb1fba5bdd59 Mon Sep 17 00:00:00 2001 +From 864316403192a3e93a2b1f37de479437964eb7f3 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 22 Aug 2019 10:45:46 +0800 Subject: [PATCH] Fix libtool detection @@ -20,10 +20,10 @@ Signed-off-by: Changqing Li 1 file changed, 36 insertions(+) diff --git a/configure.ac b/configure.ac -index ad8bc8cdda..ef8fced680 100644 +index 6f29206646..c0d6ea99ca 100644 --- a/configure.ac +++ b/configure.ac -@@ -321,6 +321,42 @@ dnl # See if we have Git. +@@ -319,6 +319,42 @@ dnl # See if we have Git. dnl # AC_CHECK_PROG(GIT, git, yes, no) diff --git a/meta-networking/recipes-connectivity/freeradius/files/0005-configure.ac-add-option-for-libcap.patch b/meta-networking/recipes-connectivity/freeradius/files/0005-configure.ac-add-option-for-libcap.patch index 8ef3c4bdf9..168fc78162 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0005-configure.ac-add-option-for-libcap.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0005-configure.ac-add-option-for-libcap.patch @@ -1,4 +1,4 @@ -From 9548dc5e1a6c835cd4f387ba384d8f3f14c3fc8b Mon Sep 17 00:00:00 2001 +From f655b4b6a89ae3bb183c659e61cc78539c2c4e81 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 22 Aug 2019 10:50:21 +0800 Subject: [PATCH] configure.ac: add option for libcap @@ -12,10 +12,10 @@ Signed-off-by: Changqing Li 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac -index ef8fced680..263098f7fd 100644 +index c0d6ea99ca..64aa9e4293 100644 --- a/configure.ac +++ b/configure.ac -@@ -1161,6 +1161,22 @@ fi +@@ -1209,6 +1209,22 @@ fi dnl Set by FR_SMART_CHECKLIB LIBS="${old_LIBS}" @@ -38,7 +38,7 @@ index ef8fced680..263098f7fd 100644 dnl Check for cap dnl extra argument: --with-cap-lib-dir=DIR cap_lib_dir= -@@ -1194,15 +1210,17 @@ AC_ARG_WITH(cap-include-dir, +@@ -1242,15 +1258,17 @@ AC_ARG_WITH(cap-include-dir, ;; esac]) diff --git a/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch b/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch index 510136da1f..e036549827 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch @@ -1,4 +1,4 @@ -From 8fe25b30b6fbb3170705f4468eb4c92eef3a968f Mon Sep 17 00:00:00 2001 +From d8631a433abf7336b065ecfaa5161e408ea47255 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 4 Jan 2016 01:44:04 -0500 Subject: [PATCH] Avoid searching host dirs @@ -14,15 +14,15 @@ Signed-off-by: Yi Zhao Rebased for 3.2.3 Signed-off-by: Robert Yang --- - m4/fr_smart_check_include.m4 | 2 +- - m4/fr_smart_check_lib.m4 | 22 ---------------------- - src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac | 4 ++-- - src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac | 4 ++-- - src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac | 4 ++-- - src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac | 6 +++--- - src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac | 2 +- - src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac | 4 ++-- - src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac | 4 ++-- + m4/fr_smart_check_include.m4 | 2 +- + m4/fr_smart_check_lib.m4 | 22 ------------------- + .../rlm_sql/drivers/rlm_sql_db2/configure.ac | 4 ++-- + .../drivers/rlm_sql_firebird/configure.ac | 4 ++-- + .../drivers/rlm_sql_iodbc/configure.ac | 4 ++-- + .../drivers/rlm_sql_mysql/configure.ac | 6 ++--- + .../drivers/rlm_sql_oracle/configure.ac | 2 +- + .../drivers/rlm_sql_postgresql/configure.ac | 4 ++-- + .../drivers/rlm_sql_unixodbc/configure.ac | 4 ++-- 9 files changed, 15 insertions(+), 37 deletions(-) diff --git a/m4/fr_smart_check_include.m4 b/m4/fr_smart_check_include.m4 @@ -38,6 +38,39 @@ index e7d4443f9c..2b69704f98 100644 dnl # Our local versions _smart_try_dir= +diff --git a/m4/fr_smart_check_lib.m4 b/m4/fr_smart_check_lib.m4 +index 16ac5b3c5e..0f5e9fc6d6 100644 +--- a/m4/fr_smart_check_lib.m4 ++++ b/m4/fr_smart_check_lib.m4 +@@ -64,28 +64,6 @@ if test "x$smart_lib" = "x"; then + LIBS="$old_LIBS" + fi + +-dnl # +-dnl # Try to guess possible locations. +-dnl # +-if test "x$smart_lib" = "x"; then +- for try in /usr/local/lib /opt/lib; do +- AC_MSG_CHECKING([for $2 in -l$1 in $try]) +- LIBS="-l$1 $old_LIBS" +- CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS" +- AC_TRY_LINK([extern char $2();], +- [$2()], +- [ +- smart_lib="-l$1" +- smart_ldflags="-L$try -Wl,-rpath,$try" +- AC_MSG_RESULT(yes) +- break +- ], +- [AC_MSG_RESULT(no)]) +- done +- LIBS="$old_LIBS" +- CPPFLAGS="$old_CPPFLAGS" +-fi +- + dnl # + dnl # Found it, set the appropriate variable. + dnl # diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac index 0d94ee9bf6..6108e62054 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac @@ -146,7 +179,7 @@ index f31b7d2c5a..67bbf66df5 100644 if test "x$ORACLE_HOME" != "x"; then smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include" diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac -index 46587e4099..b41c51bda7 100644 +index 6b1c9e964e..1937d81134 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac @@ -43,7 +43,7 @@ AC_ARG_WITH(rlm-sql-postgresql-include-dir, @@ -158,7 +191,7 @@ index 46587e4099..b41c51bda7 100644 FR_SMART_CHECK_INCLUDE(libpq-fe.h) if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then FR_MODULE_FAIL([libpq-fe.h]) -@@ -95,7 +95,7 @@ else +@@ -110,7 +110,7 @@ else ]) fi @@ -188,36 +221,6 @@ index 3bdfae6032..ce68c312c6 100644 FR_SMART_CHECK_INCLUDE(sql.h) if test "x$ac_cv_header_sql_h" != xyes; then FR_MODULE_FAIL([sql.h]) -diff --git a/m4/fr_smart_check_lib.m4 b/m4/fr_smart_check_lib.m4 -index 16ac5b3c5e..0f5e9fc6d6 100644 ---- a/m4/fr_smart_check_lib.m4 -+++ b/m4/fr_smart_check_lib.m4 -@@ -64,28 +64,6 @@ if test "x$smart_lib" = "x"; then - LIBS="$old_LIBS" - fi - --dnl # --dnl # Try to guess possible locations. --dnl # --if test "x$smart_lib" = "x"; then -- for try in /usr/local/lib /opt/lib; do -- AC_MSG_CHECKING([for $2 in -l$1 in $try]) -- LIBS="-l$1 $old_LIBS" -- CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS" -- AC_TRY_LINK([extern char $2();], -- [$2()], -- [ -- smart_lib="-l$1" -- smart_ldflags="-L$try -Wl,-rpath,$try" -- AC_MSG_RESULT(yes) -- break -- ], -- [AC_MSG_RESULT(no)]) -- done -- LIBS="$old_LIBS" -- CPPFLAGS="$old_CPPFLAGS" --fi -- - dnl # - dnl # Found it, set the appropriate variable. - dnl # +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch b/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch index 78259d7d74..4d8400c87f 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch @@ -1,4 +1,4 @@ -From e4ff7a2a9834e2589bc7bdda4b74f5bc962b15e6 Mon Sep 17 00:00:00 2001 +From 0aab0817acf2179d99c516d7933c80c411855eb7 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 27 Jan 2016 05:07:19 -0500 Subject: [PATCH] rlm_python: add PY_INC_DIR in search dir @@ -28,3 +28,6 @@ index c79c327064..5f4d274990 100644 FR_SMART_CHECK_INCLUDE(Python.h) CFLAGS=$old_CFLAGS +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/freeradius/files/0008-libtool-do-not-use-jlibtool.patch b/meta-networking/recipes-connectivity/freeradius/files/0008-libtool-do-not-use-jlibtool.patch index 559b857b63..f469e85b91 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0008-libtool-do-not-use-jlibtool.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0008-libtool-do-not-use-jlibtool.patch @@ -1,4 +1,4 @@ -From d0fa5b259c2dc942d0a43a9cf1bfc32f40c184f9 Mon Sep 17 00:00:00 2001 +From c47048a68eec6838c87e5cde5fddc7e7500b7742 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Thu, 7 Jan 2016 22:37:30 -0800 Subject: [PATCH] libtool: do not use jlibtool @@ -12,26 +12,25 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Jackie Huang Signed-off-by: Yi Zhao --- - Make.inc.in | 4 ++-- + Make.inc.in | 3 ++- scripts/boiler.mk | 2 ++ scripts/install.mk | 14 +++++++------- - scripts/libtool.mk | 22 ++++++++++++++++------ - 4 files changed, 27 insertions(+), 15 deletions(-) + scripts/libtool.mk | 22 +++++++++++++++------- + 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/Make.inc.in b/Make.inc.in -index 05f82776ff..e78f3fe9dc 100644 +index 6d5cc1c343..7944aa7143 100644 --- a/Make.inc.in +++ b/Make.inc.in -@@ -57,7 +57,7 @@ CPPFLAGS = @CPPFLAGS@ +@@ -57,6 +57,7 @@ CPPFLAGS = @CPPFLAGS@ LIBPREFIX = @LIBPREFIX@ EXEEXT = @EXEEXT@ --LIBTOOL = JLIBTOOL +LIBTOOL = @LIBTOOL@ ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ -@@ -168,7 +168,7 @@ ANALYZE.c := @clang_path@ +@@ -168,7 +169,7 @@ ANALYZE.c := @clang_path@ # ifeq "$(USE_SHARED_LIBS)" "yes" TESTBINDIR = ./$(BUILD_DIR)/bin/local @@ -41,10 +40,10 @@ index 05f82776ff..e78f3fe9dc 100644 TESTBINDIR = ./$(BUILD_DIR)/bin TESTBIN = ./$(BUILD_DIR)/bin diff --git a/scripts/boiler.mk b/scripts/boiler.mk -index 2ce0c18f34..567cc0f22f 100644 +index 9d70104747..a882e5ce2b 100644 --- a/scripts/boiler.mk +++ b/scripts/boiler.mk -@@ -272,6 +272,7 @@ define COMPILE_C_CMDS +@@ -271,6 +271,7 @@ define COMPILE_C_CMDS $(Q)$(ECHO) CC $< $(Q)$(strip ${COMPILE.c} -o $@ -c -MD ${CPPFLAGS} ${CFLAGS} ${SRC_CFLAGS} ${INCDIRS} \ $(addprefix -I, ${SRC_INCDIRS}) ${SRC_DEFS} ${DEFS} $<) @@ -52,7 +51,7 @@ index 2ce0c18f34..567cc0f22f 100644 endef else # -@@ -287,6 +288,7 @@ define COMPILE_C_CMDS +@@ -286,6 +287,7 @@ define COMPILE_C_CMDS $(Q)cppcheck --enable=style -q ${CHECKFLAGS} $(filter -isystem%,${SRC_CFLAGS}) \ $(filter -I%,${SRC_CFLAGS}) $(filter -D%,${SRC_CFLAGS}) ${INCDIRS} \ $(addprefix -I,${SRC_INCDIRS}) ${SRC_DEFS} ${DEFS} --suppress=variableScope --suppress=invalidscanf $< @@ -116,21 +115,28 @@ index 916411563b..e38c1ed697 100644 diff --git a/scripts/libtool.mk b/scripts/libtool.mk -index 381127ec2d..e83d7e6ad7 100644 +index 64c2fe0804..05ed2292f0 100644 --- a/scripts/libtool.mk +++ b/scripts/libtool.mk -@@ -60,7 +60,9 @@ ifeq "${LIBTOOL}" "JLIBTOOL" - # Tell GNU Make to use this value, rather than anything specified - # on the command line. - override LIBTOOL := ${JLIBTOOL} --endif # else we're not using jlibtool -+else # else we're not using jlibtool -+ all install: ${LIBTOOL} -+endif +@@ -33,7 +33,7 @@ JLIBTOOL := ${BUILD_DIR}/make/jlibtool + + # Add a rule to build jlibtool BEFORE any other targets. This + # means that we can use it to build the later targets. +-all install: ${JLIBTOOL} ++all install: ${LIBTOOL} + + # Note that we need to use a compilation rule that does NOT + # include referencing ${LIBTOOL}, as we don't have a jlibtool +@@ -51,7 +51,7 @@ jlibtool_clean: + + # Tell GNU Make to use this value, rather than anything specified + # on the command line. +-override LIBTOOL := ${JLIBTOOL} ++#override LIBTOOL := ${JLIBTOOL} # When using libtool, it produces a '.libs' directory. Ensure that it # is removed on "make clean", too. -@@ -74,11 +76,19 @@ clean: .libs_clean +@@ -65,11 +65,19 @@ clean: .libs_clean # Re-define compilers and linkers # OBJ_EXT = lo diff --git a/meta-networking/recipes-connectivity/freeradius/files/0009-Fix-quoting-for-BUILD_WITH.patch b/meta-networking/recipes-connectivity/freeradius/files/0009-Fix-quoting-for-BUILD_WITH.patch index 9386675e46..a28a1e84e9 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0009-Fix-quoting-for-BUILD_WITH.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0009-Fix-quoting-for-BUILD_WITH.patch @@ -1,4 +1,4 @@ -From 3e701d6274924adaed568e22af2362aa5af1f055 Mon Sep 17 00:00:00 2001 +From 33ef5c4e285796c5f208b2b091d4b75e0849f282 Mon Sep 17 00:00:00 2001 From: Peter Seebach Date: Sun, 8 Jan 2023 23:01:28 +0800 Subject: [PATCH] Fix quoting for BUILD_WITH diff --git a/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch b/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch index 051b66af8f..cae27ad3a4 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch @@ -1,4 +1,4 @@ -From 30ce5ccd62446349d432ff65d3fe8d46872423c8 Mon Sep 17 00:00:00 2001 +From 0475d948ceab91b22172f0fae3bc01e0a1502ae8 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 18 Jan 2017 14:59:39 +0800 Subject: [PATCH] fix error for expansion of macro in thread.h @@ -22,10 +22,10 @@ Signed-off-by: Yi Zhao 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/include/threads.h b/src/include/threads.h -index e36d81dac0..2bcb6aadcb 100644 +index f2aea776d6..1c4e526797 100644 --- a/src/include/threads.h +++ b/src/include/threads.h -@@ -89,7 +89,7 @@ static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ +@@ -92,7 +92,7 @@ static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ # define fr_thread_local_get(_n) _n #elif defined(HAVE_PTHREAD_H) # include @@ -34,7 +34,7 @@ index e36d81dac0..2bcb6aadcb 100644 static pthread_key_t __fr_thread_local_key_##_n;\ static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\ static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\ -@@ -100,17 +100,17 @@ static void __fr_thread_local_destroy_##_n(UNUSED void *unused)\ +@@ -103,17 +103,17 @@ static void __fr_thread_local_destroy_##_n(UNUSED void *unused)\ static void __fr_thread_local_key_init_##_n(void)\ {\ (void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\ diff --git a/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch b/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch index efa5c53c9f..d05ed00605 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch @@ -1,4 +1,4 @@ -From f0e764826e3a85488047f7f4e94ebf91460d2c12 Mon Sep 17 00:00:00 2001 +From f742496305018629be88eaac14cc6e1fa80d7594 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 16 Jun 2017 20:10:49 -0700 Subject: [PATCH] rlm_mschap: Use includedir instead of hardcoding /usr/include @@ -26,3 +26,6 @@ index 953336f475..77a18af55d 100644 FR_SMART_CHECK_INCLUDE(wbclient.h, [#include #include ]) if test "x$ac_cv_header_wbclient_h" != "xyes"; then +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/freeradius/files/0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch b/meta-networking/recipes-connectivity/freeradius/files/0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch index cbac989284..8f7457fdbb 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch @@ -1,4 +1,4 @@ -From 0f9f18fc330fe88080be13e43f300fbf7ba4a85a Mon Sep 17 00:00:00 2001 +From de2b9e3b8f9ad8b8ac3e7e820b8b831e91c2dd71 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Mon, 13 Jul 2020 07:01:45 +0000 Subject: [PATCH] raddb/certs/Makefile: fix the existed certificate error @@ -29,7 +29,7 @@ Signed-off-by: Mingli Yu 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile -index c9fbc9e864..d064fe252d 100644 +index 34948bd924..cae939668e 100644 --- a/raddb/certs/Makefile +++ b/raddb/certs/Makefile @@ -92,7 +92,7 @@ server.csr server.key: server.cnf diff --git a/meta-networking/recipes-connectivity/freeradius/files/0013-raddb-certs-Makefile-fix-the-occasional-verification.patch b/meta-networking/recipes-connectivity/freeradius/files/0013-raddb-certs-Makefile-fix-the-occasional-verification.patch index 287e47adcc..cf05efef30 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0013-raddb-certs-Makefile-fix-the-occasional-verification.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0013-raddb-certs-Makefile-fix-the-occasional-verification.patch @@ -1,4 +1,4 @@ -From bb1cb2ffc7a31c0a2bb2de51ef82d304b0a107c3 Mon Sep 17 00:00:00 2001 +From 38cbab566143b9e002ee24a1f08a52ec74186eca Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 5 Aug 2020 07:23:11 +0000 Subject: [PATCH] raddb/certs/Makefile: fix the occasional verification failure @@ -29,7 +29,7 @@ Signed-off-by: Mingli Yu 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile -index d064fe252d..86f4547804 100644 +index cae939668e..52ae65755f 100644 --- a/raddb/certs/Makefile +++ b/raddb/certs/Makefile @@ -59,7 +59,7 @@ passwords.mk: server.cnf ca.cnf client.cnf inner-server.cnf diff --git a/meta-networking/recipes-connectivity/freeradius/files/0014-Workaround-error-with-autoconf-2.7.patch b/meta-networking/recipes-connectivity/freeradius/files/0014-Workaround-error-with-autoconf-2.7.patch index 17eadc7e59..86ca471536 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0014-Workaround-error-with-autoconf-2.7.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0014-Workaround-error-with-autoconf-2.7.patch @@ -1,4 +1,4 @@ -From c591da4a361496eec93625cf8c4f89bddfedaca7 Mon Sep 17 00:00:00 2001 +From 9fed86858d8d2045f3de77405059d786bb2d50ac Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Sun, 7 Feb 2021 16:02:36 +0800 Subject: [PATCH] Workaround error with autoconf 2.7 @@ -19,12 +19,12 @@ Signed-off-by: Hongxu Jia 1 file changed, 8 deletions(-) diff --git a/configure.ac b/configure.ac -index 263098f7fd..fc296832d8 100644 +index 64aa9e4293..0861514ef7 100644 --- a/configure.ac +++ b/configure.ac -@@ -878,14 +878,6 @@ fi +@@ -926,14 +926,6 @@ if test "x$WITH_RADLAST" != "xyes"; then + fi - AC_PATH_PROG(RUSERS, rusers, /usr/bin/rusers) -dnl # -dnl # FIXME This is truly gross. diff --git a/meta-networking/recipes-connectivity/freeradius/files/0015-bootstrap-check-commands-of-openssl-exist.patch b/meta-networking/recipes-connectivity/freeradius/files/0015-bootstrap-check-commands-of-openssl-exist.patch index d1d0111607..b664a9e3f3 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0015-bootstrap-check-commands-of-openssl-exist.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0015-bootstrap-check-commands-of-openssl-exist.patch @@ -1,4 +1,4 @@ -From 78494ea005bd38324953b05176d6eb2c3f55af2c Mon Sep 17 00:00:00 2001 +From e8802c019085c743dc691e9329f05f7e559d1fa5 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Sun, 8 Jan 2023 23:21:24 +0800 Subject: [PATCH] bootstrap: check commands of openssl exist diff --git a/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch b/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch index 2d67fdef05..8917457ec2 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch @@ -1,4 +1,4 @@ -From cbbb62ddda5c189c225f96bf6b599b3b3e8c8252 Mon Sep 17 00:00:00 2001 +From 99ea83d998d3b8957830afa15cec42ba265b67ca Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 3 Aug 2022 16:44:29 +0800 Subject: [PATCH] version.c: don't print build flags @@ -13,10 +13,10 @@ Signed-off-by: Mingli Yu 1 file changed, 13 deletions(-) diff --git a/src/main/version.c b/src/main/version.c -index f1f1e87810..3ffcbb25a0 100644 +index 44a6edc699..a0e6f26911 100644 --- a/src/main/version.c +++ b/src/main/version.c -@@ -589,19 +589,6 @@ void version_print(void) +@@ -614,19 +614,6 @@ void version_print(void) DEBUG2(" unknown"); #endif diff --git a/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch b/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch index f5c399e584..e9511a6165 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch @@ -1,4 +1,4 @@ -From 40abff4062d0521cf2b2a8a4660a3d2933f86f9d Mon Sep 17 00:00:00 2001 +From f48b2887ef2ecff333a5d00551e108fc283c2ba5 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 1 Apr 2024 09:09:07 +0000 Subject: [PATCH] Add acinclude.m4 to include required macros @@ -57,5 +57,5 @@ index 0000000000..690efc3258 + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) -- -2.35.5 +2.25.1 diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.5.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.7.bb similarity index 99% rename from meta-networking/recipes-connectivity/freeradius/freeradius_3.2.5.bb rename to meta-networking/recipes-connectivity/freeradius/freeradius_3.2.7.bb index ec68c1d920..5abdd97594 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.5.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.7.bb @@ -39,7 +39,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0 raddbdir = "${sysconfdir}/${MLPREFIX}raddb" -SRCREV = "a7acce80f5ba2271d9aeb737a4a91a5bf8317f31" +SRCREV = "694a97dddbdd26423504afe7c530e8e1502b7354" UPSTREAM_CHECK_GITTAGREGEX = "release_(?P\d+(\_\d+)+)"