Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_16429446336330"
MIME-Version: 1.0
Date: Sun, 23 Jan 2022 13:30:33 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/devel/libowfat
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20220123133033.3A89AFB24@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_16429446336330
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Sun Jan 23 13:30:33 UTC 2022

Modified Files:
	pkgsrc/devel/libowfat: distinfo
	pkgsrc/devel/libowfat/patches: patch-io_iom__init.c
Added Files:
	pkgsrc/devel/libowfat/patches: patch-GNUmakefile
	    patch-socket_socket__quickack.c
Removed Files:
	pkgsrc/devel/libowfat/patches: patch-aa

Log Message:
Fix Tribblix build. While here, modernize a patch filename and add a
patch comment.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/libowfat/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libowfat/patches/patch-GNUmakefile \
    pkgsrc/devel/libowfat/patches/patch-socket_socket__quickack.c
cvs rdiff -u -r1.4 -r0 pkgsrc/devel/libowfat/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libowfat/patches/patch-io_iom__init.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_16429446336330
Content-Disposition: inline
Content-Length: 4073
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/libowfat/distinfo
diff -u pkgsrc/devel/libowfat/distinfo:1.11 pkgsrc/devel/libowfat/distinfo:1.12
--- pkgsrc/devel/libowfat/distinfo:1.11	Tue Oct 26 10:15:26 2021
+++ pkgsrc/devel/libowfat/distinfo	Sun Jan 23 13:30:32 2022
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:15:26 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/01/23 13:30:32 schmonz Exp $
 
 BLAKE2s (libowfat-0.32.tar.xz) = ea6f4e18d21d62e21293e1cd50a08482474e02e310f43c3e2bc758b544226eca
 SHA512 (libowfat-0.32.tar.xz) = c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
 Size (libowfat-0.32.tar.xz) = 195820 bytes
-SHA1 (patch-aa) = 5f7cbfd30e151957b18439bb3bacabe17c292d47
+SHA1 (patch-GNUmakefile) = 5f7cbfd30e151957b18439bb3bacabe17c292d47
 SHA1 (patch-io_io__sendfile.c) = 22ece69cb1c55d4710d7c6e562d32fcbeca7a18c
-SHA1 (patch-io_iom__init.c) = 0fbb7984e526ee78259339cac8d1cb43d2ac3cd7
+SHA1 (patch-io_iom__init.c) = 0a8a3ea1809c0661b5692b819b0f616eeb38a1d0
 SHA1 (patch-io_iom__wait.c) = c9d00bc6a42f901c9552f779de7fadeb75e713bc
 SHA1 (patch-mmap_mmap__readat.c) = 1c7ef7996491496fe943aa5f47213e3fcd46269e
 SHA1 (patch-scan_scan__iso8601.c) = 761d9941e8310d2c56020cee51261d0378530b56
+SHA1 (patch-socket_socket__quickack.c) = 85271060a9c0026c264a1aea3006b3d444ddcb8b
 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_iom__init.c
diff -u pkgsrc/devel/libowfat/patches/patch-io_iom__init.c:1.1 pkgsrc/devel/libowfat/patches/patch-io_iom__init.c:1.2
--- pkgsrc/devel/libowfat/patches/patch-io_iom__init.c:1.1	Sun Dec 22 22:23:00 2019
+++ pkgsrc/devel/libowfat/patches/patch-io_iom__init.c	Sun Jan 23 13:30:33 2022
@@ -1,4 +1,6 @@
-$NetBSD: patch-io_iom__init.c,v 1.1 2019/12/22 22:23:00 joerg Exp $
+$NetBSD: patch-io_iom__init.c,v 1.2 2022/01/23 13:30:33 schmonz Exp $
+
+Fix build on systems with kqueue(2).
 
 --- io/iom_init.c.orig	2019-12-22 18:12:04.396371533 +0000
 +++ io/iom_init.c

Added files:

Index: pkgsrc/devel/libowfat/patches/patch-GNUmakefile
diff -u /dev/null pkgsrc/devel/libowfat/patches/patch-GNUmakefile:1.1
--- /dev/null	Sun Jan 23 13:30:33 2022
+++ pkgsrc/devel/libowfat/patches/patch-GNUmakefile	Sun Jan 23 13:30:33 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-GNUmakefile,v 1.1 2022/01/23 13:30:33 schmonz Exp $
+
+Follow hier(7) and support PKGMANDIR.
+
+--- GNUmakefile.orig	2018-08-24 12:00:46.000000000 +0000
++++ GNUmakefile
+@@ -4,10 +4,10 @@
+ # in /opt/diet, where they are in the default search path for my diet libc
+ # work but don't conflict with anything there.  YMMV.
+ 
+-prefix=/opt/diet
++prefix=${PREFIX}
+ LIBDIR=${prefix}/lib
+ INCLUDEDIR=${prefix}/include
+-MAN3DIR=${prefix}/man/man3
++MAN3DIR=${prefix}/${PKGMANDIR}/man3
+ 
+ LIBS=byte.a fmt.a scan.a str.a uint.a open.a stralloc.a unix.a socket.a \
+ buffer.a mmap.a taia.a tai.a dns.a case.a mult.a array.a io.a \
Index: pkgsrc/devel/libowfat/patches/patch-socket_socket__quickack.c
diff -u /dev/null pkgsrc/devel/libowfat/patches/patch-socket_socket__quickack.c:1.1
--- /dev/null	Sun Jan 23 13:30:33 2022
+++ pkgsrc/devel/libowfat/patches/patch-socket_socket__quickack.c	Sun Jan 23 13:30:33 2022
@@ -0,0 +1,20 @@
+$NetBSD: patch-socket_socket__quickack.c,v 1.1 2022/01/23 13:30:33 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
+@@ -6,8 +6,12 @@
+ #endif
+ #include <errno.h>
+ 
++#if defined(TCP_QUICKACK) && !defined(SOL_TCP) && defined(IPPROTO_TCP)
++#define SOL_TCP IPPROTO_TCP
++#endif
++
+ int socket_quickack(int s,int value) {
+-#ifdef TCP_QUICKACK
++#if defined(SOL_TCP) && defined(TCP_QUICKACK)
+   return setsockopt(s, SOL_TCP, TCP_QUICKACK, &value, sizeof(int));
+ #else
+ #ifdef ENOPROTOOPT


--_----------=_16429446336330--