From 8e97da49d03e689736ea927047d9b0886ea04d6e Mon Sep 17 00:00:00 2001
From: Alexander Sosedkin <monk@unboiled.info>
Date: Fri, 12 Jun 2020 21:27:39 +0200
Subject: [PATCH] Add an overlay for fixing typespeed

---
 overlays/default.nix                  |  1 +
 overlays/typespeed-no-drop-priv.patch | 35 +++++++++++++++++++++++++++
 overlays/typespeed.nix                | 15 ++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 overlays/typespeed-no-drop-priv.patch
 create mode 100644 overlays/typespeed.nix

diff --git a/overlays/default.nix b/overlays/default.nix
index 66f4fc6..31f4e65 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -2,4 +2,5 @@
 
 [
   (import ./htop.nix)
+  (import ./typespeed.nix)
 ]
diff --git a/overlays/typespeed-no-drop-priv.patch b/overlays/typespeed-no-drop-priv.patch
new file mode 100644
index 0000000..eedc187
--- /dev/null
+++ b/overlays/typespeed-no-drop-priv.patch
@@ -0,0 +1,35 @@
+diff -ru typespeed-0.6.5/src/typespeed.c typespeed/src/typespeed.c
+--- a/src/typespeed.c	2008-08-13 16:36:51.000000000 +0200
++++ b/src/typespeed.c	2020-06-12 20:59:08.682552635 +0200
+@@ -322,31 +322,6 @@
+ 	if ((hfd = open(HIGHFILE, O_RDWR, 0)) == -1)
+ 		xerr(1, "main: open: %s", HIGHFILE);
+ 
+-#ifndef WIN32
+-	/* drop privileges */
+-	mygid = getgid();
+-#if defined(HAVE_SETRESGID)
+-	if (setresgid(mygid, mygid, mygid) == -1) {
+-		fputs("Cannot drop privilege!\n", stderr);
+-		exit(1);
+-	}
+-#elif defined(HAVE_RESREGID)
+-	if (setregid(mygid, mygid) == -1) {
+-		fputs("Cannot drop privilege!\n", stderr);
+-		exit(1);
+-	}
+-#else
+-	if (setegid(mygid) == -1) {
+-		fputs("Cannot drop privilege!\n", stderr);
+-		exit(1);
+-	}
+-	if (setgid(mygid) == -1) {
+-		fputs("Cannot drop privilege!\n", stderr);
+-		exit(1);
+-	}
+-#endif /* HAVE_SETRESGID */
+-#endif /* WIN32 */
+-
+ 	/* check file descriptors for consistency */
+ 	if (hfd == STDIN_FILENO || hfd == STDOUT_FILENO ||
+ 	    hfd == STDERR_FILENO)
diff --git a/overlays/typespeed.nix b/overlays/typespeed.nix
new file mode 100644
index 0000000..421b539
--- /dev/null
+++ b/overlays/typespeed.nix
@@ -0,0 +1,15 @@
+# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE.
+
+self: super:
+
+let
+  nixpkgs = import ./lib/nixpkgs.nix { inherit super; };
+in
+
+{
+  typespeed = nixpkgs.typespeed.overrideAttrs (old: {
+    patches = nixpkgs.typespeed.patches ++ [
+        ./typespeed-no-drop-priv.patch
+    ];
+  });
+}