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

network-manager: 1.6.2 -> 1.8.2 #29375

Merged
merged 2 commits into from Sep 25, 2017
Merged

network-manager: 1.6.2 -> 1.8.2 #29375

merged 2 commits into from Sep 25, 2017

Conversation

bkchr
Copy link
Contributor

@bkchr bkchr commented Sep 14, 2017 •
edited

Motivation for this change

Requires #29371 for nox-review without errors.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@bkchr bkchr mentioned this pull request Sep 14, 2017
Closed
@teto
Copy link
Member

teto commented Sep 15, 2017

Thanks for the patch. Tested with wifi/wired connections, works well here <3

@teto
Copy link
Member

teto commented Sep 15, 2017

Hum actually when trying to setup my vpn so maybe an override for modprobe might be required ?
I am getting the source to check.

sept. 15 10:33:30 jedha ipsec_starter[3087]: 
sept. 15 10:33:32 jedha NetworkManager[716]: Starting strongSwan 5.6.0 IPsec [starter]...
sept. 15 10:33:32 jedha NetworkManager[716]: Loading config setup
sept. 15 10:33:32 jedha NetworkManager[716]: Loading conn 'nm-ipsec-l2tp-3205'
sept. 15 10:33:32 jedha ipsec_starter[3217]: Starting strongSwan 5.6.0 IPsec [starter]...
sept. 15 10:33:32 jedha ipsec_starter[3217]: Loading config setup
sept. 15 10:33:32 jedha ipsec_starter[3217]: Loading conn 'nm-ipsec-l2tp-3205'
sept. 15 10:33:32 jedha NetworkManager[716]: sh: modprobe : commande introuvable
sept. 15 10:33:32 jedha NetworkManager[716]: sh: modprobe : commande introuvable
sept. 15 10:33:32 jedha NetworkManager[716]: sh: modprobe : commande introuvable
sept. 15 10:33:32 jedha NetworkManager[716]: sh: modprobe : commande introuvable
sept. 15 10:33:32 jedha NetworkManager[716]: sh: modprobe : commande introuvable
sept. 15 10:33:32 jedha NetworkManager[716]: found netkey IPsec stack
sept. 15 10:33:32 jedha ipsec_starter[3217]: found netkey IPsec stack
sept. 15 10:33:32 jedha ipsec_starter[3233]: Attempting to start charon...

@teto
Copy link
Member

teto commented Sep 15, 2017

I was wondering why the nixos-rebuild succeeded even though I could not compile it from source.
I added autoreconfHook in nativeBuildInputs which got me a bit farther (than the previous error "substitute(): ERROR: file 'configure' does not exist") but I believe that's because the archive embeds already a configure script.

Now it fails on

./configure: line 27817: syntax error near unexpected token `1.0'
./configure: line 27817: `GTK_DOC_CHECK(1.0)'

even though I have gnome2.gtk-doc installed. Wouldn't it be best if the derivation could work from the source rather than the archive ?

@teto
Copy link
Member

teto commented Sep 15, 2017

The following patch seems to help. with-distro and with-libsoup flags seem useless now (configure: WARNING: unrecognized options: --with-distro, --with-libsoup )
teto@486e61d

There is another problem I don't know how to fix

config.status: executing po/stamp-it commands
config.status: error: po/Makefile.in.in was not created by intltoolize.

@bkchr
Copy link
Contributor Author

bkchr commented Sep 15, 2017

Hmm weird that you need this patch. My compilation worked without any problems, but I will integrate your patch :)

@bkchr
Copy link
Contributor Author

bkchr commented Sep 15, 2017

Okay, I updated the pr. I also could fix the po/Makefile error.

@teto
Copy link
Member

teto commented Sep 15, 2017

Great now it compiles just fine even without the configure script.

@jtojnar
Copy link
Contributor

jtojnar commented Sep 15, 2017

Could you also bump the applet version, please? It will probably work better if they match.

@eqyiel
Copy link
Contributor

eqyiel commented Sep 16, 2017

Thanks for working on this. 1.8.2 at least is critical if you use NM for VPN connections because it contains this commit: https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=6f61497a1beb20ff2f224d163685b78c7baa76b0

Other discussions:
https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1624317
https://bugzilla.gnome.org/show_bug.cgi%3Fid=783569

@teto
Copy link
Member

teto commented Sep 16, 2017

I still fail to connect to my VPN but this might be unrelated to the PR and more having to strongSwan.
I would like to find the source of the sh: modprobe : commande introuvable ("command not found"). is that a nm shell script ? or a strongSwan ? as for the "PKCS11 module '' lacks library path", I don't know if that matters.

sept. 16 14:40:49 jedha NetworkManager[12801]: Starting strongSwan 5.6.0 IPsec [starter]..
sept. 16 14:40:49 jedha NetworkManager[12801]: Loading config setup
sept. 16 14:40:49 jedha NetworkManager[12801]: Loading conn 'nm-ipsec-l2tp-26372'
sept. 16 14:40:49 jedha ipsec_starter[26401]: Starting strongSwan 5.6.0 IPsec [starter]...
sept. 16 14:40:49 jedha ipsec_starter[26401]: Loading config setup
sept. 16 14:40:49 jedha ipsec_starter[26401]: Loading conn 'nm-ipsec-l2tp-26372'
sept. 16 14:40:49 jedha NetworkManager[12801]: sh: modprobe : commande introuvable
sept. 16 14:40:49 jedha NetworkManager[12801]: sh: modprobe : commande introuvable
sept. 16 14:40:49 jedha NetworkManager[12801]: sh: modprobe : commande introuvable
sept. 16 14:40:49 jedha NetworkManager[12801]: sh: modprobe : commande introuvable
sept. 16 14:40:49 jedha NetworkManager[12801]: sh: modprobe : commande introuvable
sept. 16 14:40:49 jedha NetworkManager[12801]: found netkey IPsec stack
sept. 16 14:40:49 jedha ipsec_starter[26401]: found netkey IPsec stack
sept. 16 14:40:49 jedha ipsec_starter[26428]: Attempting to start charon...
sept. 16 14:40:49 jedha NetworkManager[12801]: <warn>  [1505540449.9427] vpn-connection[0x
sept. 16 14:40:49 jedha charon[26429]: 00[DMN] Starting IKE charon daemon (strongSwan 5.6.
sept. 16 14:40:49 jedha charon[26429]: 00[CFG] PKCS11 module '<name>' lacks library path
sept. 16 14:40:50 jedha charon[26429]: 00[CFG] dnscert plugin is disabled
sept. 16 14:40:50 jedha charon[26429]: 00[NET] using forecast interface wlp2s0

@eqyiel
Copy link
Contributor

eqyiel commented Sep 16, 2017

I bumped the applet version, @bkchr could you cherry-pick eqyiel@07b6a8f?

I'm using both right now and it seems OK:

eqyiel@ayanami ~ % journalctl -u network-manager -b 0 -l | cat
-- Logs begin at Wed 2017-09-06 08:21:55 ACST, end at Sat 2017-09-16 18:23:01 ACST. --
Sep 16 18:19:25 ayanami systemd[1]: Starting Network Manager...
Sep 16 18:19:26 ayanami systemd[1]: Started Network Manager.
Sep 16 18:19:33 ayanami NetworkManager[1049]: libndp: ndp_sock_open: Failed to create ICMP6 socket.
Sep 16 18:19:33 ayanami NetworkManager[1049]: <error> [1505551773.9445] device (wlp3s0): addrconf6: failed to start neighbor discovery: failure creating libndp socket: Address family not supported by protocol (97)
Sep 16 18:19:33 ayanami dhclient[1441]: DHCPREQUEST on wlp3s0 to 255.255.255.255 port 67
Sep 16 18:19:33 ayanami dhclient[1441]: DHCPACK from 192.168.1.1
Sep 16 18:19:34 ayanami dhclient[1441]: bound to 192.168.1.174 -- renewal in 20729 seconds.

(the errors are related to having disabled ipv6)

@bkchr
Copy link
Contributor Author

bkchr commented Sep 16, 2017 •
edited

I could cherry pick, but I think you could also open your own pull request. As I understand that right, the applet is only for gnome? It you want, open a pr and link this pr :)

Edit: ignore what I said, I will cherry-pick your commit :)

@eqyiel @bkchr
network-manager-applet: 1.4.6 -> 1.8.2
6c9a1b7 
Make `network-manager-applet` version match `network-manager` version.

Ref: NixOS#29375 (comment)
@bkchr
Copy link
Contributor Author

bkchr commented Sep 16, 2017

Added your commit and removed libselinux. nox-review is still running for the changes.

@bkchr
Copy link
Contributor Author

bkchr commented Sep 16, 2017

nox-review did not report any errors :)

@eqyiel
Copy link
Contributor

eqyiel commented Sep 16, 2017

Thanks, I wasn't sure what to do about that!

@eqyiel eqyiel mentioned this pull request Sep 23, 2017
Merged
8 tasks
@eqyiel
Copy link
Contributor

eqyiel commented Sep 24, 2017

Can we move this forward?

@bkchr
Copy link
Contributor Author

bkchr commented Sep 25, 2017

@Phreedom @rickynils could you merge this pr?

@rickynils rickynils merged commit 72b46f3 into NixOS:master Sep 25, 2017
@jtojnar jtojnar mentioned this pull request Sep 25, 2017
Merged
71 tasks
@eqyiel
Copy link
Contributor

eqyiel commented Sep 26, 2017

@rickynils thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@bkchr @teto @jtojnar @eqyiel @rickynils