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

networkmanager: 1.12.2 -> 1.14.4 #51122

Merged
merged 3 commits into from Jan 2, 2019
Merged

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Nov 27, 2018

Motivation for this change

1.12.4 info:

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: networkmanager

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: networkmanager

Partial log (click to expand)

stripping (with command strip and flags -S) in /nix/store/j1n62r2a449c7bir99361zf0minv08vs-libsoup-2.62.2/lib
patching script interpreter paths in /nix/store/j1n62r2a449c7bir99361zf0minv08vs-libsoup-2.62.2
checking for references to /build/ in /nix/store/j1n62r2a449c7bir99361zf0minv08vs-libsoup-2.62.2...
shrinking RPATHs of ELF executables and libraries in /nix/store/8z9xdhiabcn3l028xllsa1vg9hi43gh1-libsoup-2.62.2-dev
strip is /nix/store/8ka8xfsc330vavalzkpsl2war3hfavb4-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/8z9xdhiabcn3l028xllsa1vg9hi43gh1-libsoup-2.62.2-dev/lib
patching script interpreter paths in /nix/store/8z9xdhiabcn3l028xllsa1vg9hi43gh1-libsoup-2.62.2-dev
checking for references to /build/ in /nix/store/8z9xdhiabcn3l028xllsa1vg9hi43gh1-libsoup-2.62.2-dev...
cannot build derivation '/nix/store/vr84m636358yn9lmhk51km3kg9wq620r-network-manager-1.12.4.drv': 1 dependencies couldn't be built
error: build of '/nix/store/vr84m636358yn9lmhk51km3kg9wq620r-network-manager-1.12.4.drv' failed

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: networkmanager

Partial log (click to expand)

cannot build derivation '/nix/store/img7xdbrlqs6m1b0a1b4vppsrkzkcy84-vala-0.40.6.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/0akil5869qky40pqdkpchanl66jp09dg-libical-3.0.4.drv': 16 dependencies couldn't be built
cannot build derivation '/nix/store/052wzfi7m4vkmy751hznq7ayw1wnd41k-libsoup-2.62.2.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/bvyzcfw76b17633s1fwbw103n69ivh75-modem-manager-1.7.990.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/r7f5p78ds6zdh3hx4bj5lldjivm5b8qq-stoken-0.92.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/r7zvss1gp0j46pnw0dmflkpcnhyhk5qk-bluez-5.50.drv': 15 dependencies couldn't be built
cannot build derivation '/nix/store/zwqh91k2lqqhkr42dmf8457h9plm9adp-openconnect-7.08.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/zqnv33wy8yh5vspkhkkn04yqx4gqyclj-fix-paths.patch.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/ha3zgffi4yfl7k8alfpsdcc6b3mx07pg-network-manager-1.12.4.drv': 34 dependencies couldn't be built
error: build of '/nix/store/ha3zgffi4yfl7k8alfpsdcc6b3mx07pg-network-manager-1.12.4.drv' failed

@kalbasit
Copy link
Member

Should we update to the latest stable v1.14.4 instead? That's the latest stable according to https://wiki.gnome.org/Projects/NetworkManager.

@dtzWill
Copy link
Member Author

dtzWill commented Nov 27, 2018 via email

@kalbasit
Copy link
Member

I think we should update to 1.14.4. Many people run on -unstable and would be awesome to get it tested this early in the release.

@dtzWill dtzWill changed the title networkmanager: 1.12.2 -> 1.12.4 networkmanager: 1.12.2 -> 1.14.4 Nov 28, 2018
@kalbasit
Copy link
Member

Great! I'll switch to it for a few days to make sure it's fine.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: networkmanager

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@kalbasit
Copy link
Member

@dtzWill The following patch is not applying on my side

    (fetchurl {
      url = https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/0a3755c1799d3a4dc1875d4c59c7c568a64c8456.patch;
      sha256 = "af1717f7c6fdd6dadb4082dd847f4bbc42cf1574833299f3e47024e785533f2e";
    })
applying patch /nix/store/a3vqyf8k23vq06k38lrw9v220zq50xrf-0a3755c1799d3a4dc1875d4c59c7c568a64c8456.patch
patching file libnm-core/nm-version.h
Hunk #1 FAILED at 161.
1 out of 1 hunk FAILED -- saving rejects to file libnm-core/nm-version.h.rej
builder for '/nix/store/dyqf1m89rk1gh3g7dsqrzj8n3i9xal80-network-manager-1.14.4.drv' failed with exit code 1
e

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: networkmanager

Partial log (click to expand)

cannot build derivation '/nix/store/1yggg5wyy8a5rzz4iw91sygf8n23yq58-vala-0.40.6.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/91vhsc2n1q779sslavz0a2p7n9w8vwya-libical-3.0.4.drv': 16 dependencies couldn't be built
cannot build derivation '/nix/store/30v5m3k8nm1vg2qiknqbg9msdzlqaivp-libsoup-2.62.2.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/bfchf0clypn1rxw6pgcjqlgn2pjphcs4-modem-manager-1.7.990.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/gg8555gzcf1r2s3fpgqzqjj68mhbsyrz-stoken-0.92.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/q0908m7vcq1ry3nynjcb4b0d082c48fq-bluez-5.50.drv': 15 dependencies couldn't be built
cannot build derivation '/nix/store/aanc96imv4qymamjln3bci9kww6mcgcx-openconnect-7.08.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/a85rw0f4ngwvynzsl3nd8d5rw38c281z-fix-paths.patch.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/s0743fi9iizp7pj8qb3g1c9r0pcj1fak-network-manager-1.14.4.drv': 34 dependencies couldn't be built
error: build of '/nix/store/s0743fi9iizp7pj8qb3g1c9r0pcj1fak-network-manager-1.14.4.drv' failed

@kalbasit
Copy link
Member

kalbasit commented Nov 28, 2018

@dtzWill I removed the patch and it worked for me. I pushed the fix to your branch.

EDIT: Feel free to squash the commits back into one.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: networkmanager

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: networkmanager

Partial log (click to expand)

setting SOURCE_DATE_EPOCH to timestamp 1540369249 of file NetworkManager-1.14.4/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1
patching sources
applying patch /nix/store/kas9wik0c24cypwvdc2cmr1r9i67hkf9-attachment.cgi?id=372953
patching file clients/common/nm-vpn-helpers.c
applying patch /nix/store/a3vqyf8k23vq06k38lrw9v220zq50xrf-0a3755c1799d3a4dc1875d4c59c7c568a64c8456.patch
patching file libnm-core/nm-version.h
Hunk #1 FAILED at 161.
1 out of 1 hunk FAILED -- saving rejects to file libnm-core/nm-version.h.rej
builder for '/nix/store/igq55rhpmflja0gkhriy8rbqnmkndf02-network-manager-1.14.4.drv' failed with exit code 1
error: build of '/nix/store/igq55rhpmflja0gkhriy8rbqnmkndf02-network-manager-1.14.4.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: networkmanager

Partial log (click to expand)

stripping (with command strip and flags -S) in /nix/store/7s46pry71zf3jxcgcayzhi0j0yx8dhsw-network-manager-1.14.4/lib  /nix/store/7s46pry71zf3jxcgcayzhi0j0yx8dhsw-network-manager-1.14.4/libexec  /nix/store/7s46pry71zf3jxcgcayzhi0j0yx8dhsw-network-manager-1.14.4/bin  /nix/store/7s46pry71zf3jxcgcayzhi0j0yx8dhsw-network-manager-1.14.4/sbin
patching script interpreter paths in /nix/store/7s46pry71zf3jxcgcayzhi0j0yx8dhsw-network-manager-1.14.4
checking for references to /build/ in /nix/store/7s46pry71zf3jxcgcayzhi0j0yx8dhsw-network-manager-1.14.4...
moving /nix/store/7s46pry71zf3jxcgcayzhi0j0yx8dhsw-network-manager-1.14.4/sbin/* to /nix/store/7s46pry71zf3jxcgcayzhi0j0yx8dhsw-network-manager-1.14.4/bin
shrinking RPATHs of ELF executables and libraries in /nix/store/4vklb755fjr4azpsf9vpmh2sjlnhax3s-network-manager-1.14.4-dev
strip is /nix/store/6yjvaipy9zffribmc4l13c7i8k19ama5-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/4vklb755fjr4azpsf9vpmh2sjlnhax3s-network-manager-1.14.4-dev/lib
patching script interpreter paths in /nix/store/4vklb755fjr4azpsf9vpmh2sjlnhax3s-network-manager-1.14.4-dev
checking for references to /build/ in /nix/store/4vklb755fjr4azpsf9vpmh2sjlnhax3s-network-manager-1.14.4-dev...
/nix/store/7s46pry71zf3jxcgcayzhi0j0yx8dhsw-network-manager-1.14.4

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: networkmanager

Partial log (click to expand)

cannot build derivation '/nix/store/1yggg5wyy8a5rzz4iw91sygf8n23yq58-vala-0.40.6.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/91vhsc2n1q779sslavz0a2p7n9w8vwya-libical-3.0.4.drv': 16 dependencies couldn't be built
cannot build derivation '/nix/store/30v5m3k8nm1vg2qiknqbg9msdzlqaivp-libsoup-2.62.2.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/bfchf0clypn1rxw6pgcjqlgn2pjphcs4-modem-manager-1.7.990.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/gg8555gzcf1r2s3fpgqzqjj68mhbsyrz-stoken-0.92.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/q0908m7vcq1ry3nynjcb4b0d082c48fq-bluez-5.50.drv': 15 dependencies couldn't be built
cannot build derivation '/nix/store/aanc96imv4qymamjln3bci9kww6mcgcx-openconnect-7.08.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/a85rw0f4ngwvynzsl3nd8d5rw38c281z-fix-paths.patch.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/mb9vl3gkcr61638qfnhhnll6c9yz3q8f-network-manager-1.14.4.drv': 34 dependencies couldn't be built
error: build of '/nix/store/mb9vl3gkcr61638qfnhhnll6c9yz3q8f-network-manager-1.14.4.drv' failed

kalbasit added a commit to kalbasit/shabka that referenced this pull request Nov 28, 2018
I'm switching to the newest network-manager so I can give
NixOS/nixpkgs#51122 full QA.
@worldofpeace
Copy link
Contributor

cc @jtojnar

@dtzWill
Copy link
Member Author

dtzWill commented Dec 20, 2018

This misses some paths, I think, and doesn't appear to include the ipv6 CVE? (although this might already be handled or picked already)

The release numbering here is confusing :(.

Anyway what I really came here to say was that 1.12.6 is out as of early December-- perhaps we should just move to that instead (or in the meantime)?

@dtzWill
Copy link
Member Author

dtzWill commented Dec 20, 2018

re:paths, the ethtool/sed are expected to be on PATH instead of in particular locations, so our substituteInPlace commands don't touch them up. If the PATH assumption is okay that's fine otherwise it's easy enough to fix. Also there's references to /usr/bin/dbus-send command in ExecReload but they are present in what we're using today-- perhaps those files aren't used, or we'd be seeing complaints in our logs! :)

@dtzWill dtzWill mentioned this pull request Dec 20, 2018
10 tasks
@jtojnar
Copy link
Contributor

jtojnar commented Dec 22, 2018

I fixed the paths issue.

@jtojnar
Copy link
Contributor

jtojnar commented Dec 22, 2018

As for the CVE, according to https://bugzilla.redhat.com/show_bug.cgi?id=1639067#c15, it only applies to internal DHCP implementation; we use dhclient instead.

@worldofpeace
Copy link
Contributor

@jtojnar Discerning from the changes you've made, we're preferring this over #52574?

@jtojnar
Copy link
Contributor

jtojnar commented Dec 22, 2018

I would say so, 1.14 is the current stable branch.

@worldofpeace
Copy link
Contributor

I've cleaned up the history and I added 9187187

@dtzWill
Copy link
Member Author

dtzWill commented Dec 22, 2018

The new fix-paths.patch and the fetchpatch conflict; I think we can just use the local one. Not sure why borg isn't seeing a build failure as a result?

kalbasit added a commit to kalbasit/shabka that referenced this pull request Dec 24, 2018
kalbasit added a commit to kalbasit/shabka that referenced this pull request Dec 24, 2018
@dtzWill
Copy link
Member Author

dtzWill commented Dec 29, 2018

So far so good, FWIW! :)

@worldofpeace worldofpeace merged commit 3dee4f2 into NixOS:staging Jan 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants