CVS commit: pkgsrc/devel/libowfat

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Dec 22 22:23:00 UTC 2019

Modified Files:
        pkgsrc/devel/libowfat: Makefile distinfo
        pkgsrc/devel/libowfat/patches: patch-io_iom__wait.c
Added Files:
        pkgsrc/devel/libowfat/patches: patch-io_iom__init.c

Log Message:
Fix kqueue support. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/libowfat/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/libowfat/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libowfat/patches/patch-io_iom__init.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libowfat/patches/patch-io_iom__wait.c

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

Modified files:

Index: pkgsrc/devel/libowfat/Makefile
diff -u pkgsrc/devel/libowfat/Makefile:1.8 pkgsrc/devel/libowfat/Makefile:1.9
--- pkgsrc/devel/libowfat/Makefile:1.8  Tue Jul 16 21:39:11 2019
+++ pkgsrc/devel/libowfat/Makefile      Sun Dec 22 22:23:00 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2019/07/16 21:39:11 schmonz Exp $
+# $NetBSD: Makefile,v 1.9 2019/12/22 22:23:00 joerg Exp $
 #
 
 DISTNAME=      libowfat-0.32
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${HOMEPAGE}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/libowfat/distinfo
diff -u pkgsrc/devel/libowfat/distinfo:1.7 pkgsrc/devel/libowfat/distinfo:1.8
--- pkgsrc/devel/libowfat/distinfo:1.7  Tue Jul 16 21:39:11 2019
+++ pkgsrc/devel/libowfat/distinfo      Sun Dec 22 22:23:00 2019
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.7 2019/07/16 21:39:11 schmonz Exp $
+$NetBSD: distinfo,v 1.8 2019/12/22 22:23:00 joerg Exp $
 
 SHA1 (libowfat-0.32.tar.xz) = 7b66caa576e9ce2d789e230a5a42c63e4f103471
 RMD160 (libowfat-0.32.tar.xz) = 2338a3f31d55c3f6a97c3073664e6aeec198f28c
 SHA512 (libowfat-0.32.tar.xz) = c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
 Size (libowfat-0.32.tar.xz) = 195820 bytes
 SHA1 (patch-aa) = 5f7cbfd30e151957b18439bb3bacabe17c292d47
-SHA1 (patch-io_iom__wait.c) = a458e96b0b2cf27c92e8aafc8ea6d5199b389baf
+SHA1 (patch-io_iom__init.c) = 0fbb7984e526ee78259339cac8d1cb43d2ac3cd7
+SHA1 (patch-io_iom__wait.c) = c9d00bc6a42f901c9552f779de7fadeb75e713bc
 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__wait.c
diff -u pkgsrc/devel/libowfat/patches/patch-io_iom__wait.c:1.1 pkgsrc/devel/libowfat/patches/patch-io_iom__wait.c:1.2
--- pkgsrc/devel/libowfat/patches/patch-io_iom__wait.c:1.1      Sun Oct  7 12:13:46 2018
+++ pkgsrc/devel/libowfat/patches/patch-io_iom__wait.c  Sun Dec 22 22:23:00 2019
@@ -1,9 +1,18 @@
-$NetBSD: patch-io_iom__wait.c,v 1.1 2018/10/07 12:13:46 schmonz Exp $
+$NetBSD: patch-io_iom__wait.c,v 1.2 2019/12/22 22:23:00 joerg Exp $
 
 Fix build on systems with kqueue(2).
 
 --- io/iom_wait.c.orig 2018-04-11 14:12:50.000000000 +0000
 +++ io/iom_wait.c
+@@ -65,7 +65,7 @@ int iom_wait(iomux_t* c,int64* s,unsigne
+ #elif defined(HAVE_KQUEUE)
+       struct kevent kev[SLOTS];
+       struct timespec ts = { .tv_sec=timeout/1000, .tv_nsec=(timeout%1000)*1000000 };
+-      int r=kevent(c->ctx, 0, 0, &kev, freeslots, &ts);
++      int r=kevent(c->ctx, 0, 0, kev, freeslots, &ts);
+       if (r<=0) {
+       /* we ran into a timeout, so let someone else take over */
+       if (__sync_val_compare_and_swap(&c->working,1,0)==-2) return -2;
 @@ -76,13 +76,13 @@ int iom_wait(iomux_t* c,int64* s,unsigne
  #endif
        return r;

Added files:

Index: pkgsrc/devel/libowfat/patches/patch-io_iom__init.c
diff -u /dev/null pkgsrc/devel/libowfat/patches/patch-io_iom__init.c:1.1
--- /dev/null   Sun Dec 22 22:23:01 2019
+++ pkgsrc/devel/libowfat/patches/patch-io_iom__init.c  Sun Dec 22 22:23:00 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-io_iom__init.c,v 1.1 2019/12/22 22:23:00 joerg Exp $
+
+--- io/iom_init.c.orig 2019-12-22 18:12:04.396371533 +0000
++++ io/iom_init.c
+@@ -6,6 +6,8 @@
+ #include <sys/types.h>
+ #include <sys/event.h>
+ #include <sys/time.h>
++#include <sys/fcntl.h>
++#include <unistd.h>
+ #endif
+ 
+ int iom_init(iomux_t* c) {