Skip to content

Bump Thrift version from 0.13.0 to 0.14.1#9881

Merged
qiluo-msft merged 1 commit intosonic-net:masterfrom
msosyak:thrift_0_14_1
Feb 16, 2022
Merged

Bump Thrift version from 0.13.0 to 0.14.1#9881
qiluo-msft merged 1 commit intosonic-net:masterfrom
msosyak:thrift_0_14_1

Conversation

@msosyak
Copy link
Contributor

@msosyak msosyak commented Jan 28, 2022

Why I did it

To bump the Thrift version to 0.14.1

How I did it

  • rename src/thrfit_0_13_0 to src/thrift_2 to remove version number in the path. (src/thrift contains rules to build thrift 0.11.0 )
  • Add thrift sources as submodule as there are no prepared debian packages for version >0.13.0 on debian.org
  • Added patches with fixes for original thrift debian rules:(remove unneeded packages, fix multi job build)

How to verify it

BLDENV=buster make -f Makefile.work target/debs/buster/libthrift-dev_0.14.1_amd64.deb

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111

Description for the changelog

A picture of a cute animal (not mandatory but encouraged)

@msosyak
Copy link
Contributor Author

msosyak commented Feb 1, 2022

@richardyu-ms Please review.

richardyu-ms
richardyu-ms previously approved these changes Feb 9, 2022
richardyu-ms added a commit to richardyu-ms/sonic-buildimage that referenced this pull request Feb 9, 2022
Per change to upgrade the thrift to 014 at sonic-net#9881
Upgrade the reference in related code, change the dependent thrift version from 013 to 014
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LIBTHRIFT_0_13_0

It is used in platform/broadcom/libsaithrift-dev.mk:9. You need to change that file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, thanks.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for looking after it 👍

@qiluo-msft qiluo-msft merged commit 125fe99 into sonic-net:master Feb 16, 2022
RyoYang pushed a commit to RyoYang/sonic-buildimage that referenced this pull request Mar 10, 2022
To bump the Thrift version to 0.14.1
- To avoid [CVE-2020-13949](https://nvd.nist.gov/vuln/detail/CVE-2020-13949)
- to fix some dependencies issues

- rename `src/thrfit_0_13_0` to `src/thrift_2` to remove version number in the path. (`src/thrift` contains rules to build thrift 0.11.0  )
- Add thrift sources as submodule as there are no prepared debian packages for version >0.13.0 on [debian.org](https://packages.debian.org/search?searchon=sourcenames&keywords=thrift)
- Added patches with fixes for original thrift debian rules:(remove unneeded packages, fix multi job build)
```
BLDENV=buster make -f Makefile.work target/debs/buster/libthrift-dev_0.14.1_amd64.deb
```
RyoYang pushed a commit to RyoYang/sonic-buildimage that referenced this pull request Apr 11, 2022
#### Why I did it
To bump the Thrift version to 0.14.1 
- To avoid [CVE-2020-13949](https://nvd.nist.gov/vuln/detail/CVE-2020-13949) 
- to fix some dependencies issues

#### How I did it
- rename `src/thrfit_0_13_0` to `src/thrift_2` to remove version number in the path. (`src/thrift` contains rules to build thrift 0.11.0  )
- Add thrift sources as submodule as there are no prepared debian packages for version >0.13.0 on [debian.org](https://packages.debian.org/search?searchon=sourcenames&keywords=thrift)
- Added patches with fixes for original thrift debian rules:(remove unneeded packages, fix multi job build)
#### How to verify it
```
BLDENV=buster make -f Makefile.work target/debs/buster/libthrift-dev_0.14.1_amd64.deb
```
RyoYang added a commit that referenced this pull request Apr 12, 2022
)

* Bump Thrift version from 0.13.0 to 0.14.1 (#9881)

#### Why I did it
To bump the Thrift version to 0.14.1 
- To avoid [CVE-2020-13949](https://nvd.nist.gov/vuln/detail/CVE-2020-13949) 
- to fix some dependencies issues

#### How I did it
- rename `src/thrfit_0_13_0` to `src/thrift_2` to remove version number in the path. (`src/thrift` contains rules to build thrift 0.11.0  )
- Add thrift sources as submodule as there are no prepared debian packages for version >0.13.0 on [debian.org](https://packages.debian.org/search?searchon=sourcenames&keywords=thrift)
- Added patches with fixes for original thrift debian rules:(remove unneeded packages, fix multi job build)
#### How to verify it
```
BLDENV=buster make -f Makefile.work target/debs/buster/libthrift-dev_0.14.1_amd64.deb
```

* Correct thrift 0141 typo fix (#10199)

Correct libsaithrift dependency package name from
LIBTHRIFT_DEV_0_14_1 THRIFT_COMPILER_0_14_1 to
LIBTHRIFT_0_14_1_DEV THRIFT_0_14_1_COMPILER

How I did it
How to verify it
Test Done:

make BLDENV=buster SAITHRIFT_V2=y -f Makefile.work target/debs/buster/saiserverv2_0.9.4_amd64.deb

Co-authored-by: Myron Sosyak <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants