···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
stdenv.mkDerivation rec {

     

       
6
       
6
       
 
       
  pname = "libutempter";

     

       
7
       
7
       
-
       
  version = "1.1.6";

     

       
7
       
7
       
+
       
  version = "1.2.1";

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  src = fetchurl {

     

       
10
       
10
       
-
       
    url = "mirror://ubuntu/pool/main/libu/libutempter/libutempter_${version}.orig.tar.bz2";

     

       
11
       
11
       
-
       
    sha256 = "15y3xbgznjxnfmix4xg3bwmqdvghdw7slbhazb0ybmyf65gmd65q";

     

       
10
       
10
       
+
       
    url = "http://ftp.altlinux.org/pub/people/ldv/utempter/libutempter-${version}.tar.gz";

     

       
11
       
11
       
+
       
    sha256 = "sha256-ln/vNy85HeUBhDrYdXDGz12r2WUfAPF4MJD7wSsqNMs=";

     

       
12
       
12
       
 
       
  };

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  buildInputs = [ glib ];

     

       
15
       
15
       
 
       


     

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

     

       
17
       
17
       
+
       


     

       
18
       
18
       
+
       
  patchFlags = [ "-p2" ];

     

       
17
       
19
       
 
       


     

       
18
       
20
       
 
       
  prePatch = ''

     

       
19
       
21
       
 
       
    substituteInPlace Makefile --replace 2711 0711

     
···

       
27
       
29
       
 
       
  ];

     

       
28
       
30
       
 
       


     

       
29
       
31
       
 
       
  meta = {

     

       
32
       
32
       
+
       
    homepage = "https://github.com/altlinux/libutempter";

     

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

     

       
31
       
34
       
 
       
    longDescription = ''

     

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

     

···

       
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 @@

     

       
1
       
1
       
+
       
diff --git a/libutempter/iface.c b/libutempter/iface.c

     

       
2
       
2
       
+
       
index 37c74a8..6f44c9a 100644

     

       
3
       
3
       
+
       
--- a/libutempter/iface.c

     

       
4
       
4
       
+
       
+++ b/libutempter/iface.c

     

       
5
       
5
       
+
       
@@ -43,7 +43,7 @@

     

       
6
       
6
       
+
       
        __result; }))

     

       
7
       
7
       
+
       
 #endif

     

       
8
       
8
       
+
       
 

     

       
9
       
9
       
+
       
-#define UTEMPTER_DEFAULT_PATHNAME	LIBEXECDIR "/utempter/utempter"

     

       
10
       
10
       
+
       
+#define UTEMPTER_DEFAULT_PATHNAME	"utempter"

     

       
11
       
11
       
+
       
 

     

       
12
       
12
       
+
       
 static const char *utempter_pathname;

     

       
13
       
13
       
+
       
 static int saved_fd = -1;

     

       
14
       
14
       
+
       
@@ -57,8 +57,8 @@ do_child(int master_fd, const char *path, char *const *argv)

     

       
5
       
15
       
 
       
 		_exit(EXIT_FAILURE);

     

       
6
       
16
       
 
       
 	}

     

       
7
       
17
       
 
       
 

     

       
8
       
18
       
 
       
-	execv(path, argv);

     

       
19
       
19
       
+
       
-	print_dbg("execv: %s", strerror(errno));

     

       
9
       
20
       
 
       
+	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

     

       
21
       
21
       
+
       
+	print_dbg("execvp: %s", strerror(errno));

     

       
14
       
22
       
 
       
 

     

       
15
       
15
       
-
       
 	while (EACCES == errno)

     

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

     

       
23
       
23
       
+
       
 	while (EACCES == errno) {

     

       
24
       
24
       
+
       
 		/* try saved group ID */

     

       
25
       
25
       
+
       
@@ -73,7 +73,7 @@ do_child(int master_fd, const char *path, char *const *argv)

     

       
17
       
26
       
 
       
 		if (setgid(sgid))

     

       
18
       
27
       
 
       
 			break;

     

       
19
       
28
       
 
       
 

     
···

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

     

       
22
       
31
       
 
       
 		break;

     

       
23
       
32
       
 
       
 	}

     

       
24
       
24
       
-
       
 

     

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

     

···

       
24
       
24
       
 
       
  patches = [

     

       
25
       
25
       
 
       
    ./ssh_path.patch

     

       
26
       
26
       
 
       
    ./mosh-client_path.patch

     

       
27
       
27
       
-
       
    ./utempter_path.patch

     

       
28
       
27
       
 
       
    # Fix build with bash-completion 2.10

     

       
29
       
28
       
 
       
    ./bash_completion_datadir.patch

     

       
30
       
29
       
 
       
  ];

     

···

       
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 ) {