From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 13 Apr 2022 22:30:43 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nejdU-0010As-A4 for lore@lore.pengutronix.de; Wed, 13 Apr 2022 22:30:43 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nejdS-0007EW-06; Wed, 13 Apr 2022 22:30:42 +0200 Received: from mail-vi1eur05on2058.outbound.protection.outlook.com ([40.107.21.58] helo=EUR05-VI1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nejdB-0007Dh-Dh for ptxdist@pengutronix.de; Wed, 13 Apr 2022 22:30:26 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PXf2lp7sv83U/zSj1DudvsaZuUmJUhX0kFZDsy3ggad0lWfIj+l9CnFpycbTbz1slGr4FA/knmCk8DLg7cyvvNrEXXbIxUl4yyUvbSxpi+iTIGUOXSvvuSRMdqJSC3umLXVIjBz7ZHzAUvYeJ7rxya6Zy9rQcnGd2o+pAoU21uUYJjVC3ryVbnaqw+TnoqDc4yrzKOwfm6Ymvnn4TCSBl7IUtn2Qu5EwDDE5D9Fbyz6TKMdn9c/eCUfmp64/uDkFZr/CMnMYR2Y5QmZNiC5vPQiLTFTcxd509uWGNQ4fEDgDAh7iFYlw7D3ZstvJVBU6m0fmXoilyW6Mc+f4rODryQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kvDy4q4g7mHTDPsxAB7UTfRou3Hc5JL6hkdPfGIne1Y=; b=Pflc/ODSw1aaqe0sLIWw4APT9eJIZIBuNHlw/Ri9AyF4Cuvq9qRXSqjHWurrevCROzCs7CD5Xb2+OoIpXMWLmwpXnzDeRM+IO7GJmRCvjorGJqMHtGdYLw6jJlFgmhAmsB9/cU83HK0sQmt25wLCwg71ekHM1ckX05dvust7OBT+yYdYu0b3quWZGpS2tgUvv1qbFPLB/FZc/e5qP1jzs/RntIVptF6Ubu79GVRYv1NM7ZJ1tgrkuBnfkEtnMtJiM6MAMbLlHAdFFBeKjdhda/m4HjdQmDz+ueP8jmwctwpK6JBzK4CyKbyNvpWLIcqPS3juFQvdJLEFaXBtOtwLBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kvDy4q4g7mHTDPsxAB7UTfRou3Hc5JL6hkdPfGIne1Y=; b=lfwQ61EnasyTrVCIUm6y+riJ6/VJNDHPH0JBvMcteFLfIDcdIuzDhUaE69MTfVHqQ9yGjjXArfOhxIPSWluRapTSReb5/uxnehPm3ECgmVEgZqRzP3/u1qR1MgndQvnx6UDYdR3ZHvgSlasZttjL5Rbwhrpkco6/icDkba3FxEU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by DB9P251MB0030.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:2c3::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Wed, 13 Apr 2022 20:30:22 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::3ded:58a4:e21d:33db]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::3ded:58a4:e21d:33db%3]) with mapi id 15.20.5164.020; Wed, 13 Apr 2022 20:30:22 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Wed, 13 Apr 2022 22:30:16 +0200 Message-Id: <20220413203016.3769150-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.32.0 X-ClientProxiedBy: GV3P280CA0026.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:b::14) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c1d44f8-4af3-400b-3b9c-08da1d8c6f4c X-MS-TrafficTypeDiagnostic: DB9P251MB0030:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6NNpx/MuT6pIzvtdmkelKzaSkrghWjjudGFH6BjjvzDD20Fw1HRkTkV3QErS99MYGU6VTH+821QgKG7b6qR0iBKPeWLyhnf/OEyp4l6hYrrUZwz7KYk4F+m/p6/kDH6CKuOt39mfKLbp17INPC6lTRGWRO9vdlYExlf2PiHehaqREeLDcmj9EOr8oBJbz/qTak+aOHxD3bTEJYswWhVT/8Xywl97zGFAeHpygbKDvGofeyQQcpkvyxp+XcqnaOBWzJxtx4LO6ThoTF1W1Cg8A5jWB07QD5L9aIxzhffG4BiJHZXs8VFxvP+QsPCgSZhgXyMszfs2vZyVaCxTYOemRizE9VOm1dx1SCURcVZlfoqFl5BGRfH9yfOBeQ3u14iMpqvpmiYtOImyy/XlTPN/vxL4Wy83ASokSjAmUeVhHy9kUHDSs7+z57ycZMOlRFG/yucN7sfmNSEIEJ6nZnROQ5e1R3CddfD7ECuqx9NzHXXGs3+0EAuYw3Ze8pVT7WN1WEH4T0X9+tuJJyDDTGyamT4tYYKYtS636dXiaRWs8s1lfI2zrJvIfeckil9iE304rNZiLO+jprZkVFgV6b0MLCwA0hKiQUd+2MBcA6qK9u6qSG8a6oYMzXOPZt7wW37Cmhu29U4pcImxyrNvJryp4SQpH3FaYUsRa6EJ9hl3pOSNTTHtUv9RjNGtPI1BKZGSROcdYrBhGP7wT5sbZTiyA9x73cJ3CF9whPZGeTddIYbj5xH7f+t26QIpg7WM1LGY2h6dZBenVEol7k+56XxpS+sv+EhxMHhaqUnVSa7dmAg= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(376002)(396003)(136003)(346002)(39830400003)(366004)(83380400001)(36756003)(8936002)(5660300002)(66556008)(26005)(8676002)(38100700002)(38350700002)(44832011)(186003)(2616005)(6512007)(1076003)(66476007)(66946007)(2906002)(52116002)(6506007)(316002)(6666004)(86362001)(6916009)(508600001)(966005)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hMxYLIFXnXJXGi9Yi5UKcs8RiKQ3MSJd/pN2p1yweGKaygHwtw/HOqQ0YD/h?= =?us-ascii?Q?lxnK3GxmepG5rbvoURUWu1tkusIchuYyUX/Q2vEE87o/Qnz1/jjGdTI/9m0w?= =?us-ascii?Q?PsjwdFwdsf+udoMnr4mDwPePO57dHmC/jZ1vFsJgBx3CADM4ydAWYWJbZg7s?= =?us-ascii?Q?NIi4ndBuJKfb2g9pTgGo1D7tK88mCH6B3aOtO+JaYBPF5wytn+E1oGNfeFnT?= =?us-ascii?Q?up/p5xPxg2zsEHJ6bQiYLSCzarkd2O7AeBTT7Rk0GQoS7Gmp24MY3AafsmVa?= =?us-ascii?Q?GGYBEx0wCPFy/bGdrPKNcvw88wbVNdShpD1sABzXwB3dhRFi8+2VwlNjCuWU?= =?us-ascii?Q?m4qQBKQgyCkLa/3OnQdSVBv8fy2GtZagmmfxOUA9vD0Bwi3UL95dBfmtXHfp?= =?us-ascii?Q?L1uBi/Vdx/OHzd+Biw5GnI8nYH1+KBs1bHNI9tEhBuJAQ9YGnEIuJrQgHLIU?= =?us-ascii?Q?F2lZQFw7nRzLuWqlrSuR9xg+H3clLbTuVkTSqju61EMhEEuxj2fEN9HNWIhw?= =?us-ascii?Q?UKoiG7o/Flc2SJxR/R99+UqB0hNUHF44exUBlKBwOKKuTZa+fj98wiQmGThK?= =?us-ascii?Q?NH/5B3FIpfG/t0ggaIYpM30JzWSfJxsqZ5oPXKRU9RHDL5yCrDPhtI8I5a1+?= =?us-ascii?Q?FT4HWvz+TLnCE0d052Zdi0AAiMJTakmk+zJLx0xfT9KtBTrbTarfEJdcuyi4?= =?us-ascii?Q?lWq2bmuBBXkeBX2eb4/QrGuiitbAVpJGtQvhWUJD1M+LOa+goTpMO8d10On3?= =?us-ascii?Q?IAsOibQtNdqUJ0c5VCbx6QsVaELFXlNomPcEQTeJMkXwRfcoJZ2l1WSV12pI?= =?us-ascii?Q?6VlV+cs7NlOAIUJ7txNCWkCIAIF3FNNgK7/gtJOa3cYpmP0pUuCMfukqSxyi?= =?us-ascii?Q?+DYs2xMJRVxOOKGNwDNZIn3hyqWH49E/YcpQqGsrJ2cd6kD6A37a0FK6QvqL?= =?us-ascii?Q?ZBO3n2JcRh6dvDd7lNkhVY0OqiheDqE1KLzrfAMb1l+OqUvbn9W4zYxqoVzm?= =?us-ascii?Q?gTJhoQppqLiiTP6L2PSHIOhs38W1IeAB7adUIZXjJppgNbDVNE5+wNAssy/O?= =?us-ascii?Q?WyJ5DEq1Og1pJBsPtRaq3t3foAxdrxq2fdCYDoxShAxUqlKLEQgkRnU0E6CA?= =?us-ascii?Q?n5AWUYunpqsOb2BJDp+GO/XJqDvLcqnRjRG3wCFRCWG1jIRtWCy4wKlPoP7d?= =?us-ascii?Q?VK997+vx1Wrr+nlGqwvPSOsxZxeKv859KgUNy5pQD6WQ1suibKGQ+WkV7Jbl?= =?us-ascii?Q?t5I4AP0ke9FUz5ezO3bduvyvFuoOkWawX9hSa6N7YWpDmytHQA2Bu0YP7SBV?= =?us-ascii?Q?Jt7WQuiVTPRFUI9NHcklvdECg4k2UOZmIclWYz5+/ievGAvmmg+Qy91X7bcU?= =?us-ascii?Q?dm0r71i29oeLyVqUfBQC7ZwrWnGDoHnSa0Uk5g5yv+n78HO9qNTq+PhPpvv8?= =?us-ascii?Q?cpox9eXUsHR0tj5wZb0MMa8Q3eREPVpL1aadFKky7pZLfGoY5Ba4ELJ2RLHJ?= =?us-ascii?Q?dCaX4mU0YuG8Hl6w9up+rSlmG6IqAmjg6XLoSUY+s2Em+b0FJvyFvtGWHKP/?= =?us-ascii?Q?Tg7OVuorFUTFku6TUB8WJ9oPuJCHovU0lLCbYCTZmJI+7S65P4niIgBQ/Hf6?= =?us-ascii?Q?e3faDwuOa59Fzx4qIYoOEd/mnfpUFYKPipaD5KvWqjCrbXBflzE/+pGCaZEi?= =?us-ascii?Q?HOixMfKLGbspZpGaiphYat2NFKOKkFlK0r+lRPnWwYWTGQH0iX0BQMB18gfo?= =?us-ascii?Q?XFWCrZtMAJnwhjombTegvUwVGMGUGVRO6wYwxV8on5olE53fSgbl?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c1d44f8-4af3-400b-3b9c-08da1d8c6f4c X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 20:30:22.7334 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0KLR+VBd2Qg8Q8kEVxhmAwGizfD+wAeF9QLlPdewqe9FuKvcuM0L8z7E2eon6/0jopsUUL52LgekmcKvslnPif9BmtxuAfRbnkBzs3Ro5TA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9P251MB0030 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-1.8 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,PDS_BTC_ID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] ntp: Version bump. 4.2.8p12 -> 4.2.8p15 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Almost 4 years worth of bugfixes. https://fossies.org/linux/ntp/ChangeLog Fixes CVE-2020-15025, CVE-2020-13817, CVE-2020-11868, CVE-2019-11331 and CVE-2019-8936 * Drop old patchset, it was fixed in p14. * Add new patch to circumvent issues with glibc-2.34+. * License file hash changed. Copyright year, whitespace, contributors. Signed-off-by: Christian Melki --- .../0001-make-the-build-reproducible.patch | 26 ----------------- patches/ntp-4.2.8p12/series | 4 --- ...o-not-use-PTHREAD_STACK_MIN-on-glibc.patch | 29 +++++++++++++++++++ patches/ntp-4.2.8p15/series | 4 +++ rules/ntp.make | 6 ++-- 5 files changed, 36 insertions(+), 33 deletions(-) delete mode 100644 patches/ntp-4.2.8p12/0001-make-the-build-reproducible.patch delete mode 100644 patches/ntp-4.2.8p12/series create mode 100644 patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch create mode 100644 patches/ntp-4.2.8p15/series diff --git a/patches/ntp-4.2.8p12/0001-make-the-build-reproducible.patch b/patches/ntp-4.2.8p12/0001-make-the-build-reproducible.patch deleted file mode 100644 index 5c70b10a2..000000000 --- a/patches/ntp-4.2.8p12/0001-make-the-build-reproducible.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Michael Olbrich -Date: Tue, 23 Oct 2018 00:21:54 +0200 -Subject: [PATCH] make the build reproducible - -Don't include the current date / time into the build. - -Original patch from Debian. - -Signed-off-by: Michael Olbrich ---- - scripts/build/mkver.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/scripts/build/mkver.in b/scripts/build/mkver.in -index 3aef1c816a7f..badd2cda8c1f 100644 ---- a/scripts/build/mkver.in -+++ b/scripts/build/mkver.in -@@ -15,8 +15,6 @@ case "@VER_SUFFIX@" in - *) ConfStr="${ConfStr}-@VER_SUFFIX@" ;; - esac - --ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`" -- - if [ ! -f .version ]; then - echo 0 > .version - fi diff --git a/patches/ntp-4.2.8p12/series b/patches/ntp-4.2.8p12/series deleted file mode 100644 index 6b9bdfd27..000000000 --- a/patches/ntp-4.2.8p12/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-make-the-build-reproducible.patch -# a698708e9f96ed91827a81d376db1955 - git-ptx-patches magic diff --git a/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch b/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch new file mode 100644 index 000000000..017b4d41f --- /dev/null +++ b/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch @@ -0,0 +1,29 @@ +From: Khem Raj +Date: Sat, 31 Jul 2021 10:51:41 -0700 +Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc + +In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which +could mean different stack sizes at runtime on different architectures +and it also causes compile failure. Default glibc thread stack size +or 64Kb set by ntp should be good in glibc these days. + +Signed-off-by: Khem Raj +[Copied from https://github.com/openembedded/meta-openembedded/blob/master/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch] +Signed-off-by: Alexey Brodkin +--- + libntp/work_thread.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libntp/work_thread.c b/libntp/work_thread.c +index 03a5647bea36..3ddd751557e0 100644 +--- a/libntp/work_thread.c ++++ b/libntp/work_thread.c +@@ -41,7 +41,7 @@ + #ifndef THREAD_MINSTACKSIZE + # define THREAD_MINSTACKSIZE (64U * 1024) + #endif +-#ifndef __sun ++#if !defined(__sun) && !defined(__GLIBC__) + #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN + # undef THREAD_MINSTACKSIZE + # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN diff --git a/patches/ntp-4.2.8p15/series b/patches/ntp-4.2.8p15/series new file mode 100644 index 000000000..7a2de77a2 --- /dev/null +++ b/patches/ntp-4.2.8p15/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch +# e85ebd807ca50b5d07918a17d9595773 - git-ptx-patches magic diff --git a/rules/ntp.make b/rules/ntp.make index 168cfc2c4..9bbf9ef49 100644 --- a/rules/ntp.make +++ b/rules/ntp.make @@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_NTP) += ntp # # Paths and names # -NTP_VERSION := 4.2.8p12 -NTP_MD5 := 1522d66574bae14abb2622746dad2bdc +NTP_VERSION := 4.2.8p15 +NTP_MD5 := e1e6b23d2fc75cced41801dbcd6c2561 NTP := ntp-$(NTP_VERSION) NTP_SUFFIX := tar.gz NTP_URL := http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$(NTP).$(NTP_SUFFIX) NTP_SOURCE := $(SRCDIR)/$(NTP).$(NTP_SUFFIX) NTP_DIR := $(BUILDDIR)/$(NTP) NTP_LICENSE := ntp -NTP_LICENSE_FILES := file://COPYRIGHT;md5=e877a1d567a6a58996d2b66e3e387003 +NTP_LICENSE_FILES := file://COPYRIGHT;md5=4190b39435611e92a4da74e682623f19 # ---------------------------------------------------------------------------- # Prepare -- 2.32.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de