summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2016-02-15 05:44:09 +0100
committerJeroen Roovers <jer@gentoo.org>2016-02-15 05:44:40 +0100
commit493288e791574c69448063d5a93ba6c0bd6f5dfd (patch)
tree6dbc840b452cbf778d13f1e924971f9b1601deb4 /x11-misc/slock
parentapp-emulation/q4wine: add Qt 5 support (diff)
downloadgentoo-493288e791574c69448063d5a93ba6c0bd6f5dfd.tar.gz
gentoo-493288e791574c69448063d5a93ba6c0bd6f5dfd.tar.bz2
gentoo-493288e791574c69448063d5a93ba6c0bd6f5dfd.zip
x11-misc/slock: Turn the correct die() into a warning.
Package-Manager: portage-2.2.27
Diffstat (limited to 'x11-misc/slock')
-rw-r--r--x11-misc/slock/files/slock-1.3-dontdieonme.patch13
-rw-r--r--x11-misc/slock/slock-1.3-r1.ebuild (renamed from x11-misc/slock/slock-1.3.ebuild)0
2 files changed, 7 insertions, 6 deletions
diff --git a/x11-misc/slock/files/slock-1.3-dontdieonme.patch b/x11-misc/slock/files/slock-1.3-dontdieonme.patch
index dd08ba710b57..bda110a2d5e6 100644
--- a/x11-misc/slock/files/slock-1.3-dontdieonme.patch
+++ b/x11-misc/slock/files/slock-1.3-dontdieonme.patch
@@ -1,10 +1,11 @@
--- a/slock.c
+++ b/slock.c
-@@ -55,7 +55,6 @@
- va_start(ap, errstr);
- vfprintf(stderr, errstr, ap);
- va_end(ap);
-- exit(1);
+@@ -81,7 +81,7 @@
+ die("buffer too small\n");
+
+ if (fd < 0 || write(fd, value, length) != length || close(fd) != 0)
+- die("cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock)\n");
++ fprintf(stderr, "cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock)\n");
}
+ #endif
- #ifdef __linux__
diff --git a/x11-misc/slock/slock-1.3.ebuild b/x11-misc/slock/slock-1.3-r1.ebuild
index 0cfb4d877271..0cfb4d877271 100644
--- a/x11-misc/slock/slock-1.3.ebuild
+++ b/x11-misc/slock/slock-1.3-r1.ebuild