diff options
| -rw-r--r-- | net/ocamlnet/distinfo | 4 | ||||
| -rw-r--r-- | net/ocamlnet/patches/patch-src_netsys_netsys__c.c | 17 |
2 files changed, 16 insertions, 5 deletions
diff --git a/net/ocamlnet/distinfo b/net/ocamlnet/distinfo index da627555f71..6ffde88130b 100644 --- a/net/ocamlnet/distinfo +++ b/net/ocamlnet/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.13 2013/11/01 11:11:18 jaapb Exp $ +$NetBSD: distinfo,v 1.14 2013/12/12 18:13:17 jperkin Exp $ SHA1 (ocamlnet-3.7.3.tar.gz) = 8d5def2a162b772727b5af8f66a31a5c750656b0 RMD160 (ocamlnet-3.7.3.tar.gz) = 915ecf92b81e871d600fad3647e0927abdab0045 Size (ocamlnet-3.7.3.tar.gz) = 3352779 bytes SHA1 (patch-Makefile.rules) = ffe0b4a56e2b1f0449ee6ceedaeffdb5b5abbc9a -SHA1 (patch-src_netsys_netsys__c.c) = 0d188b95cae496cb0c535de5cfb2e0935c5ee0c0 +SHA1 (patch-src_netsys_netsys__c.c) = 046fdca6cb9c38ecb96696196bd13fb084d4ba2e diff --git a/net/ocamlnet/patches/patch-src_netsys_netsys__c.c b/net/ocamlnet/patches/patch-src_netsys_netsys__c.c index 391f0a1cb6c..466e992ec16 100644 --- a/net/ocamlnet/patches/patch-src_netsys_netsys__c.c +++ b/net/ocamlnet/patches/patch-src_netsys_netsys__c.c @@ -1,4 +1,4 @@ -$NetBSD: patch-src_netsys_netsys__c.c,v 1.3 2013/01/19 20:37:44 riastradh Exp $ +$NetBSD: patch-src_netsys_netsys__c.c,v 1.4 2013/12/12 18:13:17 jperkin Exp $ DragonFly doesn't define AT_SYMLINK_FOLLOW. The added patch will at least unbreak the build for some code that obviously won't work. @@ -6,7 +6,7 @@ https://sourceforge.net/tracker/?func=detail&aid=3545170&group_id=19774&atid=319 Also work around absence of AT_REMOVEDIR, as on NetBSD 6.0. ---- src/netsys/netsys_c.c.orig 2012-07-19 23:25:25.000000000 +0000 +--- src/netsys/netsys_c.c.orig 2013-08-30 18:38:26.000000000 +0000 +++ src/netsys/netsys_c.c @@ -428,6 +428,10 @@ CAMLprim value netsys_at_fdcwd(value dum #define AT_SYMLINK_NOFOLLOW 0 @@ -19,7 +19,18 @@ Also work around absence of AT_REMOVEDIR, as on NetBSD 6.0. static int at_flags_table[] = { AT_EACCESS, AT_SYMLINK_NOFOLLOW, AT_REMOVEDIR }; -@@ -528,7 +532,7 @@ CAMLprim value netsys_renameat(value old +@@ -479,8 +483,8 @@ CAMLprim value netsys_openat(value dirfd + if (ret == -1) uerror("openat", path); + #if defined(NEED_CLOEXEC_EMULATION) && defined(FD_CLOEXEC) + if (convert_flag_list(flags, open_cloexec_table) != 0) { +- int flags = fcntl(fd, F_GETFD, 0); +- if (flags == -1 || fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1) ++ int flags = fcntl(dirfd, F_GETFD, 0); ++ if (flags == -1 || fcntl(dirfd, F_SETFD, flags | FD_CLOEXEC) == -1) + uerror("openat", path); + } + #endif +@@ -545,7 +549,7 @@ CAMLprim value netsys_renameat(value old CAMLprim value netsys_linkat(value olddirfd, value oldpath, value newdirfd, value newpath, value flags) { |