From e12069d84d95443ffb1ee8742faf09c8cc719e3c Mon Sep 17 00:00:00 2001 From: Shuicheng Lin Date: Sun, 16 Dec 2018 22:34:24 +0800 Subject: [PATCH 1/2] rebase bash patch to CentOS 7.6 version Test: Pass build and multi node deploy test Depends-On: https://review.openstack.org/625452 Story: 2004522 Task: 28261 Change-Id: Ifcd37aa5d6487fa2d70fbb1d728abb3244baf7c2 Signed-off-by: Shuicheng Lin --- languages/bash/centos/build_srpm.data | 2 +- ...01-Update-package-versioning-for-TIS-format.patch | 6 ++---- .../centos/meta_patches/spec-TiS-bash-history.patch | 12 +++++------- languages/bash/centos/srpm_path | 2 +- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/languages/bash/centos/build_srpm.data b/languages/bash/centos/build_srpm.data index 641edbb..ef0524f 100644 --- a/languages/bash/centos/build_srpm.data +++ b/languages/bash/centos/build_srpm.data @@ -1,3 +1,3 @@ COPY_LIST="files/*" -TIS_PATCH_VER=3 +TIS_PATCH_VER=4 BUILD_IS_SLOW=3 diff --git a/languages/bash/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/languages/bash/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 45b3ed0..318b934 100644 --- a/languages/bash/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/languages/bash/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -3,8 +3,6 @@ From: Scott Little Date: Mon, 2 Oct 2017 16:05:36 -0400 Subject: [PATCH 2/3] WRS: 0001-Update-package-versioning-for-TIS-format.patch -Conflicts: - SPECS/bash.spec --- SPECS/bash.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -17,8 +15,8 @@ index 4f16c8c..d749f92 100644 Version: %{baseversion}%{patchleveltag} Name: bash Summary: The GNU Bourne Again shell --Release: 30%{?dist} -+Release: 30.el7%{?_tis_dist}.%{tis_patch_ver} +-Release: 31%{?dist} ++Release: 31.el7%{?_tis_dist}.%{tis_patch_ver} Group: System Environment/Shells License: GPLv3+ Url: http://www.gnu.org/software/bash diff --git a/languages/bash/centos/meta_patches/spec-TiS-bash-history.patch b/languages/bash/centos/meta_patches/spec-TiS-bash-history.patch index 376942d..725f0d3 100644 --- a/languages/bash/centos/meta_patches/spec-TiS-bash-history.patch +++ b/languages/bash/centos/meta_patches/spec-TiS-bash-history.patch @@ -3,8 +3,6 @@ From: Scott Little Date: Mon, 2 Oct 2017 16:05:36 -0400 Subject: [PATCH 1/3] WRS: spec-TiS-bash-history.patch -Conflicts: - SPECS/bash.spec --- SPECS/bash.spec | 8 ++++++++ 1 file changed, 8 insertions(+) @@ -13,9 +11,9 @@ diff --git a/SPECS/bash.spec b/SPECS/bash.spec index 4b2ec49..4f16c8c 100644 --- a/SPECS/bash.spec +++ b/SPECS/bash.spec -@@ -195,6 +195,10 @@ Patch152: bash-4.3-pipefd-leak.patch - #1487615 - bash fails to execute commands containing multibyte characters - Patch153: bash-4.3-wshouldquote.patch +@@ -198,6 +198,10 @@ Patch153: bash-4.3-wshouldquote.patch + #1495398 - Append '/' while tab completing directory names + Patch154: bash-4.3-dircomp-append-slash.patch +# Patches from WindRiver +Patch500: bash-history-syslog.patch @@ -24,9 +22,9 @@ index 4b2ec49..4f16c8c 100644 BuildRequires: texinfo bison BuildRequires: ncurses-devel BuildRequires: autoconf, gettext -@@ -327,6 +331,10 @@ This package contains documentation files for %{name}. - %patch152 -p1 -b .pipefd-leak +@@ -331,6 +335,10 @@ This package contains documentation files for %{name}. %patch153 -p1 -b .wshouldquote + %patch154 -p1 -b .append-slash +# WindRiver patches +%patch500 -p1 -b .history-syslog diff --git a/languages/bash/centos/srpm_path b/languages/bash/centos/srpm_path index f8127d6..0e82ece 100644 --- a/languages/bash/centos/srpm_path +++ b/languages/bash/centos/srpm_path @@ -1 +1 @@ -mirror:Source/bash-4.2.46-30.el7.src.rpm +mirror:Source/bash-4.2.46-31.el7.src.rpm From 6065156a0ac8c01c386d5793c17ff2195270ef65 Mon Sep 17 00:00:00 2001 From: Zhe Hu Date: Wed, 19 Dec 2018 10:23:32 +0800 Subject: [PATCH 2/2] rebase python patch to CentOS 7.6 version Test: Pass build and simplex deploy test Depends-On: https://review.openstack.org/626065 Story: 2004522 Task: 28396 Change-Id: I850651bb4c5ca2e60d4b63434d5f1cfe72d64069 Signed-off-by: Zhe Hu --- languages/python-2.7.5/centos/build_srpm.data | 2 +- .../0001-Update-package-versioning-for-TIS-format.patch | 6 +++--- .../meta_patches/0002-Disable-unittest-check-phase.patch | 2 +- .../centos/meta_patches/0003-Make-Python-Faster.patch | 6 +++--- .../0004-Turn-off-with_systemtap-to-disable-dtrace.patch | 2 +- languages/python-2.7.5/centos/srpm_path | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/languages/python-2.7.5/centos/build_srpm.data b/languages/python-2.7.5/centos/build_srpm.data index d3f64f3..0eac83b 100644 --- a/languages/python-2.7.5/centos/build_srpm.data +++ b/languages/python-2.7.5/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=3 +TIS_PATCH_VER=4 diff --git a/languages/python-2.7.5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/languages/python-2.7.5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index d30960d..c9d0cf3 100644 --- a/languages/python-2.7.5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/languages/python-2.7.5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -11,12 +11,12 @@ diff --git a/SPECS/python.spec b/SPECS/python.spec index 2af363e..c3706be 100644 --- a/SPECS/python.spec +++ b/SPECS/python.spec -@@ -106,7 +106,7 @@ Summary: An interpreted, interactive, object-oriented programming language +@@ -114,7 +114,7 @@ Summary: An interpreted, interactive, object-oriented programming language Name: %{python} # Remember to also rebase python-docs when changing this: Version: 2.7.5 --Release: 69%{?dist} -+Release: 69.el7_5%{?_tis_dist}.%{tis_patch_ver} +-Release: 76%{?dist} ++Release: 76.el7%{?_tis_dist}.%{tis_patch_ver} License: Python Group: Development/Languages Requires: %{python}-libs%{?_isa} = %{version}-%{release} diff --git a/languages/python-2.7.5/centos/meta_patches/0002-Disable-unittest-check-phase.patch b/languages/python-2.7.5/centos/meta_patches/0002-Disable-unittest-check-phase.patch index 04426ce..420c9ee 100644 --- a/languages/python-2.7.5/centos/meta_patches/0002-Disable-unittest-check-phase.patch +++ b/languages/python-2.7.5/centos/meta_patches/0002-Disable-unittest-check-phase.patch @@ -11,7 +11,7 @@ diff --git a/SPECS/python.spec b/SPECS/python.spec index a9fd32f..1030c57 100644 --- a/SPECS/python.spec +++ b/SPECS/python.spec -@@ -54,7 +54,7 @@ +@@ -62,7 +62,7 @@ %global with_gdbm 1 # Turn this to 0 to turn off the "check" phase: diff --git a/languages/python-2.7.5/centos/meta_patches/0003-Make-Python-Faster.patch b/languages/python-2.7.5/centos/meta_patches/0003-Make-Python-Faster.patch index f492037..612f5c9 100644 --- a/languages/python-2.7.5/centos/meta_patches/0003-Make-Python-Faster.patch +++ b/languages/python-2.7.5/centos/meta_patches/0003-Make-Python-Faster.patch @@ -11,7 +11,7 @@ diff --git a/SPECS/python.spec b/SPECS/python.spec index 94adb05..36289ea 100644 --- a/SPECS/python.spec +++ b/SPECS/python.spec -@@ -1259,6 +1259,8 @@ Patch305: 00305-CVE-2016-2183.patch +@@ -1301,6 +1301,8 @@ Patch306: 00306-fix-oserror-17-upon-semaphores-creation.patch # above: Patch5000: 05000-autotool-intermediates.patch @@ -20,7 +20,7 @@ index 94adb05..36289ea 100644 # ====================================================== # Additional metadata, and subpackages # ====================================================== -@@ -1670,6 +1672,7 @@ find -name "*~" |xargs rm -f +@@ -1719,6 +1721,7 @@ find -name "*~" |xargs rm -f %patch5000 -p0 -b .autotool-intermediates %endif @@ -28,7 +28,7 @@ index 94adb05..36289ea 100644 # ====================================================== # Configuring and building the code: -@@ -1800,7 +1803,7 @@ BuildPython debug \ +@@ -1849,7 +1852,7 @@ BuildPython debug \ BuildPython optimized \ python \ python%{pybasever} \ diff --git a/languages/python-2.7.5/centos/meta_patches/0004-Turn-off-with_systemtap-to-disable-dtrace.patch b/languages/python-2.7.5/centos/meta_patches/0004-Turn-off-with_systemtap-to-disable-dtrace.patch index 7c52f7e..38c739f 100644 --- a/languages/python-2.7.5/centos/meta_patches/0004-Turn-off-with_systemtap-to-disable-dtrace.patch +++ b/languages/python-2.7.5/centos/meta_patches/0004-Turn-off-with_systemtap-to-disable-dtrace.patch @@ -11,7 +11,7 @@ diff --git a/SPECS/python.spec b/SPECS/python.spec index 2441951..c2edce8 100644 --- a/SPECS/python.spec +++ b/SPECS/python.spec -@@ -42,7 +42,7 @@ +@@ -43,7 +43,7 @@ %global with_gdb_hooks 1 diff --git a/languages/python-2.7.5/centos/srpm_path b/languages/python-2.7.5/centos/srpm_path index d6afcb0..4f55551 100644 --- a/languages/python-2.7.5/centos/srpm_path +++ b/languages/python-2.7.5/centos/srpm_path @@ -1,2 +1,2 @@ -mirror:Source/python-2.7.5-69.el7_5.src.rpm +mirror:Source/python-2.7.5-76.el7.src.rpm