| Message ID | 20230325175815.24876-1-raphael.pavlidis@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v1,1/1] package/shadow: only yescrypt build | expand |
On Sat, 25 Mar 2023 18:58:15 +0100 Raphael Pavlidis <raphael.pavlidis@gmail.com> wrote: > Add a patch to fix the build if only yescrypt is enabled. > > Fixes: > - http://autobuild.buildroot.net/results/df6a16a55bf02cf2d7377f9636913f0b3bca574f > - http://autobuild.buildroot.net/results/758d4fd297fbd77ef846d3a3d4c207021f866752 > Signed-off-by: Raphael Pavlidis <raphael.pavlidis@gmail.com> > --- > ...-sflg-for-USE_YESCRYPT-in-newusers.c.patch | 29 +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 package/shadow/0001-Define-sflg-for-USE_YESCRYPT-in-newusers.c.patch > > diff --git a/package/shadow/0001-Define-sflg-for-USE_YESCRYPT-in-newusers.c.patch b/package/shadow/0001-Define-sflg-for-USE_YESCRYPT-in-newusers.c.patch > new file mode 100644 > index 0000000000..6c2a15d898 > --- /dev/null > +++ b/package/shadow/0001-Define-sflg-for-USE_YESCRYPT-in-newusers.c.patch > @@ -0,0 +1,29 @@ > +From 8f7d5e8adae3aa16c0e3a4cb5db34d6764aa0495 Mon Sep 17 00:00:00 2001 > +From: Raphael Pavlidis <raphael.pavlidis@gmail.com> > +Date: Thu, 23 Mar 2023 19:16:12 +0100 > +Subject: [PATCH v1 1/1] Define sflg for USE_YESCRYPT in newusers.c > + > +If only yescrypt is used then the boolean sflg is not defined, but it is > +access. Therefore, it causes a build error. > + > +Signed-off-by: Raphael Pavlidis <raphael.pavlidis@gmail.com> Thanks for fixing this! Has this patch been submitted to the upstream shadow project? Thanks! Thomas
Hi Thomas, On 26.03.23 14:18, Thomas Petazzoni wrote: > On Sat, 25 Mar 2023 18:58:15 +0100 > Raphael Pavlidis <raphael.pavlidis@gmail.com> wrote: > [SNIP] > > Thanks for fixing this! Has this patch been submitted to the upstream > shadow project? > Not yet. > Thanks! > > Thomas
Hi Thomas, [SNIP] > >> >> Thanks for fixing this! Has this patch been submitted to the upstream >> shadow project? >> It seems that shadow is hosted on GitHub. Currently, I do not have a GitHub account and do not want one. Feel free (and everybody else) to take the patch and make a PR. [SNIP] Thanks, Raphael Pavlidis
Am Fri, 26 May 2023 21:16:11 +0200 schrieb Raphael Pavlidis: > It seems that shadow is hosted on GitHub. Currently, I do not have a > GitHub account and do not want one. Feel free (and everybody else) to > take the patch and make a PR. Hi Raphael, sorry, i did not see your patch when I created mine. Upstream in the meantime committed my patch https://github.com/shadow-maint/shadow/commit/ 29da702491eea314b915ea9c7a83c9af80cf5797 Regards, Bernd
On Sat, 25 Mar 2023 18:58:15 +0100 Raphael Pavlidis <raphael.pavlidis@gmail.com> wrote: > Add a patch to fix the build if only yescrypt is enabled. > > Fixes: > - http://autobuild.buildroot.net/results/df6a16a55bf02cf2d7377f9636913f0b3bca574f > - http://autobuild.buildroot.net/results/758d4fd297fbd77ef846d3a3d4c207021f866752 > Signed-off-by: Raphael Pavlidis <raphael.pavlidis@gmail.com> > --- > ...-sflg-for-USE_YESCRYPT-in-newusers.c.patch | 29 +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 package/shadow/0001-Define-sflg-for-USE_YESCRYPT-in-newusers.c.patch I have applied Bernd's patch instead, which has been accepted upstream. Thanks! Thomas
diff --git a/package/shadow/0001-Define-sflg-for-USE_YESCRYPT-in-newusers.c.patch b/package/shadow/0001-Define-sflg-for-USE_YESCRYPT-in-newusers.c.patch new file mode 100644 index 0000000000..6c2a15d898 --- /dev/null +++ b/package/shadow/0001-Define-sflg-for-USE_YESCRYPT-in-newusers.c.patch @@ -0,0 +1,29 @@ +From 8f7d5e8adae3aa16c0e3a4cb5db34d6764aa0495 Mon Sep 17 00:00:00 2001 +From: Raphael Pavlidis <raphael.pavlidis@gmail.com> +Date: Thu, 23 Mar 2023 19:16:12 +0100 +Subject: [PATCH v1 1/1] Define sflg for USE_YESCRYPT in newusers.c + +If only yescrypt is used then the boolean sflg is not defined, but it is +access. Therefore, it causes a build error. + +Signed-off-by: Raphael Pavlidis <raphael.pavlidis@gmail.com> +--- + src/newusers.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/newusers.c b/src/newusers.c +index dd6b4421..9c2a626a 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 +
Add a patch to fix the build if only yescrypt is enabled. Fixes: - http://autobuild.buildroot.net/results/df6a16a55bf02cf2d7377f9636913f0b3bca574f - http://autobuild.buildroot.net/results/758d4fd297fbd77ef846d3a3d4c207021f866752 Signed-off-by: Raphael Pavlidis <raphael.pavlidis@gmail.com> --- ...-sflg-for-USE_YESCRYPT-in-newusers.c.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/shadow/0001-Define-sflg-for-USE_YESCRYPT-in-newusers.c.patch