summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/libxcrypt/libxcrypt/0001-disable-format-truncation-warning-with-gcc-8.patch36
-rw-r--r--meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb (renamed from meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb)3
2 files changed, 1 insertions, 38 deletions
diff --git a/meta/recipes-core/libxcrypt/libxcrypt/0001-disable-format-truncation-warning-with-gcc-8.patch b/meta/recipes-core/libxcrypt/libxcrypt/0001-disable-format-truncation-warning-with-gcc-8.patch
deleted file mode 100644
index 654eae6c6a..0000000000
--- a/meta/recipes-core/libxcrypt/libxcrypt/0001-disable-format-truncation-warning-with-gcc-8.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From c8c5908611e44a649489e8d217528fedc4864e14 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 10 May 2018 13:32:20 -0700
4Subject: [PATCH] disable format-truncation warning with gcc-8
5
6Upstream-Status: Pending
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 crypt-sunmd5.c | 6 ++++++
11 1 file changed, 6 insertions(+)
12
13diff --git a/crypt-sunmd5.c b/crypt-sunmd5.c
14index 4c85b7f..3e838cd 100644
15--- a/crypt-sunmd5.c
16+++ b/crypt-sunmd5.c
17@@ -151,6 +151,11 @@ getrounds (const char *s)
18 return ((uint32_t)val);
19 }
20
21+#pragma GCC diagnostic push
22+#if defined(__GNUC__) && (__GNUC__ >= 8)
23+#pragma GCC diagnostic ignored "-Wformat-truncation"
24+#endif
25+
26 void
27 gensalt_sunmd5_rn (unsigned long count,
28 const uint8_t *rbytes, size_t nrbytes,
29@@ -189,6 +194,7 @@ gensalt_sunmd5_rn (unsigned long count,
30 "$" CRYPT_ALGNAME "," ROUNDS "%u$%s$",
31 (unsigned int)count, rndstr);
32 }
33+#pragma GCC diagnostic pop
34
35 void
36 crypt_sunmd5_rn (const char *phrase, const char *setting,
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb
index 8cc5edac49..6ed67a6761 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb
@@ -9,11 +9,10 @@ LIC_FILES_CHKSUM ?= "file://LICENSING;md5=d1cc18f512ded3bd6000f3729f31be08 \
9 9
10inherit autotools 10inherit autotools
11 11
12SRCREV ?= "215b32aa4e0b255c3356a96bd6d257661bad73ca" 12SRCREV ?= "089479bb24acd168613757a6f12d63caa95416b4"
13SRCBRANCH ?= "master" 13SRCBRANCH ?= "master"
14 14
15SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \ 15SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \
16 file://0001-disable-format-truncation-warning-with-gcc-8.patch \
17 " 16 "
18 17
19PROVIDES = "virtual/crypt" 18PROVIDES = "virtual/crypt"