[Buildroot] [PATCH v1 1/1] package/shadow: bump to version 4.14.3

* [Buildroot] [PATCH v1 1/1] package/shadow: bump to version 4.14.3
@ 2024-01-17 19:23 Raphael Pavlidis
  2024-02-05 21:24 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Raphael Pavlidis @ 2024-01-17 19:23 UTC (permalink / raw)
  To: buildroot; +Cc: Raphael Pavlidis

Also, the new version has an optional dependency on libbsd.

Signed-off-by: Raphael Pavlidis <raphael.pavlidis@gmail.com>
---
 .../shadow/0001-Fix-yescrypt-support.patch    | 38 -------------------
 package/shadow/shadow.hash                    |  5 ++-
 package/shadow/shadow.mk                      |  9 ++++-
 3 files changed, 11 insertions(+), 41 deletions(-)
 delete mode 100644 package/shadow/0001-Fix-yescrypt-support.patch

diff --git a/package/shadow/0001-Fix-yescrypt-support.patch b/package/shadow/0001-Fix-yescrypt-support.patch
deleted file mode 100644
index 19427676ca..0000000000
--- a/package/shadow/0001-Fix-yescrypt-support.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7a63017b3c873a59e3482322b7824160a8c8ca67 Mon Sep 17 00:00:00 2001
-11;rgb:f6f6/f5f5/f4f4From: Bernd Kuhls <bernd@kuhls.net>
-Date: Sun, 9 Jul 2023 10:55:03 +0200
-Subject: [PATCH] Fix yescrypt support
-
-Fixes build error:
-newusers.c: In function 'update_passwd':
-newusers.c:433:21: error: 'sflg' undeclared (first use in this function); did you mean 'rflg'?
-
-introduced by
-https://github.com/shadow-maint/shadow/commit/5cd04d03f94622c12220d4a6352824af081b8531
-which forgot to define sflg for these configure options:
-
---without-sha-crypt --without-bcrypt --with-yescrypt
-
-Upstream: https://github.com/shadow-maint/shadow/commit/29da702491eea314b915ea9c7a83c9af80cf5797
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- src/newusers.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/newusers.c b/src/newusers.c
-index 7cb8434b..08f79798 100644
---- a/src/newusers.c
-+++ b/src/newusers.c
-@@ -60,7 +60,7 @@ static bool rflg = false;	/* create a system account */
- #ifndef USE_PAM
- static /*@null@*//*@observer@*/char *crypt_method = NULL;
- #define cflg (NULL != crypt_method)
--#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT)
-+#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT)
- static bool sflg = false;
- #endif
- #ifdef USE_SHA_CRYPT
---
-2.39.2
-
diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash
index 2e5c4a8168..4689a994de 100644
--- a/package/shadow/shadow.hash
+++ b/package/shadow/shadow.hash
@@ -1,3 +1,4 @@
-# Locally computed
-sha256  9afe245d79a2e7caac5f1ed62519b17416b057ec89df316df1c3935502f9dd2c  shadow-4.13.tar.xz
+# Verified from https://github.com/shadow-maint/shadow/releases/download/4.14.3/shadow-4.14.3.tar.xz.asc
+# with key A9348594CE31283A826FBDD8D57633D441E25BB5
+sha256  6969279236fe3152768573a38c9f83cb9ca109851a5a990aec1fc672ac2cfcd2  shadow-4.14.3.tar.xz
 sha256  3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a  COPYING
diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk
index 4bc3cce037..03eb16a3f4 100644
--- a/package/shadow/shadow.mk
+++ b/package/shadow/shadow.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################

-SHADOW_VERSION = 4.13
+SHADOW_VERSION = 4.14.3
 SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION)
 SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz
 SHADOW_LICENSE = BSD-3-Clause
@@ -120,6 +120,13 @@ else
 SHADOW_CONF_OPTS += --without-yescrypt
 endif

+ifeq ($(BR2_PACKAGE_LIBBSD),y)
+SHADOW_CONF_OPTS += --with-libbsd
+SHADOW_DEPENDENCIES += libbsd
+else
+SHADOW_CONF_OPTS += --without-libbsd
+endif
+
 define SHADOW_PERMISSIONS
 	/usr/bin/chage f 4755 0 0 - - - - -
 	/usr/bin/chfn f 4755 0 0 - - - - -
--
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread