Attachment 229852 Details for Bug 260181 – devel/libfixposix: cherry pick from upstream and take maintainership

[patch] devel/libfixposix: cherry pick from upstream and take maintainership

libfixposix-0.4.3_1.diff (text/plain), 2.41 KB, created by Filipe da Silva Santos on 2021-12-02 23:02:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Filipe da Silva Santos

Created: 2021-12-02 23:02:27 UTC

Size: 2.41 KB

patch

obsolete

>diff --git a/devel/libfixposix/Makefile b/devel/libfixposix/Makefile
>index eab4ef7..0bf0e39 100644
>--- a/devel/libfixposix/Makefile
>+++ b/devel/libfixposix/Makefile
>@@ -1,9 +1,10 @@
> PORTNAME=	libfixposix
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.4.3
>+PORTREVISION=	1
> CATEGORIES=	devel
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	ports@shiori.com.br
> COMMENT=	Replacement for inconsistent parts of POSIX
> 
> LICENSE=	BSL
>diff --git a/devel/libfixposix/distinfo b/devel/libfixposix/distinfo
>index 76323f1..e8b8fa8 100644
>--- a/devel/libfixposix/distinfo
>+++ b/devel/libfixposix/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1546150128
>+TIMESTAMP = 1638482744
> SHA256 (sionescu-libfixposix-v0.4.3_GH0.tar.gz) = 78fe8bcebf496520ac29b5b65049f5ec1977c6bd956640bdc6d1da6ea04d8504
> SIZE (sionescu-libfixposix-v0.4.3_GH0.tar.gz) = 40370
>diff --git a/devel/libfixposix/files/patch-src_lib_sendfile.c b/devel/libfixposix/files/patch-src_lib_sendfile.c
>new file mode 100644
>index 0000000..a184dd8
>--- /dev/null
>+++ b/devel/libfixposix/files/patch-src_lib_sendfile.c
>@@ -0,0 +1,38 @@
>+--- src/lib/sendfile.c.orig	2018-02-19 22:24:10 UTC
>++++ src/lib/sendfile.c
>+@@ -38,6 +38,7 @@ int sendfile(int, int, off_t, off_t *, void *, int);
>+ #endif
>+ 
>+ #include <stdlib.h>
>++#include <errno.h>
>+ 
>+ DSO_PUBLIC ssize_t
>+ lfp_sendfile(int out_fd, int in_fd, off_t offset, size_t nbytes)
>+@@ -46,18 +47,21 @@ lfp_sendfile(int out_fd, int in_fd, off_t offset, size
>+ # if defined(__linux__)
>+     off_t off = offset;
>+     return (ssize_t) sendfile(out_fd, in_fd, &off, nbytes);
>+-# elif defined(__FreeBSD__)
>+-    return (ssize_t) sendfile(in_fd, out_fd, offset, nbytes, NULL, NULL, SF_MNOWAIT);
>+-# elif defined(__DragonFly__)
>+-    return (ssize_t) sendfile(in_fd, out_fd, offset, nbytes, NULL, NULL, 0);
>++# elif defined(__FreeBSD__) || defined(__DragonFly__)
>++    off_t sbytes;
>++    int res = sendfile(in_fd, out_fd, offset, nbytes, NULL, &sbytes, 0);
>++    if (res == 0) { return sbytes; }
>++    return res;
>+ # elif defined(__APPLE__)
>+     off_t len = nbytes;
>+-    return (ssize_t) sendfile(in_fd, out_fd, offset, &len, NULL, 0);
>++    int res = sendfile(in_fd, out_fd, offset, &len, NULL, 0);
>++    if (res == 0) { return len; }
>++    return -1;
>+ # else
>+ #  error "It appears that this OS has sendfile(), but LFP doesn't use it at the moment"
>+ #  error "Please send an email to iolib-devel@common-lisp.net"
>+ # endif
>+ #else
>+-    return ENOSYS;
>++    SYSERR(ENOSYS);
>+ #endif
>+ }

Actions: View | Diff

Attachments on bug 260181: 229851 | 229852 | 229861