diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2021-04-21 09:58:50 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-23 10:12:10 +0100 |
commit | ce9e34177577d942c8f6c8cc792e02e43a015e6a (patch) | |
tree | 2952cf7657bd641bd9b491cbcbef4e455c53f8c4 /meta | |
parent | a8ae23104c0e3bc722db96f3e9e1c8ba5cd9363c (diff) | |
download | poky-ce9e34177577d942c8f6c8cc792e02e43a015e6a.tar.gz |
rpm: Upgrade to 4.16.1.3
Fixes some security vulnerabilities such as CVE-2021-3421 and
CVE-2021-20271.
Rebase 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
to avoid fuzz warnings.
(From OE-Core rev: 5dcd9c673502dab276b4fb4e6b4c7c1d1d9425ef)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_4.16.1.3.bb (renamed from meta/recipes-devtools/rpm/rpm_4.16.1.2.bb) | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch index 38d755205c..d8fcc16729 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9bbe3f8564705aafcdcc5f2f033f9241a97f47c6 Mon Sep 17 00:00:00 2001 | 1 | From 7b2dd83d8fcd06af8e583b53da79ed0033793d46 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 27 Feb 2017 09:43:30 +0200 | 3 | Date: Mon, 27 Feb 2017 09:43:30 +0200 |
4 | Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for | 4 | Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for |
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 3 files changed, 4 insertions(+), 4 deletions(-) | 14 | 3 files changed, 4 insertions(+), 4 deletions(-) |
15 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
17 | index 6c78568e4..76b1d40e4 100644 | 17 | index fe35a90fa..b2faec6f3 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -966,7 +966,7 @@ else | 20 | @@ -966,7 +966,7 @@ else |
@@ -40,7 +40,7 @@ index 35c8cf9df..9d8b2825c 100644 | |||
40 | %_infodir %{_datadir}/info | 40 | %_infodir %{_datadir}/info |
41 | %_mandir %{_datadir}/man | 41 | %_mandir %{_datadir}/man |
42 | diff --git a/rpm.am b/rpm.am | 42 | diff --git a/rpm.am b/rpm.am |
43 | index cd40a16be..e6941e09f 100644 | 43 | index 8e1dc2184..3d889ec86 100644 |
44 | --- a/rpm.am | 44 | --- a/rpm.am |
45 | +++ b/rpm.am | 45 | +++ b/rpm.am |
46 | @@ -1,10 +1,10 @@ | 46 | @@ -1,10 +1,10 @@ |
@@ -55,4 +55,4 @@ index cd40a16be..e6941e09f 100644 | |||
55 | +rpmconfigdir = $(libdir)/rpm | 55 | +rpmconfigdir = $(libdir)/rpm |
56 | 56 | ||
57 | # Libtool version (current-revision-age) for all our libraries | 57 | # Libtool version (current-revision-age) for all our libraries |
58 | rpm_version_info = 10:2:1 | 58 | rpm_version_info = 10:3:1 |
diff --git a/meta/recipes-devtools/rpm/rpm_4.16.1.2.bb b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb index d369c706a2..7c03b41fc8 100644 --- a/meta/recipes-devtools/rpm/rpm_4.16.1.2.bb +++ b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb | |||
@@ -43,7 +43,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \ | |||
43 | " | 43 | " |
44 | 44 | ||
45 | PE = "1" | 45 | PE = "1" |
46 | SRCREV = "278883a704ea36c97974d0f2d65d41abe78b0e2a" | 46 | SRCREV = "3659b8a04f5b8bacf6535e0124e7fe23f15286bd" |
47 | 47 | ||
48 | S = "${WORKDIR}/git" | 48 | S = "${WORKDIR}/git" |
49 | 49 | ||