CVS commit: pkgsrc/devel/libowfat

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Oct  7 12:13:46 UTC 2018

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

Log Message:
Update to 0.32. From the changelog:

- remove OpenBSD #warning (obsd maintainer says no longer needed)
- fix fmt_ip6 (Erwin Hoffmann)
- add MSG_ZEROCOPY support (only used for buffers >8k)
- use writev in buffer_put for a slight perf improvement
- add experimental iom API for multithreaded I/O multiplexing (in io.h)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/libowfat/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libowfat/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/libowfat/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libowfat/patches/patch-aa
cvs rdiff -u -r0 -r1.1 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.6 pkgsrc/devel/libowfat/Makefile:1.7
--- pkgsrc/devel/libowfat/Makefile:1.6  Mon Jun 26 04:52:34 2017
+++ pkgsrc/devel/libowfat/Makefile      Sun Oct  7 12:13:46 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2017/06/26 04:52:34 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2018/10/07 12:13:46 schmonz Exp $
 #
 
-DISTNAME=      libowfat-0.31
+DISTNAME=      libowfat-0.32
 CATEGORIES=    devel
 MASTER_SITES=  ${HOMEPAGE}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/libowfat/PLIST
diff -u pkgsrc/devel/libowfat/PLIST:1.4 pkgsrc/devel/libowfat/PLIST:1.5
--- pkgsrc/devel/libowfat/PLIST:1.4     Mon Jun 26 04:52:34 2017
+++ pkgsrc/devel/libowfat/PLIST Sun Oct  7 12:13:46 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2017/06/26 04:52:34 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/10/07 12:13:46 schmonz Exp $
 include/libowfat/array.h
 include/libowfat/buffer.h
 include/libowfat/byte.h
@@ -231,6 +231,10 @@ man/man3/iob_prefetch.3
 man/man3/iob_reset.3
 man/man3/iob_send.3
 man/man3/iob_write.3
+man/man3/iom_abort.3
+man/man3/iom_add.3
+man/man3/iom_init.3
+man/man3/iom_wait.3
 man/man3/iopause.3
 man/man3/mmap_private.3
 man/man3/mmap_read.3
@@ -262,8 +266,12 @@ man/man3/scan_8short.3
 man/man3/scan_asn1derlength.3
 man/man3/scan_asn1derlengthvalue.3
 man/man3/scan_asn1dertag.3
+man/man3/scan_base64.3
+man/man3/scan_base64url.3
+man/man3/scan_cescape.3
 man/man3/scan_charsetnskip.3
 man/man3/scan_double.3
+man/man3/scan_hexdump.3
 man/man3/scan_httpdate.3
 man/man3/scan_int.3
 man/man3/scan_ip4.3
@@ -271,6 +279,8 @@ man/man3/scan_ip6.3
 man/man3/scan_ip6_flat.3
 man/man3/scan_ip6if.3
 man/man3/scan_iso8601.3
+man/man3/scan_jsonescape.3
+man/man3/scan_ldapescape.3
 man/man3/scan_long.3
 man/man3/scan_longlong.3
 man/man3/scan_netstring.3
@@ -281,8 +291,12 @@ man/man3/scan_short.3
 man/man3/scan_uint.3
 man/man3/scan_ulong.3
 man/man3/scan_ulonglong.3
+man/man3/scan_urlencoded.3
+man/man3/scan_urlencoded2.3
 man/man3/scan_ushort.3
 man/man3/scan_utf8.3
+man/man3/scan_utf8_sem.3
+man/man3/scan_uuencoded.3
 man/man3/scan_whitenskip.3
 man/man3/scan_xint.3
 man/man3/scan_xlong.3

Index: pkgsrc/devel/libowfat/distinfo
diff -u pkgsrc/devel/libowfat/distinfo:1.5 pkgsrc/devel/libowfat/distinfo:1.6
--- pkgsrc/devel/libowfat/distinfo:1.5  Mon Jun 26 04:52:34 2017
+++ pkgsrc/devel/libowfat/distinfo      Sun Oct  7 12:13:46 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2017/06/26 04:52:34 schmonz Exp $
+$NetBSD: distinfo,v 1.6 2018/10/07 12:13:46 schmonz Exp $
 
-SHA1 (libowfat-0.31.tar.xz) = 67431a1e66153d7dee1a08060c95edd341766291
-RMD160 (libowfat-0.31.tar.xz) = 38817d1d68a7d86f5eaa479b1e72e8b28d9b4099
-SHA512 (libowfat-0.31.tar.xz) = b3ce973d6edc501ddaa6caa84dc3b74e3e31ced92e4f707038858cd36c977863251a7eaeababdad34ffe6b8ad13c9702118464f6f9fd827e05f6fbc5004408b5
-Size (libowfat-0.31.tar.xz) = 183684 bytes
-SHA1 (patch-aa) = 5184fd8f0008af421791cc9768c2e5204341f989
+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

Index: pkgsrc/devel/libowfat/patches/patch-aa
diff -u pkgsrc/devel/libowfat/patches/patch-aa:1.3 pkgsrc/devel/libowfat/patches/patch-aa:1.4
--- pkgsrc/devel/libowfat/patches/patch-aa:1.3  Mon Jun 26 04:52:34 2017
+++ pkgsrc/devel/libowfat/patches/patch-aa      Sun Oct  7 12:13:46 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2017/06/26 04:52:34 schmonz Exp $
+$NetBSD: patch-aa,v 1.4 2018/10/07 12:13:46 schmonz Exp $
 
-Follow hier(7).
+Follow hier(7) and support PKGMANDIR.
 
---- GNUmakefile.orig   2006-07-16 01:17:01.000000000 +0200
+--- 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
@@ -11,9 +11,8 @@ Follow hier(7).
 -prefix=/opt/diet
 +prefix=${PREFIX}
  LIBDIR=${prefix}/lib
--INCLUDEDIR=${prefix}/include
+ INCLUDEDIR=${prefix}/include
 -MAN3DIR=${prefix}/man/man3
-+INCLUDEDIR=${prefix}/include/libowfat
 +MAN3DIR=${prefix}/${PKGMANDIR}/man3
  
  LIBS=byte.a fmt.a scan.a str.a uint.a open.a stralloc.a unix.a socket.a \

Added files:

Index: pkgsrc/devel/libowfat/patches/patch-io_iom__wait.c
diff -u /dev/null pkgsrc/devel/libowfat/patches/patch-io_iom__wait.c:1.1
--- /dev/null   Sun Oct  7 12:13:46 2018
+++ pkgsrc/devel/libowfat/patches/patch-io_iom__wait.c  Sun Oct  7 12:13:46 2018
@@ -0,0 +1,22 @@
+$NetBSD: patch-io_iom__wait.c,v 1.1 2018/10/07 12:13:46 schmonz 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
+@@ -76,13 +76,13 @@ int iom_wait(iomux_t* c,int64* s,unsigne
+ #endif
+       return r;
+       }
+-      for (i=0; i<r; ++i) {
++      for (int i=0; i<r; ++i) {
+       /* convert events */
+       int e = (kev[i].filter == EVFILT_READ ? IOM_READ : 0) |
+               (kev[i].filter == EVFILT_WRITE ? IOM_WRITE : 0);
+       if (i+1==r) {
+         /* return last event instead of enqueueing it */
+-        *s=kev.ident;
++        *s=kev[i].ident;
+         *revents=e;
+       } else {
+         c->q[c->h].fd=kev[i].ident;