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.

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

systemd: 239.20190110 -> 239.20190219 #56071

Merged
merged 1 commit into from Feb 20, 2019
Merged

systemd: 239.20190110 -> 239.20190219 #56071

merged 1 commit into from Feb 20, 2019

Conversation

fpletz
Copy link
Member

@fpletz fpletz commented Feb 19, 2019

Fix CVE-2019-6454. See https://www.openwall.com/lists/oss-security/2019/02/18/3.

Changes from NixOS/systemd#26.

Checked that these patches fix the issue and ran a few NixOS tests.

@andir
Copy link
Member

andir commented Feb 19, 2019

The build fails locally, probably an unrelated issue.

⇒  nix-build -I nixpkgs=. -A systemd
these derivations will be built:
  /nix/store/q414ay3n4g7302dhi4hkpry2b7d6hmyf-libxml2+py-2.9.9.drv
  /nix/store/0fcx4gfanq8cyp5ik7l6669rg5anzv23-gnome-doc-utils-0.20.10.drv
  /nix/store/15z6w9dc1a2z3ipd6jp3d17llqs6d0hy-itstool-2.0.2.drv
  /nix/store/0hx3w8aldz57s9r39vxx2i7ld6yln1yp-gtk-doc-1.29.drv
  /nix/store/g50v33ab1xdxnxhs15apb065nv1m034i-python3.7-lxml-4.2.6.drv
  /nix/store/bsa2ijcqyffrfsdab3d2gjhq0kma1iib-python3-3.7.2-env.drv
  /nix/store/c7yfl67vx8d6ialsysqx493c6y5sf3ly-shadow-4.6.drv
  /nix/store/f947inybkxf7ldl7ysqc47z653dlkazk-util-linux-2.33.1.drv
  /nix/store/p3zzpkh79d4vip0d3vjxhvl0s414yd4f-meson-0.49.1.drv
  /nix/store/xlk7j4sz25wz1nrh9gg1nqmw83nv3i96-ninja-1.9.0.drv
  /nix/store/c0pgsya51rhp97ihk5zbi8m9d732938h-glib-2.58.2.drv
  /nix/store/lab29ppyw0vs4b4qc141jj27za24g9r1-docbook-xml-4.2.drv
  /nix/store/7ykbzmm31jszfpbn8ylwg5nj4kjk64gd-systemd-239.20190219.drv
building '/nix/store/lab29ppyw0vs4b4qc141jj27za24g9r1-docbook-xml-4.2.drv'...
building '/nix/store/p3zzpkh79d4vip0d3vjxhvl0s414yd4f-meson-0.49.1.drv'...
building '/nix/store/xlk7j4sz25wz1nrh9gg1nqmw83nv3i96-ninja-1.9.0.drv'...
building '/nix/store/g50v33ab1xdxnxhs15apb065nv1m034i-python3.7-lxml-4.2.6.drv'...
building '/nix/store/q414ay3n4g7302dhi4hkpry2b7d6hmyf-libxml2+py-2.9.9.drv'...
Path /nix/store/vdpzi7q32nkkr6bmka7cwhlr5p26pga1-libxml2-2.9.9-dev/bin/xml2-config is a file and can't be merged into an environment using pkgs.buildEnv! at /nix/store/hafzskpwv85wsz1f8c2ps6n5a87khac7-builder.pl line 88.
builder for '/nix/store/q414ay3n4g7302dhi4hkpry2b7d6hmyf-libxml2+py-2.9.9.drv' failed with exit code 2
cannot build derivation '/nix/store/0fcx4gfanq8cyp5ik7l6669rg5anzv23-gnome-doc-utils-0.20.10.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/0hx3w8aldz57s9r39vxx2i7ld6yln1yp-gtk-doc-1.29.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/c0pgsya51rhp97ihk5zbi8m9d732938h-glib-2.58.2.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/c7yfl67vx8d6ialsysqx493c6y5sf3ly-shadow-4.6.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/7ykbzmm31jszfpbn8ylwg5nj4kjk64gd-systemd-239.20190219.drv': 1 dependencies couldn't be built
error: build of '/nix/store/7ykbzmm31jszfpbn8ylwg5nj4kjk64gd-systemd-239.20190219.drv' failed

Lets see what ofBorg says.

@GrahamcOfBorg build systemd

@fpletz
Copy link
Member Author

fpletz commented Feb 19, 2019

Hrm, I didn't actually build this based on staging but on master.

@fpletz fpletz changed the base branch from staging to staging-next February 19, 2019 22:22
@fpletz
Copy link
Member Author

fpletz commented Feb 19, 2019

Rebased and retargeted to staging-next because staging seems to be broken.

andir
andir approved these changes Feb 20, 2019
View reviewed changes
Copy link
Member

@andir andir left a comment

Choose a reason for hiding this comment

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

nixos.tests.simple did succeed for me 👍

@andir andir merged commit b7c899a into NixOS:staging-next Feb 20, 2019
@fpletz fpletz deleted the pkg/systemd-239.20190219 branch February 20, 2019 08:59
@fpletz
Copy link
Member Author

fpletz commented Feb 20, 2019

Backported to staging-18.09: 90f99f4

@TredwellGit TredwellGit added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Aug 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andir andir andir approved these changes

@basvandijk basvandijk Awaiting requested review from basvandijk

@infinisil infinisil Awaiting requested review from infinisil

@peti peti Awaiting requested review from peti

@ryantm ryantm Awaiting requested review from ryantm

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
1.severity: security 8.has: package (update) 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@fpletz @andir @GrahamcOfBorg @TredwellGit