From 7781cdca3163035f3f89df90605cde7c5b7cd3c5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 11 Feb 2024 22:47:51 +0100 Subject: [PATCH] package/shadow: drop BR2_PACKAGE_SHADOW_UTMPX utmpx is not available since bump to version 4.14.3 in commit 8a01774d9897310c00a0945865f5a6d5167dfca3 and https://github.com/shadow-maint/shadow/commit/3be7b9d75a6b73fe24394d7ac1e315d60d45b5ee: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-utmpx Fixes: 8a01774d9897310c00a0945865f5a6d5167dfca3 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 6 ++++++ package/shadow/Config.in | 5 ----- package/shadow/shadow.mk | 6 ------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index a869279af7..576148c4af 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_SHADOW_UTMPX + bool "shadow utmpx removed" + select BR2_LEGACY + help + UTMPX has been dropped by upstream. + config BR2_PACKAGE_TINYMEMBENCH bool "tinymembench removed" select BR2_LEGACY diff --git a/package/shadow/Config.in b/package/shadow/Config.in index e85e5884d2..230271af7d 100644 --- a/package/shadow/Config.in +++ b/package/shadow/Config.in @@ -31,11 +31,6 @@ comment "account-tools-setuid needs a toolchain w/ dynamic library, wchar, local depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -config BR2_PACKAGE_SHADOW_UTMPX - bool "utmpx" - help - Enable loggin in utmpx / wtmpx. - config BR2_PACKAGE_SHADOW_SUBORDINATE_IDS bool "subordinate-ids" help diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 03eb16a3f4..1e7ada6148 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -43,12 +43,6 @@ else SHADOW_CONF_OPTS += --disable-account-tools-setuid endif -ifeq ($(BR2_PACKAGE_SHADOW_UTMPX),y) -SHADOW_CONF_OPTS += --enable-utmpx -else -SHADOW_CONF_OPTS += --disable-utmpx -endif - ifeq ($(BR2_PACKAGE_SHADOW_SUBORDINATE_IDS),y) SHADOW_CONF_OPTS += --enable-subordinate-ids define SHADOW_SUBORDINATE_IDS_PERMISSIONS