From 499f0e87f9b949bfe39ee0a74f991b5e81dd1b38 Mon Sep 17 00:00:00 2001
From: ShiXin <shixin21@huawei.com>
Date: Thu, 27 Jan 2022 15:13:34 +0800
Subject: [PATCH 1/2] libcap upgrade to 2.61

Signed-off-by: ShiXin <shixin21@huawei.com>
---
 .../libcap/{libcap_2.32.bb => libcap_2.61.bb} | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)
 rename meta-openeuler/recipes-core/libcap/{libcap_2.32.bb => libcap_2.61.bb} (72%)

diff --git a/meta-openeuler/recipes-core/libcap/libcap_2.32.bb b/meta-openeuler/recipes-core/libcap/libcap_2.61.bb
similarity index 72%
rename from meta-openeuler/recipes-core/libcap/libcap_2.32.bb
rename to meta-openeuler/recipes-core/libcap/libcap_2.61.bb
index 8cf19b0ff93..1f0868c853d 100644
--- a/meta-openeuler/recipes-core/libcap/libcap_2.32.bb
+++ b/meta-openeuler/recipes-core/libcap/libcap_2.61.bb
@@ -1,5 +1,3 @@
-#require libcap.inc
-#require ${OPEN_SRC_DIR}/${BPN}/series_yocto.conf
 SUMMARY = "Library for getting/setting POSIX.1e capabilities"
 HOMEPAGE = "http://sites.google.com/site/fullycapable/"
 
@@ -8,10 +6,9 @@ LICENSE = "BSD | GPLv2"
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI = "file://libcap/libcap-2.32.tar.gz \
-	   file://libcap/libcap-buildflags.patch \
-	   file://libcap/Avoid-segfaulting-when-the-kernel-is-ahead-of-libcap.patch \
-	  "
+SRC_URI = "file://libcap/${BP}.tar.gz \
+           file://libcap/libcap-buildflags.patch \
+"
 
 S = "${WORKDIR}/${BPN}-${PV}"
 
@@ -20,15 +17,6 @@ DEPENDS = "hostperl-runtime-native gperf-native"
 
 inherit lib_package
 
-# do NOT pass target cflags to host compilations
-#
-do_configure() {
-        # libcap uses := for compilers, fortunately, it gives us a hint
-        # on what should be replaced with ?=
-        sed -e 's,:=,?=,g' -i Make.Rules
-        sed -e 's,^BUILD_CFLAGS ?= $(.*CFLAGS),BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
-}
-
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
 PACKAGECONFIG_class-native ??= ""
 
@@ -50,7 +38,14 @@ INSANE_SKIP += "installed-vs-shipped"
 CFLAGS += "-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 
 do_compile() {
-        oe_runmake ${PACKAGECONFIG_CONFARGS}
+        unset CFLAGS BUILD_CFLAGS
+        oe_runmake ${PACKAGECONFIG_CONFARGS} \
+                AR="${AR}" \
+                CC="${CC}" \
+                RANLIB="${RANLIB}" \
+                OBJCOPY="${OBJCOPY}" \
+                COPTS="${CFLAGS}" \
+                BUILD_COPTS="${BUILD_CFLAGS}" 
 }
 
 do_install() {
@@ -77,7 +72,7 @@ do_install_append() {
 #FILES_${PN}-dev += "${base_libdir}/*.so"
 
 # pam files
-FILES_${PN} += "/lib/security/*.so"
+FILES_${PN} += "${base_libdir}/security/*.so"
 
 BBCLASSEXTEND = "native nativesdk"
 
-- 
Gitee


From c5017b7c448814deaaaed0fd6a91c9371b7fb917 Mon Sep 17 00:00:00 2001
From: ShiXin <shixin21@huawei.com>
Date: Thu, 27 Jan 2022 15:14:49 +0800
Subject: [PATCH 2/2] bash upgrade to 5.1.8

Signed-off-by: ShiXin <shixin21@huawei.com>
---
 meta-openeuler/recipes-labtools/bash/bash.inc |  1 -
 .../recipes-labtools/bash/bash_5.1.8.bb       | 20 +++++++++++++++++++
 .../recipes-labtools/bash/bash_5.1.bb         | 11 ----------
 3 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 meta-openeuler/recipes-labtools/bash/bash_5.1.8.bb
 delete mode 100644 meta-openeuler/recipes-labtools/bash/bash_5.1.bb

diff --git a/meta-openeuler/recipes-labtools/bash/bash.inc b/meta-openeuler/recipes-labtools/bash/bash.inc
index c3f31483501..95625d9843c 100644
--- a/meta-openeuler/recipes-labtools/bash/bash.inc
+++ b/meta-openeuler/recipes-labtools/bash/bash.inc
@@ -4,7 +4,6 @@ SECTION = "base/shell"
 
 DEPENDS = "ncurses bison-native"
 
-#inherit autotools gettext update-alternatives ptest
 inherit autotools gettext
 
 EXTRA_OECONF = "--enable-job-control"
diff --git a/meta-openeuler/recipes-labtools/bash/bash_5.1.8.bb b/meta-openeuler/recipes-labtools/bash/bash_5.1.8.bb
new file mode 100644
index 00000000000..23a69ac5f91
--- /dev/null
+++ b/meta-openeuler/recipes-labtools/bash/bash_5.1.8.bb
@@ -0,0 +1,20 @@
+require bash.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI = "file://bash/${BP}.tar.gz \
+           file://bash/bash-2.05a-interpreter.patch \
+           file://bash/bash-2.05b-pgrp_sync.patch \
+           file://bash/bash-4.0-nobits.patch \
+           file://bash/bash-4.2-coverity.patch \
+           file://bash/bash-4.3-noecho.patch \
+           file://bash/bash-4.3-memleak-lc_all.patch \
+           file://bash/bugfix-Forbidden-non-root-user-to-clear-history.patch \
+           file://bash/enable-dot-logout-and-source-bashrc-through-ssh.patch \
+"
+
+# GPLv2+ (< 4.0), GPLv3+ (>= 4.0)
+LICENSE = "GPLv3+"
+
+
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta-openeuler/recipes-labtools/bash/bash_5.1.bb b/meta-openeuler/recipes-labtools/bash/bash_5.1.bb
deleted file mode 100644
index 5f67a448c72..00000000000
--- a/meta-openeuler/recipes-labtools/bash/bash_5.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require bash.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-SRC_URI = "file://bash/bash-5.1.tar.gz"
-
-# GPLv2+ (< 4.0), GPLv3+ (>= 4.0)
-LICENSE = "GPLv3+"
-
-
-BBCLASSEXTEND = "nativesdk"
-- 
Gitee