diff mbox series

[1/1] package/shadow: Fix yescrypt-only build

Message ID 20230709091622.1022345-1-bernd@kuhls.net
State Accepted
Headers show
Series [1/1] package/shadow: Fix yescrypt-only build | expand

Commit Message

Bernd Kuhls July 9, 2023, 9:16 a.m. UTC 
Fixes:
http://autobuild.buildroot.net/results/afd/afd5d59f94986593cd697148f4cce2bf70e4d81b/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 .../shadow/0001-Fix-yescrypt-support.patch    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 package/shadow/0001-Fix-yescrypt-support.patch

Comments

Raphael Pavlidis July 11, 2023, 7:18 p.m. UTC | #1 
Hi Bernd,
I created a similar patch, but did not try to make it upstream.

https://patchwork.ozlabs.org/project/buildroot/patch/20230325175815.24876-1-raphael.pavlidis@gmail.com/

On my side, it looks good. Unfortunately, I do not have permission to 
merge it ;).

Thanks,
Raphael Pavlidis

On 09.07.23 11:16, Bernd Kuhls wrote:
> Fixes:
> http://autobuild.buildroot.net/results/afd/afd5d59f94986593cd697148f4cce2bf70e4d81b/
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>   .../shadow/0001-Fix-yescrypt-support.patch    | 38 +++++++++++++++++++
>   1 file changed, 38 insertions(+)
>   create 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
> new file mode 100644
> index 0000000000..e346a2ece0
> --- /dev/null
> +++ b/package/shadow/0001-Fix-yescrypt-support.patch
> @@ -0,0 +1,38 @@
> +From 7a63017b3c873a59e3482322b7824160a8c8ca67 Mon Sep 17 00:00:00 2001
> +From: 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/pull/748
> +
> +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
> +
Thomas Petazzoni July 29, 2023, 10:14 p.m. UTC | #2 
On Sun,  9 Jul 2023 11:16:22 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> Fixes:
> http://autobuild.buildroot.net/results/afd/afd5d59f94986593cd697148f4cce2bf70e4d81b/
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  .../shadow/0001-Fix-yescrypt-support.patch    | 38 +++++++++++++++++++
>  1 file changed, 38 insertions(+)
>  create mode 100644 package/shadow/0001-Fix-yescrypt-support.patch

Applied to master after updating the Upstream: tag to point to the
final upstream commit, as it has been merged. Thanks!

Thomas
Peter Korsgaard Aug. 30, 2023, 10:08 p.m. UTC | #3 
>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:

 > Fixes:
 > http://autobuild.buildroot.net/results/afd/afd5d59f94986593cd697148f4cce2bf70e4d81b/

 > Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Committed to 2023.05.x, thanks.
diff mbox series

Patch

diff --git a/package/shadow/0001-Fix-yescrypt-support.patch b/package/shadow/0001-Fix-yescrypt-support.patch
new file mode 100644
index 0000000000..e346a2ece0
--- /dev/null
+++ b/package/shadow/0001-Fix-yescrypt-support.patch
@@ -0,0 +1,38 @@ 
+From 7a63017b3c873a59e3482322b7824160a8c8ca67 Mon Sep 17 00:00:00 2001
+From: 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/pull/748
+
+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
+