summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorbsiegert <bsiegert>2012-12-27 17:01:23 +0000
committerbsiegert <bsiegert>2012-12-27 17:01:23 +0000
commit3a5d189b750d915c92b6fe0f1e29d8718951cead (patch)
tree3a29c6feb66d693e0e7c8edd2b7b0999d10738d6 /devel
parente55317e5b62b6bf7bcfa643b05d1461164201828 (diff)
downloadpkgsrc-3a5d189b750d915c92b6fe0f1e29d8718951cead.tar.gz
Unbreak on MirBSD and OpenBSD.
Freeze exception granted by Greg Troxel.
Diffstat (limited to 'devel')
-rw-r--r--devel/libdaemon/distinfo3
-rw-r--r--devel/libdaemon/patches/patch-libdaemon_dexec.c19
2 files changed, 21 insertions, 1 deletions
diff --git a/devel/libdaemon/distinfo b/devel/libdaemon/distinfo
index 8e7fcf11f75..6896b1b3897 100644
--- a/devel/libdaemon/distinfo
+++ b/devel/libdaemon/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2009/12/20 23:29:02 tnn Exp $
+$NetBSD: distinfo,v 1.8 2012/12/27 17:01:23 bsiegert Exp $
SHA1 (libdaemon-0.14.tar.gz) = 78a4db58cf3a7a8906c35592434e37680ca83b8f
RMD160 (libdaemon-0.14.tar.gz) = 952ae993fecfe3ec765dfa43b2690a83f1a5c939
Size (libdaemon-0.14.tar.gz) = 340474 bytes
SHA1 (patch-aa) = f0d309bd98b19a9fcec785edfe686dd33746bf46
SHA1 (patch-ab) = bb882643ecd8deedfb76f88ee4dea1ce42da2636
+SHA1 (patch-libdaemon_dexec.c) = c7d77b298b0e135ed94b8ddd6ce62f3b859d5275
diff --git a/devel/libdaemon/patches/patch-libdaemon_dexec.c b/devel/libdaemon/patches/patch-libdaemon_dexec.c
new file mode 100644
index 00000000000..bc880e57d3f
--- /dev/null
+++ b/devel/libdaemon/patches/patch-libdaemon_dexec.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-libdaemon_dexec.c,v 1.1 2012/12/27 17:01:23 bsiegert Exp $
+
+MirBSD does not have ECANCELED. EINTR is not really the right return value.
+IMHO, it should return with exit status set to 127 instead.
+
+--- libdaemon/dexec.c.orig Thu Dec 13 00:17:52 2012
++++ libdaemon/dexec.c
+@@ -203,7 +203,11 @@ int daemon_execv(const char *dir, int *r
+ return -1;
+ } else {
+ if (!WIFEXITED(r)) {
++#ifdef ECANCELED
+ errno = ECANCELED;
++#else
++ errno = EINTR; /* The child was terminated by a signal. */
++#endif
+ return -1;
+ }
+