shadow: reintroduce newgidmap and newuidmap

The lxc-unprivileged package depends on both newgidmap and newuidmap
if users are installing and setting it up for the first time. dc52894
dropped both of the applets.

This change builds libusbid as a shared lib which builds a versioned
symbol which OpenWrt does not stage so build with --disable-shared
and --enable-static to avoid a failure.

Signed-off-by: John Audia <redacted>

diff --git a/utils/shadow/Makefile b/utils/shadow/Makefile
index d195be3c77038a4203ecc469ff6d7aa24c021a0f..b114a0fa8b9a547a8f827bd8428552c53aacb4d9 100644 (file)
--- a/utils/shadow/Makefile
+++ b/utils/shadow/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shadow
 PKG_VERSION:=4.19.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/shadow-maint/shadow/releases/download/$(PKG_VERSION)
@@ -30,7 +30,7 @@ include $(INCLUDE_DIR)/nls.mk
 SHADOW_APPLETS := \
        chage chfn chgpasswd chpasswd chsh expiry faillog gpasswd \
        groupadd groupdel groupmems groupmod grpck grpconv grpunconv \
-       login logoutd newgrp newusers nologin \
+       login logoutd newgrp newgidmap newuidmap newusers nologin \
        passwd pwck pwconv pwunconv su \
        useradd userdel usermod vipw
 
@@ -45,7 +45,9 @@ CONFIGURE_ARGS += \
        --without-sssd \
        --without-libbsd \
        --disable-logind \
-       --disable-subordinate-ids \
+       --enable-subordinate-ids \
+       --disable-shared \
+       --enable-static \
        --with-bcrypt
 
 CONFIGURE_VARS += \