libxcrypt: Fix build with gcc8

Reported-by: Martin Jansa <martin.jansa@gmail.com>
(From OE-Core rev: b4aadf55b9e0979108875778c05915f96e0770aa)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2018-05-10 23:52:48 -07:00
committed by Richard Purdie
parent 418b9d9ee7
commit 1eed078c4a
2 changed files with 39 additions and 1 deletions

View File

@@ -0,0 +1,36 @@
From c8c5908611e44a649489e8d217528fedc4864e14 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 10 May 2018 13:32:20 -0700
Subject: [PATCH] disable format-truncation warning with gcc-8
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
crypt-sunmd5.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/crypt-sunmd5.c b/crypt-sunmd5.c
index 4c85b7f..3e838cd 100644
--- a/crypt-sunmd5.c
+++ b/crypt-sunmd5.c
@@ -151,6 +151,11 @@ getrounds (const char *s)
return ((uint32_t)val);
}
+#pragma GCC diagnostic push
+#if defined(__GNUC__) && (__GNUC__ >= 8)
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
+
void
gensalt_sunmd5_rn (unsigned long count,
const uint8_t *rbytes, size_t nrbytes,
@@ -189,6 +194,7 @@ gensalt_sunmd5_rn (unsigned long count,
"$" CRYPT_ALGNAME "," ROUNDS "%u$%s$",
(unsigned int)count, rndstr);
}
+#pragma GCC diagnostic pop
void
crypt_sunmd5_rn (const char *phrase, const char *setting,

View File

@@ -12,7 +12,9 @@ inherit autotools
SRCREV ?= "215b32aa4e0b255c3356a96bd6d257661bad73ca"
SRCBRANCH ?= "master"
SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}"
SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \
file://0001-disable-format-truncation-warning-with-gcc-8.patch \
"
PROVIDES = "virtual/crypt"