From b02ac5dd2dc27fe742cb7f20a12090eda3190c84 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 17 May 2018 09:11:34 -0700
Subject: libxcrypt: Upgrade to 4.0.1

Minor release primary fixes are
* get it building with gcc8
* Fixes for riscv64

drop local gcc8 support patch which is not needed now

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 ...able-format-truncation-warning-with-gcc-8.patch | 36 ----------------------
 meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb     | 33 --------------------
 meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb     | 32 +++++++++++++++++++
 3 files changed, 32 insertions(+), 69 deletions(-)
 delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt/0001-disable-format-truncation-warning-with-gcc-8.patch
 delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
 create mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb

(limited to 'meta/recipes-core')

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 @@
-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,
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
deleted file mode 100644
index 8cc5edac49..0000000000
--- a/meta/recipes-core/libxcrypt/libxcrypt_4.0.0.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "Extended cryptographic library (from glibc)"
-DESCRIPTION = "Forked code from glibc libary to extract only crypto part."
-HOMEPAGE = "https://github.com/besser82/libxcrypt"
-SECTION = "libs"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM ?= "file://LICENSING;md5=d1cc18f512ded3bd6000f3729f31be08 \
-      file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
-"
-
-inherit autotools
-
-SRCREV ?= "215b32aa4e0b255c3356a96bd6d257661bad73ca"
-SRCBRANCH ?= "master"
-
-SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \
-           file://0001-disable-format-truncation-warning-with-gcc-8.patch \
-           "
-
-PROVIDES = "virtual/crypt"
-
-FILES_${PN} = "${libdir}/libcrypt*.so.* ${libdir}/libcrypt-*.so ${libdir}/libowcrypt*.so.* ${libdir}/libowcrypt-*.so"
-
-S = "${WORKDIR}/git"
-
-BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE} -std=gnu99"
-TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
-
-python () {
-    if not bb.data.inherits_class('nativesdk', d):
-        raise bb.parse.SkipRecipe("Recipe only applies in nativesdk case for now")
-}
-
-BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb
new file mode 100644
index 0000000000..6ed67a6761
--- /dev/null
+++ b/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb
@@ -0,0 +1,32 @@
+SUMMARY = "Extended cryptographic library (from glibc)"
+DESCRIPTION = "Forked code from glibc libary to extract only crypto part."
+HOMEPAGE = "https://github.com/besser82/libxcrypt"
+SECTION = "libs"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM ?= "file://LICENSING;md5=d1cc18f512ded3bd6000f3729f31be08 \
+      file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit autotools
+
+SRCREV ?= "089479bb24acd168613757a6f12d63caa95416b4"
+SRCBRANCH ?= "master"
+
+SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \
+           "
+
+PROVIDES = "virtual/crypt"
+
+FILES_${PN} = "${libdir}/libcrypt*.so.* ${libdir}/libcrypt-*.so ${libdir}/libowcrypt*.so.* ${libdir}/libowcrypt-*.so"
+
+S = "${WORKDIR}/git"
+
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE} -std=gnu99"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
+
+python () {
+    if not bb.data.inherits_class('nativesdk', d):
+        raise bb.parse.SkipRecipe("Recipe only applies in nativesdk case for now")
+}
+
+BBCLASSEXTEND = "nativesdk"
-- 
cgit 1.2.3-korg