Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor changes #1295

Closed
wants to merge 163 commits into from
Closed

Minor changes #1295

wants to merge 163 commits into from

Conversation

slowy07
Copy link

@slowy07 slowy07 commented Aug 18, 2021

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/tools/cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge
Summary

fetch from 1..0 dev and create custom branch to fix typo spelling grammar, with reference from merriam webster

Change Log
  • Change
  • Change
  • Change
Does this affect the toolchain?

YES

Associated issues
Links to CVEs

MateuszMalisz and others added 30 commits August 20, 2020 07:22
@MateuszMalisz
Fix gpgme main and -devel shared object conflicts (#50) (#51)
089c065 
* Fix gpgme main and -devel shared object conflicts

* Bump version of gpgme.spec
@jslobodzian
Merge branch 'main' into 1.0
3e76453
@jslobodzian
Merge branch 'main' into 1.0
3c4ca3b
@jslobodzian
Merge branch 'main' into 1.0
af0d521
@jslobodzian
Merge branch 'main' into 1.0 to pick up kernel update
c6f82ff
@dmcilvaney @jslobodzian
Improve the PR template checklist (#54)
0198e16 
* Improve the PR template checklist

* Add package checkbox

* Add section for test methodology

* Add a checkbox for updating cgmanifest files.
@jslobodzian
Joslobo/update logos (#87)
69df700 
* Replace placeholder Mariner Logos and Splash Screen

* Updated spec file and signature
@christopherco
Update kernel hashes to latest 5.4.51 (#85)
f36356c 
* hyperv-daemons: Update source hash

* kernel: Update source hash

* kernel-hyperv: Update source hash

* kernel-headers: Update source hash

* Update manifests

* Update toolchain remote md5sum

* kernel-signed-aarch64: Bump release number

* kernel-signed-x64: Bump release number

* kernel: update config

* kernel-hyperv: Update config
@jslobodzian
Replace MS EULA with open source sample (#92)
d5daa61
@jperrin @jslobodzian
Update trademark section of the readme
0146aa2 
Signed-off-by: Jim Perrin <[email protected]>
@jslobodzian
Merge branch '1.0-dev' into 1.0
54fb6b4
@jslobodzian
Merge branch '1.0-dev' into 1.0
552fc02
@jslobodzian
Merge branch '1.0-dev' into 1.0
e626e78
@jslobodzian
Merge branch '1.0-dev' into 1.0
7031516
@jslobodzian
Merge branch '1.0-dev' into 1.0
e95dc98
@jslobodzian
Merge branch '1.0-dev' into 1.0
563639e
@christopherco @jslobodzian
Fix kernel aarch64 package build break due to missing CONFIG_IMA_KEXEC (
6e9a239 
#171)
@chsha @jslobodzian
Update README.md (#180)
78d83a1
@mrgirgin @jslobodzian
Fix CVE-2020-26159 in oniguruma (#211)
1deb334 
* Fix CVE-2020-26159

* Increment release, fix autosetup.
@jslobodzian
Merge branch '1.0-dev' into 1.0 for October Update
e9af376
@jslobodzian
fix missed merge file
e10f52e
@jslobodzian
Fixed bad file merge
08fe4cc
@jslobodzian
Fixed poorly merged files
5df20d4
@jslobodzian
Merge distroless container revert to 1.0 (#265)
fefbf5f 
* Revert "Implement "distroless" containers (#252)"

This reverts commit e41efdd.

* Revert "Implement "distroless" containers (#252)" (#264)

This reverts commit e41efdd.
@nicogbg @jslobodzian
Address source RPM publishing issue on packages.microsoft.com (#303)
7f2b151
@schmittjoseph @jslobodzian
Prevent AdditionalFiles from being modified during iteration (#297) (#…
3062c2e 
…298)
@jslobodzian
Corrected URL_LIST links to preview repo (#295)
a27ee36
@schmittjoseph
Properly update AdditionalFiles in isomaker (#309)
5bc8fa1 
Co-authored-by: Joe Schmitt <[email protected]>
@oliviacrain
Python 3: Upgrade to fix CVE-2019-20907, CVE-2020-26116, CVE-2019-18348…
d867ece 
…, CVE-2020-14422, Patch CVE-2020-27619 (#358)
@oliviacrain
Upgrade python-markupsafe and python-zope-interface for setuptools co…
9ec151a 
…mpatibility (#367)
jslobodzian and others added 19 commits July 25, 2021 20:12
@jslobodzian
Merge pull request #1188 from microsoft/joslobo/merge-from-1.0-dev-fo…
a6f8e0a 
…r-july-update

Joslobo/merge from 1.0 dev for july update
@oliviacrain
Add dependabot configuration file (#1197) (#1199)
74a19c4
@oliviacrain @mfrw
Upgrade python-twisted to 20.3.0 to fix CVE-2020-10108, CVE-2020-10109 (
7bb165d 
#1220) (#1225)

Co-authored-by: Muhammad Falak R Wani <[email protected]>

Co-authored-by: Muhammad Falak R Wani <[email protected]>
@christopherco
kernel: Add patch to revert a cdrom eject commit (#1232)
d876325 
Our validation found that cdrom eject is causing a udev event storm and
regressing many performance metrics. Issue isolated to a commit
introduced upstream and backported to stable kernel. Reverting this
commit to mitigate the issue. We will be working with LKML in the
meantime to fix the underlying issue.

Signed-off-by: Chris Co <[email protected]>
@nicogbg
glibc - fix CVE-2021-35942 (#1229) (#1234)
76dd41d 
* glibc - fix CVE-2021-35942

* glibc - fix CVE-2021-35942

Co-authored-by: nicolas guibourge <[email protected]>

Co-authored-by: nicolas guibourge <[email protected]>
@christopherco
kernel: Add patch to fix VDSO in HyperV (#1238)
2988884 
Our validation found that clock_gettime(CONFIG_REALTIME, &start) was
taking orders of magnitude longer to complete than before. This was due
to the following upstream commit e4ab4658f1cf which, while not
backported to the LTS stable trees, was backported into our specific
kernel source as part of our ARM64 support.

This change applies the upstream commit 3486d2c9be65 which fixes the
VDSO regression.

Signed-off-by: Chris Co <[email protected]>
@hbeberman
Update swig to 4.0.2 (#1239)
928b93d
@anphel31 @jslobodzian
Remove brp-strip-debug-symbols and brp-strip-unneeded (#1104)
8ba01a4 
* remove brp-strip-debug-symbols

* update manifests

* remove brp-strip-unneeded

* modify macros. remove symbols from ceph
@nicogbg @jslobodzian
libdb - no patch CVE-2017-3604 to CVE-2017-3617 and CVE-2020-2981 (#1235
a2ee4ad 
)

* libdb - no patch CVE-2017-3604 to CVE-2017-3617 and CVE-2020-2981

* libdb CVE nopatch

Co-authored-by: nicolas guibourge <[email protected]>
@nicogbg @jslobodzian
rubygem-addressable - Move to 2.8.0 to fix CVE-2021-3274 (#1243)
85cc9c1 
* rubygem-addressable - Move to 2.8.0 to fix CVE-2021-3274

* fix type in cgmanifest

Co-authored-by: nicolas guibourge <[email protected]>
@anphel31 @jslobodzian
Update python-lxml to fix CVEs (#1246)
7fb8b53 
* update python-lxml

* update changelog

* update cgmanifest.json
@nicogbg @jslobodzian
qt5-qtbase fix CVE-2015-9541, CVE-2020-0570 and CVE-2020-13962 (#1237)
9ae7263 
* qt5-qtbase fix CVE-2015-9541, CVE-2020-0570 and CVE-2020-13962

* qt5-qtbase fix CVE-2015-9541, CVE-2020-0570 and CVE-2020-13962

* fix cgmanifest copy/paste issue

Co-authored-by: nicolas guibourge <[email protected]>
@nicogbg @jslobodzian
python-psutil - Update to 5.6.7 to fix CVE-2019-18874 (#1242)
8198624 
* python-psutil - Update to 5.6.7 to fix CVE-2019-18874

* fix cgmanifest issue

Co-authored-by: nicolas guibourge <[email protected]>
@oliviacrain @jslobodzian
[ISO] Fix display update issues in ManualPartitionWidget (#1249)
948b95e 
* Refresh title when backing out of add partition page

* Fix display of incorrect disk's space remaining
@anphel31
fix qt5.pc (#1266)
de21751
@PawelWMS @jslobodzian
Fixing CVE 2021-37600 in util-linux (#1257)
439c8da
@PawelWMS @jslobodzian
Fixing CVE-2021-3682 in 'qemu-kvm'. (#1286)
ff70bd3
@slowy07
fix: typo spelling grammar
6390a19
@slowy07
fix: typo spelling grammar
f503c5a
@slowy07
Copy link
Author

slowy07 commented Aug 18, 2021 •
edited
Loading

mentioned open pull request #1292

@slowy07 slowy07 closed this Aug 18, 2021
@slowy07 slowy07 deleted the minor-changes branch August 18, 2021 13:14
@slowy07 slowy07 restored the minor-changes branch August 18, 2021 13:25
@slowy07 slowy07 reopened this Aug 18, 2021
slowy07
slowy07 commented Aug 18, 2021
View reviewed changes
Copy link
Author

@slowy07 slowy07 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

fix conflicts from branch 1.0-dev and merged into minor-changes

PawelWMS
PawelWMS requested changes Aug 18, 2021
View reviewed changes
Copy link
Contributor

@PawelWMS PawelWMS left a comment

Choose a reason for hiding this comment

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

Blocking until we get the branch gets cleaned-up (no commits from other authors).

@slowy07
Copy link
Author

slowy07 commented Aug 18, 2021

closed cause commit from other contributors

@slowy07 slowy07 closed this Aug 18, 2021
@slowy07 slowy07 deleted the minor-changes branch August 18, 2021 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PawelWMS PawelWMS PawelWMS requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.