Граф коммитов

9 Коммитов

Автор SHA1 Сообщение Дата
Avram Lubkin c766bc96f5
raw toolchain: remove refs to sqlite CVE-2021-36690.patch (#3570) 2022-08-18 20:29:16 -07:00
Christopher Co b3242ae650
cpio: address CVE-2021-38185 (#3018)
* cpio: address CVE-2021-38185

Apply upstream fix and associated fixes for additional regressions found
upstream.

For more context, see mail thread:
https://lists.gnu.org/archive/html/bug-cpio/2021-08/msg00000.html

* manifests: update cpio release number

* toolchain: add cpio patch to raw toolchain build

* cpio: fix lint

Signed-off-by: Chris Co <chrco@microsoft.com>
2022-05-20 12:57:17 -07:00
Christopher Co 653bf0a45d
sqlite: Address CVE-2021-36690 (#2818)
* sqlite: Address CVE-2021-36690

Fix an issue with the SQLite Expert extension when a column
 has no collating sequence

Upstream patch: https://sqlite.org/src/info/b1e0c22ec981cf5f
Forum post: https://sqlite.org/forum/forumpost/78165fa250

This is a port of the upstream commit to the SQLite Expert extension
which addresses CVE-2021-36690.
We do not ship the extensions separately so instead we need to directly
patch the offending code which is found in shell.c.

* Update toolchain and pkggen manifest files

* toolchain: add CVE patch to sqlite build in toolchain

Signed-off-by: Chris Co <chrco@microsoft.com>
2022-04-22 13:12:59 -07:00
Andrew Phelps b328faf76b
Update m4 to 1.4.19 (#1758)
* update m4

* fix extension to m4-1.4.19.tar.gz
2021-12-13 18:45:15 -08:00
Andrew Phelps 9d85614fab
Remove openjdk8 and replace with openjdk11 (#1742) (#1756)
* update java specs to build with openjdk-11

* upgrade ant to 1.10.11 and fix pom issue

* fix jna. cleanup ant. update bazel

* fix bazel compilation with limits

* remove jdk8 depenencies

* bump javapackages-tools release

* remove jdk8 build scripts from toolchain

* remove jdk8 spec

* add centos8 openjdk11

* set JAVA_HOME in jna.spec

* switch to msopenjdk-11 BR (centos name). update cgmanifest

* fix arm64 jdk8 versions

* add jdk to pkggen_core_x86_64

* add binutils patch to fix nodejs issue

* use preview jdk11 rpms. cleanup

* license update

* feedback

* remove jdk sources from cgmanifest

* add jdk11 to cgmanifest

* remove freetype and fontconfig from toolchain

* add --noscripts to create_worker_chroot.sh

* move libxml2

* restore x.org packages in cgmanifest

* move jdk11 to pkggen_core and add exception to install only this package with --noscripts

* add msopenjdk-11 to update_manifests and list_toolchain_specs scripts

* fix check_manifests.sh for msopenjdk-11

* fix check_manifests.sh

* use --noscripts on jdk when populating sqlite db

* fix update_manifests jdk bug

* fix jdk11 alphabetic ordering in toolchain.txt

* skip jdk11 dependencies in rpmrepocloner.go

* Update toolkit/tools/internal/packagerepo/repocloner/rpmrepocloner/rpmrepocloner.go

Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>

* Update toolkit/tools/internal/packagerepo/repocloner/rpmrepocloner/rpmrepocloner.go

Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>

* pr feedback

* use == in check_manifests.sh

* fix arm64 srpmpacker.go issue

* remove java-headless dependency from ant and jna. set JAVA_HOME in bazel

* revert string comparison changes in create_worker_chroot.sh

* fix srpmpacker go test issue

* improve srpmpacker.go logging

Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>

Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>
2021-12-13 11:34:23 -08:00
Thomas Crain 8bdbfe3323
Add new patch files to toolkit gitignore (#1676) 2021-11-30 12:51:05 -08:00
Thomas Crain 2cb2e7b291
[dev] Define $RPM_LD_FLAGS environment variable during spec build phase in RPM (#1022)
* Add RPM_LD_FLAGS definition to RPM spec pre-build script

* Add new patch to toolkit gitignore

* Add new patch to clean-toolchain makefile target

* Fix where patch is brought into Dockerfile

* Fix patch loc part 2

* Update manifests

* Remove duplicate BRs from  spec
2021-06-07 15:09:00 -07:00
Andrew Phelps 498f926e43
merge 1.0 into dev (#299)
* Update trademark section of the readme

Signed-off-by: Jim Perrin <Jim.Perrin@microsoft.com>

* Update building.md (#104)

* add wants=sshd-keygen.service to sshd (#58)

* add wants=sshd-keygen.service to sshd

Signed-off-by: Jim Perrin <Jim.Perrin@microsoft.com>

* modify signatures.json and bump release for pr

Signed-off-by: Jim Perrin <Jim.Perrin@microsoft.com>

* Fix libffi normal package build (#116)

* Fix libffi normal package build

* Add comment explaining the purpose of the sed call

* Upgrade golang to 1.13.15 (#93)

* Adding a small build tip to the quick start instructions. (#123)

* Add cloud-init-vmware-guestinfo package (#124)

* Add cloud-init-vmware-guestinfo package

* Updating 'ca-certificates' nssckbi.h header and unifying changelog entries with package version (#125)

* Updating changelog to be consistent with package version.

* Fixing missed update to 'nssckbi.h'.

* Updating manifests.

* Updating signatures.

* Markdown lint-induced clean-up of doc files. (#122)

* Makrdownlint-induced clean-up.

* Removing redundant lines.

* Removing redundant lines 2.

* Add  IMA feature to the kernel, add config for it (#135)

* Add  IMA feature to the kernel, add config for it

- Add IMA measurement configs to the x86_64, and aarch64 kernel configs (IMA_APPRAISE currently disabled).
- Add KernelCommandLine config field to control IMA, and allow additional configs to be passed.

Signed-off-by: Daniel McIlvaney <damcilva@microsoft.com>
Co-authored-by: Christopher Co <christopher.co@microsoft.com>

* Update tpm2 tools to 4.2, tss to 2.4.0 (#134)

Signed-off-by: Daniel McIlvaney <damcilva@microsoft.com>

* Enable Mellanox kernel configs

* Update tpm2-abrmd to 2.3.3 (#144)

* Update tpm2-abrmd to 2.3.3

* Create quickstart.yml (#119)

This patch adds a GitHub Action to verify our Quickstart instructions

* Nopatch httpd CVE-1999-0236, CVE-1999-1412 (#148)

* Nopatch httpd CVE-1999-0236, CVE-1999-1412

Signed-off-by: Daniel McIlvaney <damcilva@microsoft.com>

* Nopatch groff CVE-2000-0803 (#149)

* Nopatch groff CVE-2000-0803

Signed-off-by: Daniel McIlvaney <damcilva@microsoft.com>

* Nopatch apparmor CVE-2016-1585 (#150)

* Nopatch apparmor CVE-2016-1585

Signed-off-by: Daniel McIlvaney <damcilva@microsoft.com>

* Nopatch qemu CVE-2016-7161 (#152)

* Nopatch qemu CVE-2016-7161

Signed-off-by: Daniel McIlvaney <damcilva@microsoft.com>

* Nopatch lua CVE-2020-15889 (#153)

* nopatch lua CVE-2020-15889

Signed-off-by: Daniel McIlvaney <damcilva@microsoft.com>

* Nopatch unzip CVE-2008-0888 (#154)

Signed-off-by: Daniel McIlvaney <damcilva@microsoft.com>

* full: Always install the default kernel (#132)

Currently, when installing CBL-Mariner via ISO, the ISO will
install the standard kernel package or the kernel-hyperv package
depending on if installing on HyperV VM or not.

The HyperV kernel is still under evaluation so use the standard kernel
package across the board.

* Support downloading preview SRPMs (#160)

Replace SRPM_URL* with SRPM_URL_LIST

* Patch CVE-2020-14342 in cifs-utils

* Replace mariner-repos's %post script as %posttrans

- After looking at here, it shows that %post script for a new version runs before the %preun script for an old version. Which means, after an upgrade, the keys would be removed by the older version: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#ordering

* Update pkggen_core_aarch64.txt

* Update pkggen_core_x86_64.txt

* Update toolchain_aarch64.txt

* Update toolchain_x86_64.txt

* Add a more verbose changelog

* Remove chrony-wait as a boot service dependency (#166)

* Remove chrony-wait as a boot service dependency

* Add cgmanifest entry for chrony

* Address changelog and prep section comments

* initramfs: Regenerate initrd using host-only mode on file-based trigger (#170)

* initramfs: Always use host-only mode

kdump currently uses the host system's initrd when enrolling a crash kernel
and initrd. There is a limitation where the kdump initrd must be generated
with dracut in "host-only" mode.

The -k option forces a host-only initrd build.
The -q option suppresses verbose output

If mkinitrd is called without <image> and <kernel-version> parameters, it will
default to calling dracut in "host-mode" mode on every kernel version it can
find in /boot.

If mkinitrd is called with <image> and <kernel-version> parameters, it will
default to calling dracut in "generic host" mode for rebuilding the specific
initrd. Therefore we need to make sure to add the -k option when invoking
mkinitrd with an explicit <image> and <kernel version>

* Reword comment block

* Fix kernel specs' %postun scripts (#164)

* Fix `kernel.spec`'s `%postun` script

* Fix `kernel-signed-aarch64`'s `%postun` script

* Fix kernel-signed-x64.spec's %postun script

* Fix kernel-hyperv.spec's %postun script

* Adding new 'preview' repository. (#146)

* Adding new 'preview' repository.

* Addressing comments.

* Fix kernel aarch64 package build break due to missing CONFIG_IMA_KEXEC (#171)

* Fix kernel aarch64 package build break due to missing CONFIG_IMA_KEXEC (#171)

* Update fontconfig to 2.13.91 (#175)

* Extending 'strongswan' test timeout. (#173)

* Fix CVE-2020-14342 patch to not depend on PATH

* installutils: Supply blank /etc/machine-id file (#147)

From https://www.freedesktop.org/software/systemd/man/machine-id.html:
For operating system images which are created once and used on multiple
machines, for example for containers or in the cloud, /etc/machine-id
should be an empty file in the generic file system image. An ID will be
generated during boot and saved to this file if possible.

* installutils: Remove root password expiry when no root user is specified in imageconfig file (#161)

* Add SELinux packages to Mariner. (#100)

* Add SELinux packages to Mariner.

This commit add the following packages to Mariner to provide basic
SELinux support:

- checkpolicy
- libsemanage
- mcstrans
- policycoreutils
- secilc
- selinux-policy
- setools

The selinux-policy provided here is a generic base policy, which is not
specifically tuned for Mariner, therefore only permissive mode support
is enabled in this commit.  (Although users could load a custom policy
to run in enforcing mode).  Future phases have been discussed to add
SELinux enforcing mode support.

This commit does not enable SELinux by default.  In order to enable
SELinux support, one must first install necessary packages (libselinux,
policycoreutils, secilc, selinux-policy), and then append "lsm=selinux
selinux=1" to the kernel command line.  This will trigger an initial
boot to relabel the system, at which point the system will reboot, and
boot into an SELinux enabled system.  SELinux state can be queried with
the "getenforce" command line tool.  If SELinux has not been enabled, it
will report "Disabled" (the default).  If SELinux support has been
enabled as described in this paragraph, it will report "permissive".

This commit also modifies the following packages to enabled SELinux
functionality in existing packages:

- coreutils
- cronie
- dbus
- openssh
- pam
- rpm
- shadow-utils
- systemd
- util-linux

This enables them to build with SELinux support so that when SELinux is
enabled, they have SELinux related functionality available.

Because coreutils is a basic package and requires building with
libselinux-devel present in order to enable key SELinux functionality,
several dependencies in other packages that rely on coreutils (namely
python2, python3 and systemd-bootstrap) had to be removed in order to
avoid circular dependencies.  There does not appear to be a functional
impact from this change based on my testing.

* Remove "::set-env" commands in GitHub Actions (#178)

* Adding a .nopatch for CVE-2007-0086. (#176)

* Updating cert bundle paths. (#181)

* Updating cert bundle paths.

* Updating cgmanifest.json.

* Adding the `gflags` and `rocksdb` packages. (#183)

* Adding the 'rocksdb' package.

* Adding the 'gflags' package.

* Add missing %libsepolver definition in secilc.spec (#192)

* Removing 'TERMINAL_ISO_INSTALLER' from the docs. (#189)

* Add architecture at the end of toolkit archive (#182)

- Also add `version.txt` file in the toolkit archive as an easy way to verify toolkit version.

* Adding a missing '%{?dist}' tag. (#195)

* enable fetching RPMs from pacakges.microsoft.com for Docker based build (#198)

* Update README.md (#180)

* Update README.md (#180)

* Build Break Fix:  Rollback selinux checkins.   (#204)

* Revert "Add missing %libsepolver definition in secilc.spec (#192)"

This reverts commit 9cff088bec.

* Revert "Add SELinux packages to Mariner. (#100)"

This reverts commit b2d918efac.

* Natively support pulling from the preview repo (#199)

* Fix CVE-2020-26159 in oniguruma (#211)

* Fix CVE-2020-26159

* Increment release, fix autosetup.

* Adding the 'syslog-ng' package. (#205)

* Adding the 'tinyxml2' package. (#206)

* Adding the 'toml11' package. (#207)

* Adding the 'tracelogging' and 'zipper' packages. (#208)

* Add mm-common and libxml++ packages (#215)

* Add liblogging package (#214)

* Add nlohmann-json package (#217)

* Add msgpack package (#216)

* Adding the 'span-lite' and 'telegraf' packages. (#220)

* Remove toolchain-local-wget-list after use (#212)

* Remove toolchain-local-wget-list after use

- toolchain-local-wget-list has been left at the end of a toolchain build. It shows up on `git status` whene toolchain is built locally.
- Another solution would be adding it to `.gitignore`.

* Add temporary toolchain build files to toolkit/.gitignore

* Remove implicit git repository dependency from toolkit (#197)

* Remove implicit git repository dependency

* Remove the new GIT_REV variable

* Add jsonbuilder package (#223)

* update libffi to use https source0 (#227)

* Update libestr (#213)

* Add babeltrace2 and lttng-consume packages (#226)

* Add pugixml package (#222)

* Disable debug package for nlohmann-json (#228)

* Add rapidjson package (#225)

* Upgrade ruby to 2.6.6 to resolve CVE-2019-16255, CVE-2019-16201, CVE-2020-10933, CVE-2020-5247, CVE-2019-15845, CVE-2019-16254 (#224)

* Upgrade ruby to 2.6.6 to resolve CVEs

* Update cgmanifest

* Nopatch qemu CVE-2015-7504 CVE-2017-5931 CVE-2017-14167 (#162)

* Fix CVE-2020-26159 in oniguruma (#211)

* Fix CVE-2020-26159

* Increment release, fix autosetup.

* Enable QAT kernel configs in CBL-Mariner

* Nopatch kernel CVE-2020-10757, CVE-2020-12653, CVE-2020-12657, CVE-2010-3865, CVE-2020-11668, CVE-2020-12654, CVE-2020-24394, CVE-2020-8428 (#193)

* Address CVE-2020-10757, CVE-2020-12653, CVE-2020-12657, CVE-2010-3865, CVE-2020-11668, CVE-2020-12654, CVE-2020-24394, CVE-2020-8428

* Adding the `bond`, `fluent-bit`, and `ivykis` packages. (#234)

* Joslobo/add azure storage (#232)

* Add azure-storage spec file to mariner-core

* Register with legal and update map file

* Fixed #source0 link

* Updated per code review comments

* Fixed URL to use https

* Initial spec lint action commit (#172) (#191)

* Initial spec-cleaner commit for CBL-Mariner

* Add cgmanifest.json file for GitHub workflows folder

* Set continue-on-error to true for a trial period

* patch openssh (#238)

* Update pull_request_template.md (#236)

* Fix check tests for git, make, krb5 and libcap-ng (#241)

* fix check tests

* update toolchain manifests

* fix blank spaces and tabs in make.spec

* Fix CVE-2019-12735 in vim (#230)

* Fix CVE-2019-12735 in vim

* Update the changelog to address only one CVE.

* Switching to correct source for the Microsoft bundle. (#244)

* Fix check tests for brotli, gzip and python-certifi (#245)

* fix check test for brotli, gzip, python-cerifi

* update manifest release version for gzip

* skip check for vim

* Patch unbound CVE-2020-12662 and CVE-2020-12663 (#246)

* Portablectl patches for to support --now --enable and --no-block flags (#139)

* Portablectl patches for to support --now --enable and --no-block flags

* Portablectl patches for to support --now --enable and --no-block flags

* Patch lua CVE-2019-6706, CVE-2020-15888, nopatch CVE-2020-24342 (#169)

* Patch lua CVE-2019-6706, CVE-2020-15888, CVE-2020-15945, nopatch CVE-2020-24342

Signed-off-by: Daniel McIlvaney <damcilva@microsoft.com>

* Roll back CVE-2020-15945, patch ineffective

Signed-off-by: Daniel McIlvaney <damcilva@microsoft.com>

* Nopatch ed CVE-2015-2987 (#209)

ed CVE-2015-2987 applies to a different program named ed.

* Patch gnutls CVE-2020-24659 (#247)

Upstream CVE discussion: https://gitlab.com/gnutls/gnutls/-/issues/1071

* update ant verision

* fix changelog comment

* update cgmanifest

* Nopatch sqlite CVE-2015-3717 (#254)

* Added omi package

* Adding the `ccache` and `clamav` packages. (#251)

* Generate ant signatures (#260)

* Add auoms package (#258)

* add auoms package

* add auoms original source url comments

* fix changelog history

* fix auoms signatures

* fix changelog

* use %license

* update licenses-map

* add omi to LICENSES-MAP

* merge latest LICENSES-MAP

* Implement "distroless" containers (#252)

* Create distroless container without bash and surplus dependencies
* Remove RPM database for distroless
* Add busybox and uclibc. Add distroless-packages-debug
* Update cgmanifest

Co-authored-by: Jon Slobodzian <joslobo@microsoft.com>
Co-authored-by: MateuszMalisz <mamalisz@microsoft.com>

* Updated mariner-release package version (#262)

* fix setup (#263)

* fix missed merge file

* Fixed bad file merge

* Fixed poorly merged files

* Merge distroless container revert to 1.0 (#265)

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

This reverts commit e41efdda19.

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

This reverts commit e41efdda19.

* fix package manifest merge issues

* fix issues building input-srpms

* fix package manifest issues

* remove duplicate patch and sed cmd from lua spec

* revert package ignore list and graphoptimizer changes

* remove runc from LICENSES-MAP.md

* Update pkggen merge (#316)

* Clean up lua.spec 1.0 to dev merge (#318)

* update lua.spec and licenses-map.md per feedback

* revert gzip changes

* revert krb5 change

Co-authored-by: Jim Perrin <Jim.Perrin@microsoft.com>
Co-authored-by: Jason Goscinski <jasongos@users.noreply.github.com>
Co-authored-by: Mateusz Malisz <maliszmat@outlook.com>
Co-authored-by: Nicolas Ontiveros <54044510+niontive@users.noreply.github.com>
Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Co-authored-by: Daniel McIlvaney <damcilva@microsoft.com>
Co-authored-by: Christopher Co <christopher.co@microsoft.com>
Co-authored-by: chalamalasetty <chalamalasetty@live.com>
Co-authored-by: chalamalasetty <42326515+chalamalasetty@users.noreply.github.com>
Co-authored-by: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com>
Co-authored-by: Henry Beberman <henry.beberman@microsoft.com>
Co-authored-by: Emre Girgin <50592283+mrgirgin@users.noreply.github.com>
Co-authored-by: Thomas Crain <thcrain@microsoft.com>
Co-authored-by: Jon Slobodzian <joslobo@microsoft.com>
Co-authored-by: Emre Girgin <mrgirgin@microsoft.com>
Co-authored-by: Daniel Burgener <burgener.daniel@gmail.com>
Co-authored-by: nicolas guibourge <nicogbg@gmail.com>
Co-authored-by: Chirag Shah <chsha@microsoft.com>
Co-authored-by: Henry Li <lihl@microsoft.com>
Co-authored-by: Henry Li <69694695+henryli001@users.noreply.github.com>
Co-authored-by: rychenf1 <rychenf1@gmail.com>
Co-authored-by: Nick Samson <nick.samson@microsoft.com>
Co-authored-by: MateuszMalisz <mamalisz@microsoft.com>
2020-11-03 17:40:59 -08:00
Jon Slobodzian b877013b27 Initial CBL-Mariner commit to GitHub 2020-08-06 20:17:52 -07:00