xserver-xorg: 21.1.1 -> 21.1.3

Message ID 20220107151918.2061-1-kai.kang@windriver.com
State New
Headers show
Series xserver-xorg: 21.1.1 -> 21.1.3 | expand

Commit Message

Kai Jan. 7, 2022, 3:19 p.m. UTC
From: Kai Kang <kai.kang@windriver.com>

Upgrade xserver-xorg from 21.1.1 to 21.1.3. It fixes CVE-2021-4008,
CVE-2021-4009, CVE-2021-4010, CVE-2021-4011 in 21.1.2.

Adjust indent as well.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../{xserver-xorg_21.1.1.bb => xserver-xorg_21.1.3.bb}      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.1.bb => xserver-xorg_21.1.3.bb} (84%)

Comments

Richard Purdie Jan. 7, 2022, 11:20 p.m. UTC | #1
On Fri, 2022-01-07 at 23:19 +0800, kai wrote:
> From: Kai Kang <kai.kang@windriver.com>
> 
> Upgrade xserver-xorg from 21.1.1 to 21.1.3. It fixes CVE-2021-4008,
> CVE-2021-4009, CVE-2021-4010, CVE-2021-4011 in 21.1.2.
> 
> Adjust indent as well.
> 
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
>  .../{xserver-xorg_21.1.1.bb => xserver-xorg_21.1.3.bb}      | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.1.bb => xserver-xorg_21.1.3.bb} (84%)

I merged an upgrade to .2 so could you rebase please?

Thanks,

Richard
Kai Jan. 10, 2022, 1:55 a.m. UTC | #2
On 1/8/22 7:20 AM, Richard Purdie wrote:
> On Fri, 2022-01-07 at 23:19 +0800, kai wrote:
>> From: Kai Kang <kai.kang@windriver.com>
>>
>> Upgrade xserver-xorg from 21.1.1 to 21.1.3. It fixes CVE-2021-4008,
>> CVE-2021-4009, CVE-2021-4010, CVE-2021-4011 in 21.1.2.
>>
>> Adjust indent as well.
>>
>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> ---
>>   .../{xserver-xorg_21.1.1.bb => xserver-xorg_21.1.3.bb}      | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>   rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.1.bb => xserver-xorg_21.1.3.bb} (84%)
> I merged an upgrade to .2 so could you rebase please?

OK. Will do.

Regards,
Kai

>
> Thanks,
>
> Richard
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#160274): https://lists.openembedded.org/g/openembedded-core/message/160274
> Mute This Topic: https://lists.openembedded.org/mt/88262897/3616933
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [kai.kang@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb
similarity index 84%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb
index 196d1edff5..3e076ecca7 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb
@@ -1,9 +1,9 @@ 
 require xserver-xorg.inc
 
 SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
-           file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
-           "
-SRC_URI[sha256sum] = "782e7fef2ca0c7cbe60a937b8bf42dac69c904fb841950fd0363e1c2346ea755"
+            file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
+            "
+SRC_URI[sha256sum] = "61d6aad5b6b47a116b960bd7f0cba4ee7e6da95d6bb0b127bde75d7d1acdebe5"
 
 # These extensions are now integrated into the server, so declare the migration
 # path for in-place upgrades.