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

networkmanager: 1.20.2 -> 1.20.4 #71011

Merged
merged 2 commits into from Oct 14, 2019
Merged

networkmanager: 1.20.2 -> 1.20.4 #71011

merged 2 commits into from Oct 14, 2019

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change
  • fix-paths.patch
    We had to add a diff to revert 0 as it makes it use the python
    from meson which won't be the specific pythonForDocs that
    has pygobject (breaking the build). Unfortunate that upstream
    made assumptions like "Of course, who needs a way to invoke
    the interpreter that works accross different distributions!"

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.20.4/NEWS

I've also enabled polkit_agent ed5bd00.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS (on master)
    • 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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jtojnar
Copy link
Contributor

jtojnar commented Oct 12, 2019

What does the agent do? Would not the GNOME agent already be used on GNOME?

@worldofpeace
Copy link
Contributor Author

Not sure, other than it's pretty much enabled ubiquitously in major distros.

Meson code is like

and option is described enable polkit agent for clients.

It seems for the autoconf buildsystem it was enabled like

if polkit-agent-1 is present. So maybe it was enabled before?

@worldofpeace
Copy link
Contributor Author

Maybe from the general hits on

It's for nmcli?

Looking to see if this was ever documented.

@worldofpeace
Copy link
Contributor Author

worldofpeace commented Oct 12, 2019 •
edited

I think from

nmcli agent { secret | polkit | all }

Run nmcli as a NetworkManager secret agent, or polkit agent.

Is what this is, and I don't have any reason to believe it would interfere with GNOME's agent.

@worldofpeace worldofpeace mentioned this pull request Oct 12, 2019
Merged
@jtojnar
Copy link
Contributor

jtojnar commented Oct 14, 2019

The Debian’s rules file is much different than ours. I asked on #nm about it and the agent.

@worldofpeace
Copy link
Contributor Author

The Debian’s rules file is much different than ours. I asked on #nm about it and the agent.

Thanks, I know at least the arch wiki has many many references for why you'd need a polkit rule and alternates.

@worldofpeace
networkmanager: 1.20.2 -> 1.20.4
ea7918f 
* fix-paths.patch
We had to add a diff to revert [0] as it makes it use the python
from meson which won't be the specific pythonForDocs that
has pygobject (breaking the build). Unfortunate that upstream
made assumptions like "Of course, who needs a way to invoke
the interpreter that works accross different distributions!"

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.20.4/NEWS

[0]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/c162dc00e50431f3db2f560201051c0884ebbb1a
@worldofpeace
Copy link
Contributor Author

worldofpeace commented Oct 14, 2019 •
edited

@jtojnar Moved that commit out, will PR it. It also seems our documentation on networkmanager needs updating.

Edit: think something is up with staging because this fails to build.
Edit Edit: fixed dnsmasq's build.

@ofborg ofborg bot requested review from fpletz, globin and edolstra October 14, 2019 22:41
@worldofpeace worldofpeace merged commit 41bfe6f into NixOS:staging Oct 14, 2019
@worldofpeace worldofpeace deleted the nm-1.20.4 branch October 14, 2019 22:42
@jtojnar
Copy link
Contributor

jtojnar commented Oct 14, 2019 •
edited

I was also seeing the following in the logs:

install -c -m 4550 pppoatm.so /nix/store/xmf935w4d8rchcq392bcb8ya82hr2xqa-ppp-2.4.7/lib/pppd/2.4.7
install: cannot change permissions of '/nix/store/xmf935w4d8rchcq392bcb8ya82hr2xqa-ppp-2.4.7/lib/pppd/2.4.7/pppoatm.so': Operation not permitted
make[2]: *** [Makefile:40: install] Error 1

Edit: it appears to be ignored, even though (ignored) is not printed for some reason.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar Awaiting requested review from jtojnar

@obadz obadz Awaiting requested review from obadz

@domenkozar domenkozar Awaiting requested review from domenkozar

@Phreedom Phreedom Awaiting requested review from Phreedom

@fpletz fpletz Awaiting requested review from fpletz

@globin globin Awaiting requested review from globin

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@worldofpeace @jtojnar