Sun Jan 23 13:30:33 2022 UTC ()
Fix Tribblix build. While here, modernize a patch filename and add a
patch comment.


(schmonz)
diff -r1.11 -r1.12 pkgsrc/devel/libowfat/distinfo
diff -r0 -r1.1 pkgsrc/devel/libowfat/patches/patch-GNUmakefile
diff -r0 -r1.1 pkgsrc/devel/libowfat/patches/patch-socket_socket__quickack.c
diff -r1.4 -r0 pkgsrc/devel/libowfat/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/devel/libowfat/patches/patch-io_iom__init.c
cvs diff -r1.11 -r1.12 pkgsrc/devel/libowfat/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libowfat/distinfo 2021/10/26 10:15:26 1.11
+++ pkgsrc/devel/libowfat/distinfo 2022/01/23 13:30:32 1.12
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.11 2021/10/26 10:15:26 nia Exp $ 1$NetBSD: distinfo,v 1.12 2022/01/23 13:30:32 schmonz Exp $
2 2
3BLAKE2s (libowfat-0.32.tar.xz) = ea6f4e18d21d62e21293e1cd50a08482474e02e310f43c3e2bc758b544226eca 3BLAKE2s (libowfat-0.32.tar.xz) = ea6f4e18d21d62e21293e1cd50a08482474e02e310f43c3e2bc758b544226eca
4SHA512 (libowfat-0.32.tar.xz) = c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b 4SHA512 (libowfat-0.32.tar.xz) = c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
5Size (libowfat-0.32.tar.xz) = 195820 bytes 5Size (libowfat-0.32.tar.xz) = 195820 bytes
6SHA1 (patch-aa) = 5f7cbfd30e151957b18439bb3bacabe17c292d47 6SHA1 (patch-GNUmakefile) = 5f7cbfd30e151957b18439bb3bacabe17c292d47
7SHA1 (patch-io_io__sendfile.c) = 22ece69cb1c55d4710d7c6e562d32fcbeca7a18c 7SHA1 (patch-io_io__sendfile.c) = 22ece69cb1c55d4710d7c6e562d32fcbeca7a18c
8SHA1 (patch-io_iom__init.c) = 0fbb7984e526ee78259339cac8d1cb43d2ac3cd7 8SHA1 (patch-io_iom__init.c) = 0a8a3ea1809c0661b5692b819b0f616eeb38a1d0
9SHA1 (patch-io_iom__wait.c) = c9d00bc6a42f901c9552f779de7fadeb75e713bc 9SHA1 (patch-io_iom__wait.c) = c9d00bc6a42f901c9552f779de7fadeb75e713bc
10SHA1 (patch-mmap_mmap__readat.c) = 1c7ef7996491496fe943aa5f47213e3fcd46269e 10SHA1 (patch-mmap_mmap__readat.c) = 1c7ef7996491496fe943aa5f47213e3fcd46269e
11SHA1 (patch-scan_scan__iso8601.c) = 761d9941e8310d2c56020cee51261d0378530b56 11SHA1 (patch-scan_scan__iso8601.c) = 761d9941e8310d2c56020cee51261d0378530b56
 12SHA1 (patch-socket_socket__quickack.c) = 85271060a9c0026c264a1aea3006b3d444ddcb8b
12SHA1 (patch-tai_tai__now__libowfat.3) = cd51600b7c0da29ccca3c649039f8fe07f7276c9 13SHA1 (patch-tai_tai__now__libowfat.3) = cd51600b7c0da29ccca3c649039f8fe07f7276c9
13SHA1 (patch-tai_tai__pack__libowfat.3) = 8dd463a76d289773827793538373a7a029617a0a 14SHA1 (patch-tai_tai__pack__libowfat.3) = 8dd463a76d289773827793538373a7a029617a0a
14SHA1 (patch-taia_taia__now__libowfat.3) = 0d9aa54facfc7b26d952a952a431c65b62db95ed 15SHA1 (patch-taia_taia__now__libowfat.3) = 0d9aa54facfc7b26d952a952a431c65b62db95ed
15SHA1 (patch-taia_taia__pack__libowfat.3) = 8298df8d3101a2567ba4933f09b789efe0c2bb7b 16SHA1 (patch-taia_taia__pack__libowfat.3) = 8298df8d3101a2567ba4933f09b789efe0c2bb7b
File Added: pkgsrc/devel/libowfat/patches/patch-GNUmakefile
$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 \
File Added: pkgsrc/devel/libowfat/patches/patch-socket_socket__quickack.c
$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
File Deleted: pkgsrc/devel/libowfat/patches/Attic/patch-aa
cvs diff -r1.1 -r1.2 pkgsrc/devel/libowfat/patches/patch-io_iom__init.c (expand / switch to unified diff)

--- pkgsrc/devel/libowfat/patches/patch-io_iom__init.c 2019/12/22 22:23:00 1.1
+++ pkgsrc/devel/libowfat/patches/patch-io_iom__init.c 2022/01/23 13:30:33 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-io_iom__init.c,v 1.1 2019/12/22 22:23:00 joerg Exp $ 1$NetBSD: patch-io_iom__init.c,v 1.2 2022/01/23 13:30:33 schmonz Exp $
 2
 3Fix build on systems with kqueue(2).
2 4
3--- io/iom_init.c.orig 2019-12-22 18:12:04.396371533 +0000 5--- io/iom_init.c.orig 2019-12-22 18:12:04.396371533 +0000
4+++ io/iom_init.c 6+++ io/iom_init.c
5@@ -6,6 +6,8 @@ 7@@ -6,6 +6,8 @@
6 #include <sys/types.h> 8 #include <sys/types.h>
7 #include <sys/event.h> 9 #include <sys/event.h>
8 #include <sys/time.h> 10 #include <sys/time.h>
9+#include <sys/fcntl.h> 11+#include <sys/fcntl.h>
10+#include <unistd.h> 12+#include <unistd.h>
11 #endif 13 #endif
12  14
13 int iom_init(iomux_t* c) { 15 int iom_init(iomux_t* c) {