From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 02 Apr 2024 23:09:36 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rrlNw-004N9x-1K for lore@lore.pengutronix.de; Tue, 02 Apr 2024 23:09:36 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rrlNw-0003AT-5B; Tue, 02 Apr 2024 23:09:36 +0200 Received: from mail-am7eur03on2125.outbound.protection.outlook.com ([40.107.105.125] helo=EUR03-AM7-obe.outbound.protection.outlook.com) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rrlNn-0002rI-7N for ptxdist@pengutronix.de; Tue, 02 Apr 2024 23:09:27 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gqmLWnmTshqIjJkTDyByZbIhC2PVg6Ljk7htS55QT0bZf10fbKlDv1/sq+hfQ1yc7QZizk90ddOs/YBTasKiT+HbBA2l3UHmtp/0xkwL+dNVptEt/3vQvCYPkGKi1E/dhbyuNsnk/0ZEOUU6JJKBh26I3ryZgi3QsmRfL+JuYT6s4vE3dvuzaaIYhsQ2VtglN0a1fGTksw/znGYMQ6SrveMJ7vZiM2AwuMK3vkR8hvfrMi4V5f0Nj+0FzygMj07wAkBkjWq5hNFXuEF45+trCeh5FYHjhLKaUbnzTWI1tLdGYU70+8ql4X9lN4j+0FW27/DlcW16tKQs2TqzqY+esg== 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=NYdsGw01fgikqIdurbuq3XZnqzD/Ey/BN47r4uHk3pI=; b=WPg76+3wOxDMXzJ3FvqYQ6CAXQjs4u87O2ahg7XSU09MrztOv3qOh9vGy3RuJaCrK+nquTnOmOGAJ+LAaToAN31q1iclToX2PTdZ2BhuUsYyFrMl2945MCAvdaCyh42XH0mY0jR0oSMRd22zzojV1sRHPoyaw6ccdP8lW8+04+CUvM7hCewLfDStxBDHl8iF0/iY5erU+SdOJw3K2bhmUWnJLqtnMR2BzK8UsuC+E/BYwLE/R0TgmfU1HFluNyMYA4dyArRLwctLWt1f3MLC6dTkhaYJhLLGSo9dP9Qz40k3+SVzKBjlocANx/2C+jcMxZSJnNvoTtCSri9RfdcyaQ== 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=NYdsGw01fgikqIdurbuq3XZnqzD/Ey/BN47r4uHk3pI=; b=CLcoaUEzjYBveXy631ZVu06IXFWcTALHspPeKdiwxRt77aQS1P0Hiud8juLYlGZezJvskjJCx/NF/ARX4nbT8SuwsrjYzPmpun5WhM6UvsMYOuOHpz/sN7FXrKnJvJH9IWYa6fqrBBUZY/BVpx6+C5qhjhfGox88b8JaZ8nNODs= Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by AS4P251MB1015.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:58a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Tue, 2 Apr 2024 21:09:23 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::ba8c:3db:3a02:7ce4]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::ba8c:3db:3a02:7ce4%6]) with mapi id 15.20.7409.042; Tue, 2 Apr 2024 21:09:23 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Tue, 2 Apr 2024 23:09:16 +0200 Message-Id: <20240402210917.144670-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: GVX0EPF0000FA80.SWEP280.PROD.OUTLOOK.COM (2603:10a6:144:1:0:4:0:12) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|AS4P251MB1015:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jheN1oFA7+95DUCaDihtaSidTkaxKljtU4B+iEJ4KbSynePoqyUP3nMTXX0h2w56HpB+VL4ZGHt2LgIlecSJtMI7XLEX8wC6OcsQjjWMVVcAEjPA5n6p0pNVWXmFF0+gdqyjTG9Lu1ByPYODXlUPPHmzRV+pqv8TjOwzomBa0NcJF8PWm/rNjFopj0DsMCw5IqCtxFBHxxuqfW95FFQkHj1qAmwgTFWr0aa3w71ExdNm0bGhFk2dGEqHtziFFW7s3MTAcNV27bAygIqEX63waL6RBUHTTlM7BdLzf8enlUXWBn3ExP1t5jtrlT9XfD1ia2TjwgivXUaHP07pgfXV2+7rdRx+t4I4rO8tvgEFNZaElmZ1qcmj56cZdtMvIlQm9O3vpq6YHMjbwR9Rk1EqFN4UeEZpTBOs+/WDGVN6nj1GdUqXCE8yJtAMAm/0ryDkSoyLnnqxpfvfNiluVMU1rZsJK8mqGSr4NhKw5LF8DbvYQfxDDd8wN1OEyZdwU/D8CoL8GgSwQ7GpFai+x/dUXM4dagwZ4WkrddLtvqhz4jNZqT9DpHmc1lAp3NF4KdzqgmuAWmnpfMjRUsb6GyLAab7qUopCBJAO8Q/L66U/xsbLEYm30v0tGkbBJg/tHBkpE196yBA3V6BMJdultXwKvdKT1y22tuwTz+qcW+Rnb8O9NqQZ7iQ0kT6edGHSinFVm+Sa9Qzbjq/1RfMBtqJdMg5zAIvB4+cBf4KewRbmwfo= 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:(13230031)(52116005)(376005)(1800799015)(366007)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NG9lRjI3L0haQ3hubW9RdkdUWWYzWm50L2E5R1N2dVFBL2c4eDZ0djVQQzl5?= =?utf-8?B?QzJ1bnlTZjBqMTMzSHNNOWdKQWl5cnVibWoraTFuT3BWdk1pb3BFMjd1L2xC?= =?utf-8?B?R3crZ2llcWhWMElPZERGaFJ4WjZKZmprNUZ1ZEMxMllDSXVnU0FJaVNpSGJX?= =?utf-8?B?cVpVNnBXVjFnY0tTMy9EWDA5U3h6UFNLVGUrMkF6c2ZNRHlWMDJpRFhYTXRB?= =?utf-8?B?RmtDTUtsaUs4S0xjTnpIbmpwemlUZldTay8xS2o1UE00UXBKK2RHT1ZmcG9B?= =?utf-8?B?S1ZsUnk1VVJXc2piZjVTRDUwNThRaGpYdVUxRDJkNC82bEdxaWdtTkFwTExW?= =?utf-8?B?V2wrYW5rQmdyUDIyY29kT2xnZlhQOHF2cmlTZmlnbDNUVUlUU2dIR0tncjhV?= =?utf-8?B?ZXdFQzJocjRQTDlXYWloR2MremhGMktkSTZQUk0rZy9nVHdQSGpIYlhsaDVr?= =?utf-8?B?dkxncEhaLzZkM0l3NGU2NTdEU2tpbjJLVVNIV05aY2ZCUVJRZFpzUkZIc1Ft?= =?utf-8?B?bGZabnIyblUxcXZkUlNSS2NZKzMwS3ZRVEVheGFJV0tYS00wNERFWC96ZEdT?= =?utf-8?B?Ukx3ZTdTMWM2WlB1TW1rMng1Q3VHN2NQdzZ0a0JBM1FadXY3MktoSkEwQTFL?= =?utf-8?B?RE9sdm1jdURUWHZoNzJrWDJqREhpQzhFWmJlN21HYnlkMk5paXdLVmhIZE55?= =?utf-8?B?bmVIRHhTcU5PSVEyZzQrMk5vaE4wWWdCK2tIQ1ptVWQxSWVjSXc4Mkxod0o0?= =?utf-8?B?ZEM4NXJwaFpKWW5YMjVQLzlDSnVaMUQvenVPb2FNTWJmMVg5Zi8rQm1xdXBZ?= =?utf-8?B?SVZjQkdnRFlZek9xNWpuQUFPTHRNSjFVeHpqWUI4Zm43QU1pSjQrbTZmM2hO?= =?utf-8?B?Ui8yK3pzWjRHV241SWErWWIrSVBobXFDekZpT1UzazY5NmZvbFp2aUN3d0lT?= =?utf-8?B?YnZKSDZoMm1XaXgxcUZ2dm1hczdsU1FLRHB5dkZPTjdaYXU0VW9FUjZiOVo5?= =?utf-8?B?SkdrQmIwYnFwaEhIcVRpT2F6VXFxbzBLTGU3WGpRZktGaDFQb2ZHVXF5TVFi?= =?utf-8?B?cWZ6cDFFSGlBTEdnL21Tem0vbXhZUFJ5RzRhK2krYkkxNmora3J3RVZYeTlv?= =?utf-8?B?NUZmK1hUWkxjWGVXV1dlaTEyd1d2dk1ja0RlaVJtUlo0SXdaKytkWDU3S0Zo?= =?utf-8?B?Q3c1a2JTZ3YyYXNaTnVxMk84RmZja0V0YUx4T1ltU2JiL3dZUnBVMEh0M1c3?= =?utf-8?B?alM2SnZESkJKcFpYbHFzclpHRm1oWTdhQzhwRHY3MmIvYnBmdWxzU1l4WGtO?= =?utf-8?B?bzk5NGRxcXJkaThabEY5WHMvS2N4TXZnZjg1SkRrdnlObGdhMHdUc1NYdkY5?= =?utf-8?B?WG5pMk92K1JSOFFzeERTZjZra3NsOWhjdFVFcmNxbW1pSjk4aytBWnkzREo5?= =?utf-8?B?U0x6bENDb01PQTZwNUpUeXArajhVOW9YdlRLV05IU2swQllQNk9RZ0tJUTZt?= =?utf-8?B?WFNhRlFiTCsvMnEzY1g2ays2NS9BUW1yREZCSDAxWmVMNy8xcWhmR0poOCs2?= =?utf-8?B?Z3c0Nll6T2ZWbGFhQk5wemZ3ZC83ZlNJVzV2Y1VlemdmTEtSNzgwdnNZY1R0?= =?utf-8?B?dC8yOE9pQkp6TzBDWjFOZXdxUWptcDgrQlRUd1B6N3hUTlR1Uk1hSFpDMElu?= =?utf-8?B?Z1FkVkNwRkw0SmZqaGgvWHpiVmY4VnBKSmlEWU8xWm9IYUVFK3FUY2xCajM1?= =?utf-8?B?Ryt5MW5yOFhCb1VxU2VtUm1XYXMySlpKL1lzWWFma05GcHdFaUlLM2w5bTFw?= =?utf-8?B?OVJDNk1MTGNRbHlmR3hzNjZzT1lNall0T0F4MnZzcE54R242OUs3MXk0S2lt?= =?utf-8?B?VVpZYWlSUS9WbTJUczFXcUFOeUZlYndwdlgvMnhieE43dDZxU0JzbHdjRHFO?= =?utf-8?B?c0NmN1pHOVlLc1ZidjBrU3MzRlE2K0NkbXlkc2RxY3o0VmRvYmlpSHZNZzVR?= =?utf-8?B?RU5waHFXMjBqNUY0M3pxL0sydjUzTmJhUEJMNDRyTGNpL0RlclI5MUNBQ3F4?= =?utf-8?B?b0ExZGFNR1Q1YlJxRStrdzI5R3RYSk1JdmFYekhWUU9tUE1CanpjQXloVnVr?= =?utf-8?B?Z1UzRGRsRXFlNlpqY09mKy9oMGVWLzdXL2hiaEN4VzJmUDVsOHh3YkdHS0xl?= =?utf-8?B?MkE9PQ==?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 142ec237-a62a-48c0-babb-08dc53592bef X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2024 21:09:23.5464 (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: Y+F/w8oxAcfqQLiis102ZicBF0oMqmu6P93q+bkzGOmI7Tfxx8EJmkevVEsep1Ob+7ISj82qVUIpRsxViMipx43KsyaB0S0C0UVEhnRkGL0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4P251MB1015 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2 1/2] util-linux: Version bump. 2.39.3 -> 2.40 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 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false https://github.com/util-linux/util-linux/blob/master/Documentation/releases/v2.40-ReleaseNotes * Fix missing files in the release. Add patches. New liblastlog2 stuff does seem to have various building issues etc, so disable them for now. * Old patches dropped, seem to be included in the new release. Signed-off-by: Christian Melki --- ...roperly-handle-gettext-non-existence.patch | 29 ----------- patches/util-linux-2.39.3/series | 4 -- ...-distribute-pam_lastlog2-meson.build.patch | 27 ++++++++++ ..._lastlog2-Add-missing-file-for-meson.patch | 52 +++++++++++++++++++ patches/util-linux-2.40/series | 5 ++ rules/util-linux.make | 6 ++- 6 files changed, 88 insertions(+), 35 deletions(-) delete mode 100644 patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch delete mode 100644 patches/util-linux-2.39.3/series create mode 100644 patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch create mode 100644 patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch create mode 100644 patches/util-linux-2.40/series diff --git a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch b/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch deleted file mode 100644 index 01d07d3f6..000000000 --- a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sat, 5 Aug 2023 08:57:28 +0200 -Subject: [PATCH] meson: properly handle gettext non-existence -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit e91a49c9747f ("meson: don't build po if no gettext") -tried to add the possibility to build util-linux without gettext. - -Unfortunately by default the call to find_program() would abort the -build if the program is not found. -Avoid aborting the build. - -Signed-off-by: Thomas Weißschuh ---- - po/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/po/meson.build b/po/meson.build -index c10deafd28a6..8adfa48d8327 100644 ---- a/po/meson.build -+++ b/po/meson.build -@@ -1,4 +1,4 @@ --if not find_program('gettext').found() -+if not find_program('gettext', required : false).found() - subdir_done() - endif - diff --git a/patches/util-linux-2.39.3/series b/patches/util-linux-2.39.3/series deleted file mode 100644 index ca4f8cdfd..000000000 --- a/patches/util-linux-2.39.3/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-meson-properly-handle-gettext-non-existence.patch -# 58d7fd4eca561971b85d47838b3463cf - git-ptx-patches magic diff --git a/patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch b/patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch new file mode 100644 index 000000000..a0b045def --- /dev/null +++ b/patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch @@ -0,0 +1,27 @@ +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Sat, 30 Mar 2024 17:46:19 +0100 +Subject: [PATCH] autotools: distribute pam_lastlog2/meson.build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Otherwise building the dist tarball via meson doesn't work. + +Fixes #2875 +Signed-off-by: Thomas Weißschuh +--- + pam_lastlog2/Makemodule.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pam_lastlog2/Makemodule.am b/pam_lastlog2/Makemodule.am +index f33c98ba5324..f17cc09f6a14 100644 +--- a/pam_lastlog2/Makemodule.am ++++ b/pam_lastlog2/Makemodule.am +@@ -3,6 +3,6 @@ if BUILD_PAM_LASTLOG2 + include pam_lastlog2/man/Makemodule.am + include pam_lastlog2/src/Makemodule.am + +-EXTRA_DIST += pam_lastlog2/COPYING ++EXTRA_DIST += pam_lastlog2/COPYING pam_lastlog2/meson.build + + endif # BUILD_PAM_LASTLOG2 diff --git a/patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch b/patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch new file mode 100644 index 000000000..04c2a9141 --- /dev/null +++ b/patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch @@ -0,0 +1,52 @@ +From: Christian Melki +Date: Mon, 1 Apr 2024 19:52:46 +0200 +Subject: [PATCH] pam_lastlog2: Add missing file for meson. + +Signed-off-by: Christian Melki +--- + pam_lastlog2/meson.build | 36 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + create mode 100644 pam_lastlog2/meson.build + +diff --git a/pam_lastlog2/meson.build b/pam_lastlog2/meson.build +new file mode 100644 +index 000000000000..12f3a6b211e6 +--- /dev/null ++++ b/pam_lastlog2/meson.build +@@ -0,0 +1,36 @@ ++build_pam_lastlog2 = not get_option('build-pam-lastlog2') \ ++ .require(build_liblastlog2) \ ++ .require(conf.get('HAVE_SECURITY_PAM_MODULES_H').to_string() == '1') \ ++ .disabled() ++summary('pam_lastlog2', build_pam_lastlog2 ? 'enabled' : 'disabled', section : 'components') ++ ++cc = meson.get_compiler('c') ++pkg = import('pkgconfig') ++lib_pam_lastlog2_sources = ''' ++ src/pam_lastlog2.c ++'''.split() ++ ++pamlibdir = get_option('pamlibdir') ++if pamlibdir == '' ++ pamlibdir = get_option('libdir') / 'security' ++endif ++ ++if build_pam_lastlog2 ++ pam_lastlog2_sym = 'src/pam_lastlog2.sym' ++ pam_lastlog2_sym_path = '@0@/@1@'.format(meson.current_source_dir(), pam_lastlog2_sym) ++ ++ libpam = cc.find_library('pam') ++ ++ pam_lastlog2 = shared_module( ++ 'pam_lastlog2', ++ lib_pam_lastlog2_sources, ++ name_prefix : '', ++ include_directories : [dir_include], ++ link_args : ['-Wl,--version-script=@0@'.format(pam_lastlog2_sym_path)], ++ link_depends : pam_lastlog2_sym, ++ dependencies : [libpam, lastlog2_dep], ++ install : build_liblastlog2, ++ install_dir : pamlibdir, ++ ) ++ manadocs += ['pam_lastlog2/man/pam_lastlog2.8.adoc'] ++endif diff --git a/patches/util-linux-2.40/series b/patches/util-linux-2.40/series new file mode 100644 index 000000000..0c822e6e1 --- /dev/null +++ b/patches/util-linux-2.40/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-autotools-distribute-pam_lastlog2-meson.build.patch +0002-pam_lastlog2-Add-missing-file-for-meson.patch +# e8b8a0248b920dcf5afe5dbe1b20ed8b - git-ptx-patches magic diff --git a/rules/util-linux.make b/rules/util-linux.make index 2a2215570..43ee2c331 100644 --- a/rules/util-linux.make +++ b/rules/util-linux.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX) += util-linux # # Paths and names # -UTIL_LINUX_VERSION := 2.39.3 -UTIL_LINUX_MD5 := f3591e6970c017bb4bcd24ae762a98f5 +UTIL_LINUX_VERSION := 2.40 +UTIL_LINUX_MD5 := 46d1423122d310dfd022c799e1e4e259 UTIL_LINUX := util-linux-$(UTIL_LINUX_VERSION) UTIL_LINUX_SUFFIX := tar.xz UTIL_LINUX_BASENAME := v$(if $(filter 2,$(basename $(UTIL_LINUX_VERSION))),$(UTIL_LINUX_VERSION),$(basename $(UTIL_LINUX_VERSION))) @@ -70,6 +70,7 @@ UTIL_LINUX_CONF_OPT := \ -Dbuild-last=disabled \ -Dbuild-libblkid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBBLKID)d \ -Dbuild-libfdisk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBFDISK)d \ + -Dbuild-liblastlog2=disabled \ -Dbuild-libmount=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBMOUNT)d \ -Dbuild-libsmartcols=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBSMARTCOLS)d \ -Dbuild-libuuid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBUUID)d \ @@ -88,6 +89,7 @@ UTIL_LINUX_CONF_OPT := \ -Dbuild-newgrp=disabled \ -Dbuild-nologin=disabled \ -Dbuild-nsenter=$(call ptx/endis, PTXCONF_UTIL_LINUX_NSENTER)d \ + -Dbuild-pam-lastlog2=disabled \ -Dbuild-partx=$(call ptx/endis, PTXCONF_UTIL_LINUX_PARTX_TOOLS)d \ -Dbuild-pg=disabled \ -Dbuild-pipesz=$(call ptx/endis, PTXCONF_UTIL_LINUX_PIPESZ)d \ -- 2.34.1