commit 7c34c28cfaacf9cb9fcb7b169cd6a28e4c34d8d0 · pyrox.dev/nixpkgs

+18

nixos/modules/programs/mosh.nix

···

       16
       16
        
             default = false;

     

       17
       17
        
             type = lib.types.bool;

     

       18
       18
        
           };

     

       19
       19
       +
           withUtempter = mkOption {

     

       20
       20
       +
             description = ''

     

       21
       21
       +
               Whether to enable libutempter for mosh.

     

       22
       22
       +
               This is required so that mosh can write to /var/run/utmp (which can be queried with `who` to display currently connected user sessions).

     

       23
       23
       +
               Note, this will add a guid wrapper for the group utmp!

     

       24
       24
       +
             '';

     

       25
       25
       +
             default = true;

     

       26
       26
       +
             type = lib.types.bool;

     

       27
       27
       +
           };

     

       19
       28
        
         };

     

       20
       29
        
       

     

       21
       30
        
         config = mkIf cfg.enable {

     

       22
       31
        
           environment.systemPackages = with pkgs; [ mosh ];

     

       23
       32
        
           networking.firewall.allowedUDPPortRanges = [ { from = 60000; to = 61000; } ];

     

       33
       33
       +
           security.wrappers = mkIf cfg.withUtempter {

     

       34
       34
       +
             utempter = {

     

       35
       35
       +
               source = "${pkgs.libutempter}/lib/utempter/utempter";

     

       36
       36
       +
               owner = "nobody";

     

       37
       37
       +
               group = "utmp";

     

       38
       38
       +
               setuid = false;

     

       39
       39
       +
               setgid = true;

     

       40
       40
       +
             };

     

       41
       41
       +
           };

     

       24
       42
        
         };

     

       25
       43
        
       }

+7 -1

pkgs/development/libraries/libutempter/default.nix

···

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ glib ];

     

       15
       15
        
       

     

       16
       16
       +
         patches = [ ./exec_path.patch ];

     

       17
       17
       +
       

     

       16
       18
        
         prePatch = ''

     

       17
       19
        
           substituteInPlace Makefile --replace 2711 0711

     

       18
       20
        
         '';

     

       19
       21
        
       

     

       20
       20
       -
         installFlags = [

     

       22
       22
       +
         makeFlags = [

     

       21
       23
        
           "libdir=\${out}/lib"

     

       22
       24
        
           "libexecdir=\${out}/lib"

     

       23
       25
        
           "includedir=\${out}/include"

     
···

       26
       28
        
       

     

       27
       29
        
         meta = {

     

       28
       30
        
           description = "Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files";

     

       31
       31
       +
           longDescription = ''

     

       32
       32
       +
             The bundled utempter binary must be able to run as a user belonging to group utmp.

     

       33
       33
       +
             On NixOS systems, this can be achieved by creating a setguid wrapper.

     

       34
       34
       +
           '';

     

       29
       35
        
           license = licenses.lgpl21Plus;

     

       30
       36
        
           platforms = platforms.linux;

     

       31
       37
        
           maintainers = [ maintainers.msteen ];

+25

pkgs/development/libraries/libutempter/exec_path.patch

···

       1
       1
       +
       diff -ur libutempter-1.1.6/iface.c libutempter-1.1.6.patched/iface.c

     

       2
       2
       +
       --- libutempter-1.1.6/iface.c	2010-11-04 18:14:53.000000000 +0100

     

       3
       3
       +
       +++ libutempter-1.1.6.patched/iface.c	2018-06-06 15:09:11.417755549 +0200

     

       4
       4
       +
       @@ -60,9 +60,9 @@

     

       5
       5
       +
        		_exit(EXIT_FAILURE);

     

       6
       6
       +
        	}

     

       7
       7
       +
        

     

       8
       8
       +
       -	execv(path, argv);

     

       9
       9
       +
       +	execvp(path, argv);

     

       10
       10
       +
        #ifdef	UTEMPTER_DEBUG

     

       11
       11
       +
       -	fprintf(stderr, "libutempter: execv: %s\n", strerror(errno));

     

       12
       12
       +
       +	fprintf(stderr, "libutempter: execvp: %s\n", strerror(errno));

     

       13
       13
       +
        #endif

     

       14
       14
       +
        

     

       15
       15
       +
        	while (EACCES == errno)

     

       16
       16
       +
       @@ -79,7 +79,7 @@

     

       17
       17
       +
        		if (setgid(sgid))

     

       18
       18
       +
        			break;

     

       19
       19
       +
        

     

       20
       20
       +
       -		(void) execv(path, argv);

     

       21
       21
       +
       +		(void) execvp(path, argv);

     

       22
       22
       +
        		break;

     

       23
       23
       +
        	}

     

       24
       24
       +
        

     

       25
       25
       +
       Only in libutempter-1.1.6.patched: result

+6 -5

pkgs/tools/networking/mosh/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig, IOTty

     

       2
       2
       -
       , makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig, IOTty

     

       2
       2
       +
       , makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion

     

       3
       3
       +
       , libutempter ? null, withUtempter ? stdenv.isLinux }:

     

       3
       4
        
       

     

       4
       5
        
       stdenv.mkDerivation rec {

     

       5
       6
        
         name = "mosh-1.3.2";

     
···

       10
       11
        
         };

     

       11
       12
        
       

     

       12
       13
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       13
       13
       -
         buildInputs = [ protobuf ncurses zlib IOTty makeWrapper perl openssl bash-completion ];

     

       14
       14
       +
         buildInputs = [ protobuf ncurses zlib IOTty makeWrapper perl openssl bash-completion ] ++ lib.optional withUtempter libutempter;

     

       14
       15
        
       

     

       15
       15
       -
         patches = [ ./ssh_path.patch ];

     

       16
       16
       +
         patches = [ ./ssh_path.patch ./utempter_path.patch ];

     

       16
       17
        
         postPatch = ''

     

       17
       18
        
           substituteInPlace scripts/mosh.pl \

     

       18
       19
        
               --subst-var-by ssh "${openssh}/bin/ssh"

     

       19
       20
        
         '';

     

       20
       21
        
       

     

       21
       21
       -
         configureFlags = [ "--enable-completion" ];

     

       22
       22
       +
         configureFlags = [ "--enable-completion" ] ++ lib.optional withUtempter "--with-utempter";

     

       22
       23
        
       

     

       23
       24
        
         postInstall = ''

     

       24
       25
        
             wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB

+14

pkgs/tools/networking/mosh/utempter_path.patch

···

       1
       1
       +
       diff -ur mosh-1.3.2/src/frontend/mosh-server.cc mosh-1.3.2.patched/src/frontend/mosh-server.cc

     

       2
       2
       +
       --- mosh-1.3.2/src/frontend/mosh-server.cc	2017-07-22 23:14:53.000000000 +0200

     

       3
       3
       +
       +++ mosh-1.3.2.patched/src/frontend/mosh-server.cc	2018-06-06 10:45:50.725352804 +0200

     

       4
       4
       +
       @@ -351,6 +351,10 @@

     

       5
       5
       +
            }

     

       6
       6
       +
          }

     

       7
       7
       +
        

     

       8
       8
       +
       +#ifdef HAVE_UTEMPTER

     

       9
       9
       +
       +    utempter_set_helper( "utempter" );

     

       10
       10
       +
       +#endif

     

       11
       11
       +
       +

     

       12
       12
       +
          try {

     

       13
       13
       +
            return run_server( desired_ip, desired_port, command_path, command_argv, colors, verbose, with_motd );

     

       14
       14
       +
          } catch ( const Network::NetworkException &e ) {