Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7331B84EBF for ; Thu, 9 Nov 2023 19:26:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Rb-hK1Wi88Co for ; Thu, 9 Nov 2023 19:26:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2F80C84D66 for ; Thu, 9 Nov 2023 19:26:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 28F85FA2F; Thu, 9 Nov 2023 19:26:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1699557961223180" MIME-Version: 1.0 Date: Thu, 9 Nov 2023 19:26:01 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/devel/libowfat To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20231109192601.28F85FA2F@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1699557961223180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Thu Nov 9 19:26:01 UTC 2023 Modified Files: pkgsrc/devel/libowfat: Makefile PLIST distinfo pkgsrc/devel/libowfat/patches: patch-io_io__sendfile.c patch-mmap_mmap__readat.c patch-socket_socket__quickack.c Added Files: pkgsrc/devel/libowfat/patches: patch-socket_socket__accept4__flags.c patch-socket_socket__accept6__flags.c Removed Files: pkgsrc/devel/libowfat/patches: patch-io_iom__init.c patch-io_iom__wait.c Log Message: libowfat: update to 0.33. Changes: - add byte_start, byte_starts - add a man page for byte_equal_notimingattack - buffer_seek is no longer limited to the current buffer contents - add automated way to run unit test: make check - add parse.h - add bytestream abstraction for parsing data from a buffer or a file - add compiler.h to abstract gcc attributes - add fmt_strm_malloc - add cross references to open_* and mmap_* man pages - add fmt_strm_alloca and fmt_strm_malloc man pages - add buffer_init_allocbuf, buffer_init_read, buffer_init_write, buffer_init_read_allocbuf, buffer_init_write_allocbuf - fix buffer overread for len=0 in scan_longn (Martin Castillo) - add iob_write2 with sendfile callback so caller can use OpenSSL's SSL_sendfile To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/libowfat/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/libowfat/PLIST cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/libowfat/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/devel/libowfat/patches/patch-io_io__sendfile.c \ pkgsrc/devel/libowfat/patches/patch-mmap_mmap__readat.c \ pkgsrc/devel/libowfat/patches/patch-socket_socket__quickack.c cvs rdiff -u -r1.2 -r0 pkgsrc/devel/libowfat/patches/patch-io_iom__init.c \ pkgsrc/devel/libowfat/patches/patch-io_iom__wait.c cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/libowfat/patches/patch-socket_socket__accept4__flags.c \ pkgsrc/devel/libowfat/patches/patch-socket_socket__accept6__flags.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1699557961223180 Content-Disposition: inline Content-Length: 11517 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/libowfat/Makefile diff -u pkgsrc/devel/libowfat/Makefile:1.11 pkgsrc/devel/libowfat/Makefile:1.12 --- pkgsrc/devel/libowfat/Makefile:1.11 Sat Oct 14 16:52:54 2023 +++ pkgsrc/devel/libowfat/Makefile Thu Nov 9 19:26:00 2023 @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2023/10/14 16:52:54 schmonz Exp $ -# +# $NetBSD: Makefile,v 1.12 2023/11/09 19:26:00 schmonz Exp $ -DISTNAME= libowfat-0.32 -PKGREVISION= 2 +DISTNAME= libowfat-0.33 CATEGORIES= devel MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .tar.xz @@ -22,4 +20,10 @@ post-extract: ${MV} taia/taia_now.3 taia/taia_now_libowfat.3; \ ${MV} taia/taia_pack.3 taia/taia_pack_libowfat.3 +# work around missing dependency for parallel builds +pre-build: + cd ${WRKSRC}; \ + ${BUILD_MAKE_CMD} headers; \ + ${BUILD_MAKE_CMD} ent + .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/libowfat/PLIST diff -u pkgsrc/devel/libowfat/PLIST:1.6 pkgsrc/devel/libowfat/PLIST:1.7 --- pkgsrc/devel/libowfat/PLIST:1.6 Tue Jul 16 21:39:11 2019 +++ pkgsrc/devel/libowfat/PLIST Thu Nov 9 19:26:00 2023 @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.6 2019/07/16 21:39:11 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.7 2023/11/09 19:26:00 schmonz Exp $ include/libowfat/array.h include/libowfat/buffer.h include/libowfat/byte.h include/libowfat/case.h include/libowfat/cdb.h include/libowfat/cdb_make.h +include/libowfat/compiler.h include/libowfat/compiletimeassert.h include/libowfat/critbit.h include/libowfat/dns.h @@ -22,6 +23,7 @@ include/libowfat/mmap.h include/libowfat/ndelay.h include/libowfat/open.h include/libowfat/openreadclose.h +include/libowfat/parse.h include/libowfat/rangecheck.h include/libowfat/readclose.h include/libowfat/safemult.h @@ -56,6 +58,7 @@ man/man3/array_start.3 man/man3/array_trunc.3 man/man3/array_truncate.3 man/man3/assign.3 +man/man3/bs_capacityassert.3 man/man3/buffer.3 man/man3/buffer_close.3 man/man3/buffer_feed.3 @@ -79,6 +82,7 @@ man/man3/buffer_init.3 man/man3/buffer_init_free.3 man/man3/buffer_mmapread.3 man/man3/buffer_peek.3 +man/man3/buffer_peekc.3 man/man3/buffer_put.3 man/man3/buffer_put8long.3 man/man3/buffer_putalign.3 @@ -105,8 +109,13 @@ man/man3/byte_copy.3 man/man3/byte_copyr.3 man/man3/byte_diff.3 man/man3/byte_equal.3 +man/man3/byte_equal_notimingattack.3 man/man3/byte_rchr.3 +man/man3/byte_start.3 +man/man3/byte_starts.3 man/man3/byte_zero.3 +man/man3/carp.3 +man/man3/carpsys.3 man/man3/case_diffb.3 man/man3/case_diffs.3 man/man3/case_lowerb.3 @@ -128,6 +137,8 @@ man/man3/critbit0_clear.3 man/man3/critbit0_contains.3 man/man3/critbit0_delete.3 man/man3/critbit0_insert.3 +man/man3/die.3 +man/man3/diesys.3 man/man3/dns_ip4.3 man/man3/dns_ip4_packet.3 man/man3/dns_ip4_qualify.3 @@ -143,9 +154,12 @@ man/man3/dns_name6_domain.3 man/man3/dns_name_packet.3 man/man3/dns_txt.3 man/man3/dns_txt_packet.3 +man/man3/errmsg_iam.3 man/man3/fmt_8long.3 man/man3/fmt_asn1derlength.3 man/man3/fmt_asn1dertag.3 +man/man3/fmt_copybytes.3 +man/man3/fmt_copybytes_sizeof_minus1.3 man/man3/fmt_double.3 man/man3/fmt_fill.3 man/man3/fmt_httpdate.3 @@ -166,6 +180,8 @@ man/man3/fmt_pad.3 man/man3/fmt_plusminus.3 man/man3/fmt_str.3 man/man3/fmt_strm.3 +man/man3/fmt_strm_alloca.3 +man/man3/fmt_strm_malloc.3 man/man3/fmt_strn.3 man/man3/fmt_uint.3 man/man3/fmt_uint0.3 @@ -241,6 +257,8 @@ man/man3/mmap_read.3 man/man3/mmap_readat.3 man/man3/mmap_shared.3 man/man3/mmap_unmap.3 +man/man3/msg.3 +man/man3/msgsys.3 man/man3/ndelay_off.3 man/man3/ndelay_on.3 man/man3/open_append.3 @@ -303,7 +321,13 @@ man/man3/scan_xlong.3 man/man3/scan_xlonglong.3 man/man3/scan_xshort.3 man/man3/socket_accept4.3 +man/man3/socket_accept4_makenonblocking.3 +man/man3/socket_accept4_makenonblocking_setcloseonexec.3 +man/man3/socket_accept4_setcloseonexec.3 man/man3/socket_accept6.3 +man/man3/socket_accept6_makenonblocking.3 +man/man3/socket_accept6_makenonblocking_setcloseonexec.3 +man/man3/socket_accept6_setcloseonexec.3 man/man3/socket_bind4.3 man/man3/socket_bind4_reuse.3 man/man3/socket_bind6.3 Index: pkgsrc/devel/libowfat/distinfo diff -u pkgsrc/devel/libowfat/distinfo:1.13 pkgsrc/devel/libowfat/distinfo:1.14 --- pkgsrc/devel/libowfat/distinfo:1.13 Thu Nov 3 00:00:08 2022 +++ pkgsrc/devel/libowfat/distinfo Thu Nov 9 19:26:00 2023 @@ -1,16 +1,16 @@ -$NetBSD: distinfo,v 1.13 2022/11/03 00:00:08 schmonz Exp $ +$NetBSD: distinfo,v 1.14 2023/11/09 19:26:00 schmonz Exp $ -BLAKE2s (libowfat-0.32.tar.xz) = ea6f4e18d21d62e21293e1cd50a08482474e02e310f43c3e2bc758b544226eca -SHA512 (libowfat-0.32.tar.xz) = c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b -Size (libowfat-0.32.tar.xz) = 195820 bytes +BLAKE2s (libowfat-0.33.tar.xz) = 31706dc1a4ba7c3f17498c45b59030581152f4c4fbb680aaeda9ba377fee7230 +SHA512 (libowfat-0.33.tar.xz) = 03a56bcbc1a58e340c473d260877218a35841a6915a8369381d74463244cd754fc736006344814855c4d33598ad811d51b7fff4ba41c5e6d38d56297903dcaf5 +Size (libowfat-0.33.tar.xz) = 213920 bytes SHA1 (patch-GNUmakefile) = 5f7cbfd30e151957b18439bb3bacabe17c292d47 -SHA1 (patch-io_io__sendfile.c) = 22ece69cb1c55d4710d7c6e562d32fcbeca7a18c -SHA1 (patch-io_iom__init.c) = 0a8a3ea1809c0661b5692b819b0f616eeb38a1d0 -SHA1 (patch-io_iom__wait.c) = c9d00bc6a42f901c9552f779de7fadeb75e713bc -SHA1 (patch-mmap_mmap__readat.c) = 1c7ef7996491496fe943aa5f47213e3fcd46269e +SHA1 (patch-io_io__sendfile.c) = b275fadf236220207cd90e2a44f739d91656b253 +SHA1 (patch-mmap_mmap__readat.c) = bd0c8bb8a9c74e51ad55153ad9e855fb64be6f2e SHA1 (patch-scan_scan__httpdate.c) = e6e4ddfc82796ac57cc2962d387b96534f8c445b SHA1 (patch-scan_scan__iso8601.c) = 97690d6dd13f60548a29b3b175dfa1aaf6d0c48e -SHA1 (patch-socket_socket__quickack.c) = 85271060a9c0026c264a1aea3006b3d444ddcb8b +SHA1 (patch-socket_socket__accept4__flags.c) = 7c0881f7ddcee72578fcc42d131f845b1162def5 +SHA1 (patch-socket_socket__accept6__flags.c) = eb1ddc1fda7f8efd8ad1e2e5c6d26667f33063fe +SHA1 (patch-socket_socket__quickack.c) = d30d9a87ad4531d538269b6f88eca4488df78e2e SHA1 (patch-tai_tai__now__libowfat.3) = cd51600b7c0da29ccca3c649039f8fe07f7276c9 SHA1 (patch-tai_tai__pack__libowfat.3) = 8dd463a76d289773827793538373a7a029617a0a SHA1 (patch-taia_taia__now__libowfat.3) = 0d9aa54facfc7b26d952a952a431c65b62db95ed Index: pkgsrc/devel/libowfat/patches/patch-io_io__sendfile.c diff -u pkgsrc/devel/libowfat/patches/patch-io_io__sendfile.c:1.1 pkgsrc/devel/libowfat/patches/patch-io_io__sendfile.c:1.2 --- pkgsrc/devel/libowfat/patches/patch-io_io__sendfile.c:1.1 Fri Jun 26 19:21:52 2020 +++ pkgsrc/devel/libowfat/patches/patch-io_io__sendfile.c Thu Nov 9 19:26:00 2023 @@ -1,10 +1,10 @@ -$NetBSD: patch-io_io__sendfile.c,v 1.1 2020/06/26 19:21:52 schmonz Exp $ +$NetBSD: patch-io_io__sendfile.c,v 1.2 2023/11/09 19:26:00 schmonz Exp $ Fix Illumos build. ---- io/io_sendfile.c.orig 2014-06-05 19:17:24.000000000 +0000 +--- io/io_sendfile.c.orig 2022-04-25 14:21:38.000000000 +0000 +++ io/io_sendfile.c -@@ -49,7 +49,9 @@ int64 io_sendfile(int64 out,int64 in,uin +@@ -43,7 +43,9 @@ int64 io_sendfile(int64 out,int64 in,uin #elif defined (__sun__) && defined(__svr4__) @@ -14,12 +14,3 @@ Fix Illumos build. #include #include #include -@@ -59,7 +61,7 @@ int64 io_sendfile(int64 out,int64 in,uin - long long r=sendfile64(out,in,&o,bytes); - if (r==-1 && errno!=EAGAIN) r=-3; - if (r!=bytes) { -- io_entry* e=iarray_get(&io_fds,s); -+ io_entry* e=iarray_get(&io_fds,out); - if (e) { - e->canwrite=0; - e->next_write=-1; Index: pkgsrc/devel/libowfat/patches/patch-mmap_mmap__readat.c diff -u pkgsrc/devel/libowfat/patches/patch-mmap_mmap__readat.c:1.1 pkgsrc/devel/libowfat/patches/patch-mmap_mmap__readat.c:1.2 --- pkgsrc/devel/libowfat/patches/patch-mmap_mmap__readat.c:1.1 Fri Jun 26 19:21:52 2020 +++ pkgsrc/devel/libowfat/patches/patch-mmap_mmap__readat.c Thu Nov 9 19:26:00 2023 @@ -1,13 +1,13 @@ -$NetBSD: patch-mmap_mmap__readat.c,v 1.1 2020/06/26 19:21:52 schmonz Exp $ +$NetBSD: patch-mmap_mmap__readat.c,v 1.2 2023/11/09 19:26:00 schmonz Exp $ Fix Illumos build. ---- mmap/mmap_readat.c.orig 2016-09-16 16:22:00.000000000 +0000 +--- mmap/mmap_readat.c.orig 2019-04-23 13:25:27.000000000 +0000 +++ mmap/mmap_readat.c -@@ -4,6 +4,7 @@ +@@ -3,6 +3,7 @@ + #include - #include - #ifndef __MINGW32__ + #ifndef _WIN32 +#include #include #include Index: pkgsrc/devel/libowfat/patches/patch-socket_socket__quickack.c diff -u pkgsrc/devel/libowfat/patches/patch-socket_socket__quickack.c:1.1 pkgsrc/devel/libowfat/patches/patch-socket_socket__quickack.c:1.2 --- pkgsrc/devel/libowfat/patches/patch-socket_socket__quickack.c:1.1 Sun Jan 23 13:30:33 2022 +++ pkgsrc/devel/libowfat/patches/patch-socket_socket__quickack.c Thu Nov 9 19:26:00 2023 @@ -1,8 +1,8 @@ -$NetBSD: patch-socket_socket__quickack.c,v 1.1 2022/01/23 13:30:33 schmonz Exp $ +$NetBSD: patch-socket_socket__quickack.c,v 1.2 2023/11/09 19:26:00 schmonz Exp $ Follow socket/socket_fastopen.c's example to fix Illumos build. ---- socket/socket_quickack.c.orig 2015-04-23 15:15:08.000000000 +0000 +--- socket/socket_quickack.c.orig 2019-02-21 12:39:44.000000000 +0000 +++ socket/socket_quickack.c @@ -6,8 +6,12 @@ #endif @@ -17,4 +17,4 @@ Follow socket/socket_fastopen.c's exampl +#if defined(SOL_TCP) && defined(TCP_QUICKACK) return setsockopt(s, SOL_TCP, TCP_QUICKACK, &value, sizeof(int)); #else - #ifdef ENOPROTOOPT + (void)s; // shut up unused variable warnings Added files: Index: pkgsrc/devel/libowfat/patches/patch-socket_socket__accept4__flags.c diff -u /dev/null pkgsrc/devel/libowfat/patches/patch-socket_socket__accept4__flags.c:1.1 --- /dev/null Thu Nov 9 19:26:01 2023 +++ pkgsrc/devel/libowfat/patches/patch-socket_socket__accept4__flags.c Thu Nov 9 19:26:00 2023 @@ -0,0 +1,19 @@ +$NetBSD: patch-socket_socket__accept4__flags.c,v 1.1 2023/11/09 19:26:00 schmonz Exp $ + +Don't use socket flags when they're not available. + +--- socket/socket_accept4_flags.c.orig 2021-04-27 17:39:43.000000000 +0000 ++++ socket/socket_accept4_flags.c +@@ -84,8 +84,12 @@ incoming: + fd=-1; + else { + int flg=0; ++#ifdef SOCK_NONBLOCK + if (flags & SOCKET_NONBLOCK) flg += SOCK_NONBLOCK; ++#endif ++#ifdef SOCK_CLOEXEC + if (flags & SOCKET_CLOEXEC) flg += SOCK_CLOEXEC; ++#endif + if ((fd=accept4(s,(void*) &si, &len, flg))==-1) { + if (errno != ENOSYS) + return -1; Index: pkgsrc/devel/libowfat/patches/patch-socket_socket__accept6__flags.c diff -u /dev/null pkgsrc/devel/libowfat/patches/patch-socket_socket__accept6__flags.c:1.1 --- /dev/null Thu Nov 9 19:26:01 2023 +++ pkgsrc/devel/libowfat/patches/patch-socket_socket__accept6__flags.c Thu Nov 9 19:26:00 2023 @@ -0,0 +1,19 @@ +$NetBSD: patch-socket_socket__accept6__flags.c,v 1.1 2023/11/09 19:26:00 schmonz Exp $ + +Don't use socket flags when they're not available. + +--- socket/socket_accept6_flags.c.orig 2021-04-27 17:39:44.000000000 +0000 ++++ socket/socket_accept6_flags.c +@@ -98,8 +98,12 @@ incoming: + fd=-1; + else { + int flg=0; ++#ifdef SOCK_NONBLOCK + if (flags & SOCKET_NONBLOCK) flg += SOCK_NONBLOCK; ++#endif ++#ifdef SOCK_CLOEXEC + if (flags & SOCKET_CLOEXEC) flg += SOCK_CLOEXEC; ++#endif + if ((fd=accept4(s,(void*) &sa, &dummy, flg))==-1) { + if (errno != ENOSYS) + return -1; --_----------=_1699557961223180--