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

rdesktop: enable credssp #31921

Merged
merged 2 commits into from Nov 23, 2017
Merged

rdesktop: enable credssp #31921

merged 2 commits into from Nov 23, 2017

Conversation

corngood
Copy link
Contributor

Motivation for this change

This allows kerberos authentication in rdesktop, e.g.:

$ kinit user@REALM
$ rdesktop machine
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
    • 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/)
  • Fits CONTRIBUTING.md.

meta = with stdenv.lib.maintainers; {
homepage = http://www.citi.umich.edu/projects/nfsv4/linux/;
description = "Exports a gssapi interface which calls other random gssapi libraries";
license = "BSD";
Copy link
Contributor

Choose a reason for hiding this comment

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

Please use stdenv.lib.licenses.bsd3 here instead of "BSD".

You may also want to bring in "stdenv.lib" instead of "stdenv.lib.maintainers", so you can access license/platforms/maintainers more succinctly within the meta attrset.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed. I think this is probably the cleanest way to do it.

@bjornfor
Copy link
Contributor

rdesktop closure size increases from 32 to 36 MiB. That's fine. Ack from me.

@corngood
Copy link
Contributor Author

@bjornfor I thought about making credssp optional, but it's enabled by default in configuration, and rdesktop isn't very useful without it. It's probably not worth the complexity. Same goes for making libgssglue modular.

@bjornfor
Copy link
Contributor

I agree :-)

@disassembler
Copy link
Member

@GrahamcOfBorg build rdesktop

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

cp doc/rdesktop.1 /nix/store/877gx518khqydffgar2zkq1ca514fdhx-rdesktop-1.8.3/share/man/man1
chmod 644 /nix/store/877gx518khqydffgar2zkq1ca514fdhx-rdesktop-1.8.3/share/man/man1/rdesktop.1
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/877gx518khqydffgar2zkq1ca514fdhx-rdesktop-1.8.3
shrinking /nix/store/877gx518khqydffgar2zkq1ca514fdhx-rdesktop-1.8.3/bin/rdesktop
gzipping man pages under /nix/store/877gx518khqydffgar2zkq1ca514fdhx-rdesktop-1.8.3/share/man/
stripping (with flags -S) in /nix/store/877gx518khqydffgar2zkq1ca514fdhx-rdesktop-1.8.3/bin 
patching script interpreter paths in /nix/store/877gx518khqydffgar2zkq1ca514fdhx-rdesktop-1.8.3
checking for references to /tmp/nix-build-rdesktop-1.8.3.drv-0 in /nix/store/877gx518khqydffgar2zkq1ca514fdhx-rdesktop-1.8.3...
/nix/store/877gx518khqydffgar2zkq1ca514fdhx-rdesktop-1.8.3

@disassembler disassembler merged commit b4c63c3 into NixOS:master Nov 23, 2017
@disassembler
Copy link
Member

looks good to me, merging!

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin

error: Package ‘rdesktop-1.8.3’ in /tmp/nix-ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/31921/pkgs/applications/networking/remote/rdesktop/default.nix:23 is not supported on ‘x86_64-darwin’, refusing to evaluate.

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

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

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

4 participants