On Thu, 27 Jan 2022 14:39:56 -0500
Robbie Harwood <rharw...@redhat.com> wrote:
> Changes in this version:
> - Make the version of bootstrap match what it's supposed to
> - Restore fix-width.patch at dkiper's request
>
> Be well,
> --Robbie
I presume this has been build tested, right?
I'm getting the following compiler error with gcc 10.1.0:
In file included from
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/disk /luks2.c:30:
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/disk/luks2.c: In
function ‘luks2_verify_key’:
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/disk/luks2.c:398:75:
error: pointer targets in passing argument 5 of ‘base64_decode_ctx’
differ in signedness [-Werror=pointer-sign] 398 | if (!base64_decode
(d->digest, grub_strlen (d->digest), (char *)digest, &digestlen)) |
^~~~~~~~~~
|
| |
grub_size_t * {aka long unsigned int *}
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/base64.h:59:50:
note: in definition of macro ‘base64_decode’ 59 |
base64_decode_ctx (NULL, in, inlen, out, outlen) |
^~~~~~
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/base64.h:52:59:
note: expected ‘idx_t *’ {aka ‘long int *’} but argument is of type
‘grub_size_t *’ {aka ‘long unsigned int *’}
52 | char *restrict out, idx_t
*outlen); |
~~~~~~~^~~~~~
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/disk/luks2.c:400:69:
error: pointer targets in passing argument 5 of ‘base64_decode_ctx’
differ in signedness [-Werror=pointer-sign] 400 | if (!base64_decode
(d->salt, grub_strlen (d->salt), (char *)salt, &saltlen)) |
^~~~~~~~ |
| |
grub_size_t
* {aka long unsigned int *}
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/base64.h:59:50:
note: in definition of macro ‘base64_decode’ 59 |
base64_decode_ctx (NULL, in, inlen, out, outlen) |
^~~~~~
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/base64.h:52:59:
note: expected ‘idx_t *’ {aka ‘long int *’} but argument is of type
‘grub_size_t *’ {aka ‘long unsigned int *’} 52 |
char *restrict out, idx_t *outlen); |
~~~~~~~^~~~~~
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/disk/luks2.c: In
function ‘luks2_decrypt_key’:
home/g10/grub-tests-uml-update-gnulib/grub/grub-core/disk/luks2.c:439:22:
error: pointer targets in passing argument 5 of ‘base64_decode_ctx’
differ in signedness [-Werror=pointer-sign] 439 | (char *)salt,
&saltlen)) | ^~~~~~~~ | |
| grub_size_t * {aka long unsigned int *}
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/base64.h:59:50:
note: in definition of macro ‘base64_decode’ 59 |
base64_decode_ctx (NULL, in, inlen, out, outlen) |
^~~~~~
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/base64.h:52:59:
note: expected ‘idx_t *’ {aka ‘long int *’} but argument is of type
‘grub_size_t *’ {aka ‘long unsigned int *’} 52 |
char *restrict out, idx_t *outlen); |
~~~~~~~^~~~~~
cc1: all warnings being treated as errors
Should be an easy fix. What compiler version are you using?
Glenn
>
> Robbie Harwood (4):
> Use visual indentation in config.h.in
> Drop gnulib fix-base64.patch
> Drop gnulib no-abort.patch
> Update gnulib version and drop most gnulib patches
>
> bootstrap | 319 ++++++++++--------
> bootstrap.conf | 18 +-
> conf/Makefile.extra-dist | 8 -
> config.h.in | 78 +++--
> configure.ac | 2 +-
> grub-core/Makefile.core.def | 1 +
> grub-core/lib/gnulib-patches/fix-base64.patch | 21 --
> .../lib/gnulib-patches/fix-null-deref.patch | 13 -
> .../gnulib-patches/fix-null-state-deref.patch | 12 -
> .../fix-regcomp-uninit-token.patch | 15 -
> .../fix-regexec-null-deref.patch | 12 -
> .../gnulib-patches/fix-uninit-structure.patch | 11 -
> .../lib/gnulib-patches/fix-unused-value.patch | 14 -
> grub-core/lib/gnulib-patches/no-abort.patch | 26 --
> grub-core/lib/posix_wrap/sys/types.h | 7 +-
> grub-core/lib/xzembed/xz.h | 5 +-
> 16 files changed, 248 insertions(+), 314 deletions(-)
> delete mode 100644 grub-core/lib/gnulib-patches/fix-base64.patch
> delete mode 100644 grub-core/lib/gnulib-patches/fix-null-deref.patch
> delete mode 100644 grub-core/lib/gnulib-patches/fix-null-state-deref.patch
> delete mode 100644
> grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch
> delete mode 100644 grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch
> delete mode 100644 grub-core/lib/gnulib-patches/fix-uninit-structure.patch
> delete mode 100644 grub-core/lib/gnulib-patches/fix-unused-value.patch
> delete mode 100644 grub-core/lib/gnulib-patches/no-abort.patch
>
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
