From: Rosen Penev <rosenp@gmail.com>
Date: Tue, 16 Jun 2020 22:23:17 +0000 (-0700)
Subject: shadow: don't compile bcrypt for unsupported platforms
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4e8b1887600ac3431957c98071a863dfc14684e7;p=feed%2Fpackages.git

shadow: don't compile bcrypt for unsupported platforms

If musl has no bcrypt:

passwd: failed to crypt password with salt '$2a$13$w8EJ0Yfz5bGsG4U/0m7bk/': Function not implemented
The password for root is unchanged.

glibc output as it has no bcrypt:

passwd: failed to crypt password with salt '$2a$13$xbpmAYmq6Q/rZN5jOlNxJZ': Invalid argument
The password for root is unchanged.

--without-bcrypt output:

Invalid ENCRYPT_METHOD value: 'BCRYPT'.
Defaulting to DES.
passwd: password changed.

The solution was tested on glibc despite using a musl specific variable
Still works.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/utils/shadow/Makefile b/utils/shadow/Makefile
index 52fbf59bf5..05ae5ee00d 100644
--- a/utils/shadow/Makefile
+++ b/utils/shadow/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shadow
 PKG_VERSION:=4.8.1
-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)
@@ -41,7 +41,7 @@ CONFIGURE_ARGS += \
 	--without-attr \
 	--without-tcb \
 	--without-nscd \
-	--with-bcrypt
+	--with$(if $(CONFIG_MUSL_DISABLE_CRYPT_SIZE_HACK),,out)-bcrypt
 
 CONFIGURE_VARS += \
 	ac_cv_func_ruserok=no