Attachment 222722 Details for Bug 253762 – devel/libowfat: Update to 0.32

[patch] devel/libowfat: Update to 0.32

0001-devel-libowfat-Update-to-0.32.patch (text/plain), 14.21 KB, created by Fabian Keil on 2021-02-22 13:46:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabian Keil

Created: 2021-02-22 13:46:54 UTC

Size: 14.21 KB

patch

obsolete

>From 4c04cc877da9716a8cf133a57e6c66f4c50cde24 Mon Sep 17 00:00:00 2001
>From: Fabian Keil <fk@fabiankeil.de>
>Date: Sat, 20 Feb 2021 06:30:28 +0100
>Subject: [PATCH 1/2] devel/libowfat: Update to 0.32
>
>- Change WWW and MASTER_SITES to https.
>- Appease portclippy.
>- Update and sort pkg-plist.
>- Backport two patches from CVS to fix the build.
>  portlint complaints about the CVS meta data but I consider
>  it useful and thus kept it.
>
>I only lightly tested this update with gatling on 11-STABLE
>and compile-tested opentracker. I did not test the other
>dependencies.
>---
> devel/libowfat/Makefile                  |  7 +-
> devel/libowfat/distinfo                  |  6 +-
> devel/libowfat/files/patch-GNUmakefile   | 24 +++----
> devel/libowfat/files/patch-io-iom_init.c | 17 +++++
> devel/libowfat/files/patch-io-iom_wait.c | 27 ++++++++
> devel/libowfat/pkg-descr                 |  2 +-
> devel/libowfat/pkg-plist                 | 84 ++++++++++++++----------
> 7 files changed, 113 insertions(+), 54 deletions(-)
> create mode 100644 devel/libowfat/files/patch-io-iom_init.c
> create mode 100644 devel/libowfat/files/patch-io-iom_wait.c
>
>diff --git a/devel/libowfat/Makefile b/devel/libowfat/Makefile
>index bbaa069e8715..f2caf75a3d88 100644
>--- a/devel/libowfat/Makefile
>+++ b/devel/libowfat/Makefile
>@@ -2,9 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	libowfat
>-PORTVERSION=	0.31
>+PORTVERSION=	0.32
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.fefe.de/libowfat/
>+MASTER_SITES=	https://www.fefe.de/libowfat/
> 
> MAINTAINER=	lx@FreeBSD.org
> COMMENT=	General purpose library based on code by D. J. Bernstein
>@@ -13,9 +13,8 @@ LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		gmake tar:xz
>-ALL_TARGET=	dep all
>-
> MAKEFILE=	GNUmakefile
>+ALL_TARGET=	dep all
> 
> OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
> OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
>diff --git a/devel/libowfat/distinfo b/devel/libowfat/distinfo
>index 11b57f426515..36753f7495eb 100644
>--- a/devel/libowfat/distinfo
>+++ b/devel/libowfat/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1487011932
>-SHA256 (libowfat-0.31.tar.xz) = d1e4ac1cfccbb7dc51d77d96398e6302d229ba7538158826c84cb4254c7e8a12
>-SIZE (libowfat-0.31.tar.xz) = 183684
>+TIMESTAMP = 1613798981
>+SHA256 (libowfat-0.32.tar.xz) = f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1
>+SIZE (libowfat-0.32.tar.xz) = 195820
>diff --git a/devel/libowfat/files/patch-GNUmakefile b/devel/libowfat/files/patch-GNUmakefile
>index dc4f86f545e8..d4ff18a9b1a9 100644
>--- a/devel/libowfat/files/patch-GNUmakefile
>+++ b/devel/libowfat/files/patch-GNUmakefile
>@@ -1,5 +1,7 @@
>---- GNUmakefile.orig	2016-10-01 16:07:35.000000000 -0700
>-+++ GNUmakefile	2017-02-13 11:05:04.236623000 -0800
>+diff --git GNUmakefile GNUmakefile
>+index 3f3193d..43b1b55 100644
>+--- GNUmakefile
>++++ 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.
>@@ -14,13 +16,13 @@
>  
>  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 \
>-@@ -15,26 +15,14 @@
>- 
>- all: ent $(LIBS) libowfat.a libsocket t
>+@@ -18,26 +18,14 @@ all: headers ent $(LIBS) libowfat.a libsocket t
>+ pic pie:
>+ 	$(MAKE) CC="gcc -fPIC" LDFLAGS="-fpie"
>  
> -CROSS=
> -#CROSS=i686-mingw-
>--CC=gcc
>+-CC?=gcc
> -CCC=$(CROSS)$(CC)
> +CCC=${CC}
>  WERROR=
>@@ -44,12 +46,12 @@
>  
>  #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall
>  
>-@@ -205,16 +193,16 @@
>- compiletimeassert.h critbit.h
>+@@ -217,16 +205,16 @@ libowfat/%.h: %.h
>+ 	ln -f $< $@
>  
>  install-inc:
>--	install -d $(DESTDIR)$(INCLUDEDIR)
>--	install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)
>+-	install -d $(DESTDIR)$(INCLUDEDIR)/libowfat
>+-	install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)/libowfat
> +	${INSTALL} -d $(INCLUDEDIR)
> +	${BSD_INSTALL_DATA} -m 644 $(INCLUDES) $(INCLUDEDIR)
>  
>@@ -65,5 +67,5 @@
> +	${INSTALL} -d $(MAN3DIR)
> +	${BSD_INSTALL_MAN} -m 644 $(wildcard */*.3) $(MAN3DIR)
>  
>- install: install-inc install-man install-lib
>+ install: headers install-inc install-man install-lib
>  
>diff --git a/devel/libowfat/files/patch-io-iom_init.c b/devel/libowfat/files/patch-io-iom_init.c
>new file mode 100644
>index 000000000000..2342ef89eecd
>--- /dev/null
>+++ b/devel/libowfat/files/patch-io-iom_init.c
>@@ -0,0 +1,17 @@
>+Index: io/iom_init.c
>+===================================================================
>+RCS file: /cvs/libowfat/io/iom_init.c,v
>+retrieving revision 1.1
>+retrieving revision 1.2
>+diff -u -r1.1 -r1.2
>+--- io/iom_init.c	27 Mar 2018 02:23:00 -0000	1.1
>++++ io/iom_init.c	21 Feb 2019 12:24:05 -0000	1.2
>+@@ -6,6 +6,8 @@
>+ #include <sys/types.h>
>+ #include <sys/event.h>
>+ #include <sys/time.h>
>++#include <unistd.h>
>++#include <fcntl.h>
>+ #endif
>+ 
>+ int iom_init(iomux_t* c) {
>diff --git a/devel/libowfat/files/patch-io-iom_wait.c b/devel/libowfat/files/patch-io-iom_wait.c
>new file mode 100644
>index 000000000000..fca77d80e23e
>--- /dev/null
>+++ b/devel/libowfat/files/patch-io-iom_wait.c
>@@ -0,0 +1,27 @@
>+Index: io/iom_wait.c
>+===================================================================
>+RCS file: /cvs/libowfat/io/iom_wait.c,v
>+retrieving revision 1.2
>+retrieving revision 1.3
>+diff -u -r1.2 -r1.3
>+--- io/iom_wait.c	11 Apr 2018 14:12:50 -0000	1.2
>++++ io/iom_wait.c	21 Feb 2019 12:43:06 -0000	1.3
>+@@ -65,7 +65,8 @@
>+ #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);
>++      int i;
>+       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;
>+@@ -82,7 +83,7 @@
>+ 	        (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;
>diff --git a/devel/libowfat/pkg-descr b/devel/libowfat/pkg-descr
>index c8491bd6b92a..0c13bf0e83eb 100644
>--- a/devel/libowfat/pkg-descr
>+++ b/devel/libowfat/pkg-descr
>@@ -2,4 +2,4 @@ libowfat is a library of general purpose APIs extracted from Dan
> Bernstein's software, reimplemented and covered by the GNU General
> Public License Version 2 (no later versions).
> 
>-WWW: http://www.fefe.de/libowfat/
>+WWW: https://www.fefe.de/libowfat/
>diff --git a/devel/libowfat/pkg-plist b/devel/libowfat/pkg-plist
>index f0211d4578a0..39b8f59af767 100644
>--- a/devel/libowfat/pkg-plist
>+++ b/devel/libowfat/pkg-plist
>@@ -2,8 +2,8 @@ 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/cdb.h
> include/libowfat/compiletimeassert.h
> include/libowfat/critbit.h
> include/libowfat/dns.h
>@@ -48,7 +48,10 @@ man/man3/critbit0_insert.3.gz
> man/man3/fmt_iso8601.3.gz
> man/man3/fmt_netstring.3.gz
> man/man3/io_fd_flags.3.gz
>-man/man3/libowfat_array.3.gz
>+man/man3/iom_abort.3.gz
>+man/man3/iom_add.3.gz
>+man/man3/iom_init.3.gz
>+man/man3/iom_wait.3.gz
> man/man3/libowfat_array_allocate.3.gz
> man/man3/libowfat_array_bytes.3.gz
> man/man3/libowfat_array_cat.3.gz
>@@ -65,25 +68,25 @@ man/man3/libowfat_array_reset.3.gz
> man/man3/libowfat_array_start.3.gz
> man/man3/libowfat_array_trunc.3.gz
> man/man3/libowfat_array_truncate.3.gz
>-man/man3/libowfat_buffer.3.gz
>+man/man3/libowfat_array.3.gz
> man/man3/libowfat_buffer_close.3.gz
> man/man3/libowfat_buffer_feed.3.gz
> man/man3/libowfat_buffer_flush.3.gz
> man/man3/libowfat_buffer_fromsa.3.gz
>-man/man3/libowfat_buffer_get.3.gz
>-man/man3/libowfat_buffer_get_new_token_sa.3.gz
> man/man3/libowfat_buffer_get_new_token_sa_pred.3.gz
>-man/man3/libowfat_buffer_get_token.3.gz
>+man/man3/libowfat_buffer_get_new_token_sa.3.gz
> man/man3/libowfat_buffer_get_token_pred.3.gz
>-man/man3/libowfat_buffer_get_token_sa.3.gz
> man/man3/libowfat_buffer_get_token_sa_pred.3.gz
>+man/man3/libowfat_buffer_get_token_sa.3.gz
>+man/man3/libowfat_buffer_get_token.3.gz
>+man/man3/libowfat_buffer_get.3.gz
> man/man3/libowfat_buffer_getc.3.gz
>-man/man3/libowfat_buffer_getline.3.gz
> man/man3/libowfat_buffer_getline_sa.3.gz
>+man/man3/libowfat_buffer_getline.3.gz
> man/man3/libowfat_buffer_getn.3.gz
> man/man3/libowfat_buffer_getnewline_sa.3.gz
>-man/man3/libowfat_buffer_init.3.gz
> man/man3/libowfat_buffer_init_free.3.gz
>+man/man3/libowfat_buffer_init.3.gz
> man/man3/libowfat_buffer_mmapread.3.gz
> man/man3/libowfat_buffer_peek.3.gz
> man/man3/libowfat_buffer_put.3.gz
>@@ -107,6 +110,7 @@ man/man3/libowfat_buffer_putulonglong.3.gz
> man/man3/libowfat_buffer_putxlong.3.gz
> man/man3/libowfat_buffer_seek.3.gz
> man/man3/libowfat_buffer_tosa.3.gz
>+man/man3/libowfat_buffer.3.gz
> man/man3/libowfat_byte_chr.3.gz
> man/man3/libowfat_byte_copy.3.gz
> man/man3/libowfat_byte_copyr.3.gz
>@@ -130,21 +134,21 @@ man/man3/libowfat_cdb_keypos.3.gz
> man/man3/libowfat_cdb_nextkey.3.gz
> man/man3/libowfat_cdb_read.3.gz
> man/man3/libowfat_cdb_successor.3.gz
>-man/man3/libowfat_dns_ip4.3.gz
> man/man3/libowfat_dns_ip4_packet.3.gz
> man/man3/libowfat_dns_ip4_qualify.3.gz
>-man/man3/libowfat_dns_ip6.3.gz
>+man/man3/libowfat_dns_ip4.3.gz
> man/man3/libowfat_dns_ip6_packet.3.gz
> man/man3/libowfat_dns_ip6_qualify.3.gz
>-man/man3/libowfat_dns_mx.3.gz
>+man/man3/libowfat_dns_ip6.3.gz
> man/man3/libowfat_dns_mx_packet.3.gz
>-man/man3/libowfat_dns_name4.3.gz
>+man/man3/libowfat_dns_mx.3.gz
>+man/man3/libowfat_dns_name_packet.3.gz
> man/man3/libowfat_dns_name4_domain.3.gz
>-man/man3/libowfat_dns_name6.3.gz
>+man/man3/libowfat_dns_name4.3.gz
> man/man3/libowfat_dns_name6_domain.3.gz
>-man/man3/libowfat_dns_name_packet.3.gz
>-man/man3/libowfat_dns_txt.3.gz
>+man/man3/libowfat_dns_name6.3.gz
> man/man3/libowfat_dns_txt_packet.3.gz
>+man/man3/libowfat_dns_txt.3.gz
> man/man3/libowfat_fmt_8long.3.gz
> man/man3/libowfat_fmt_asn1derlength.3.gz
> man/man3/libowfat_fmt_asn1dertag.3.gz
>@@ -154,8 +158,8 @@ man/man3/libowfat_fmt_httpdate.3.gz
> man/man3/libowfat_fmt_human.3.gz
> man/man3/libowfat_fmt_humank.3.gz
> man/man3/libowfat_fmt_ip4.3.gz
>-man/man3/libowfat_fmt_ip6.3.gz
> man/man3/libowfat_fmt_ip6_flat.3.gz
>+man/man3/libowfat_fmt_ip6.3.gz
> man/man3/libowfat_fmt_ip6c.3.gz
> man/man3/libowfat_fmt_ip6if.3.gz
> man/man3/libowfat_fmt_ip6ifc.3.gz
>@@ -193,8 +197,8 @@ man/man3/libowfat_io_createfile.3.gz
> man/man3/libowfat_io_dontwantread.3.gz
> man/man3/libowfat_io_dontwantwrite.3.gz
> man/man3/libowfat_io_eagain.3.gz
>-man/man3/libowfat_io_fd.3.gz
> man/man3/libowfat_io_fd_canwrite.3.gz
>+man/man3/libowfat_io_fd.3.gz
> man/man3/libowfat_io_finishandshutdown.3.gz
> man/man3/libowfat_io_getcookie.3.gz
> man/man3/libowfat_io_nonblock.3.gz
>@@ -217,12 +221,12 @@ man/man3/libowfat_io_waitread.3.gz
> man/man3/libowfat_io_waituntil.3.gz
> man/man3/libowfat_io_wantread.3.gz
> man/man3/libowfat_io_wantwrite.3.gz
>-man/man3/libowfat_iob_addbuf.3.gz
> man/man3/libowfat_iob_addbuf_free.3.gz
>-man/man3/libowfat_iob_addfile.3.gz
>+man/man3/libowfat_iob_addbuf.3.gz
> man/man3/libowfat_iob_addfile_close.3.gz
>-man/man3/libowfat_iob_adds.3.gz
>+man/man3/libowfat_iob_addfile.3.gz
> man/man3/libowfat_iob_adds_free.3.gz
>+man/man3/libowfat_iob_adds.3.gz
> man/man3/libowfat_iob_bytesleft.3.gz
> man/man3/libowfat_iob_free.3.gz
> man/man3/libowfat_iob_new.3.gz
>@@ -252,8 +256,8 @@ man/man3/libowfat_range_str4inbuf.3.gz
> man/man3/libowfat_range_strinbuf.3.gz
> man/man3/libowfat_range_validbuf.3.gz
> man/man3/libowfat_rangecheck.3.gz
>-man/man3/libowfat_readclose.3.gz
> man/man3/libowfat_readclose_append.3.gz
>+man/man3/libowfat_readclose.3.gz
> man/man3/libowfat_scan_8int.3.gz
> man/man3/libowfat_scan_8long.3.gz
> man/man3/libowfat_scan_8short.3.gz
>@@ -264,8 +268,8 @@ man/man3/libowfat_scan_double.3.gz
> man/man3/libowfat_scan_httpdate.3.gz
> man/man3/libowfat_scan_int.3.gz
> man/man3/libowfat_scan_ip4.3.gz
>-man/man3/libowfat_scan_ip6.3.gz
> man/man3/libowfat_scan_ip6_flat.3.gz
>+man/man3/libowfat_scan_ip6.3.gz
> man/man3/libowfat_scan_ip6if.3.gz
> man/man3/libowfat_scan_long.3.gz
> man/man3/libowfat_scan_longlong.3.gz
>@@ -285,10 +289,10 @@ man/man3/libowfat_scan_xlonglong.3.gz
> man/man3/libowfat_scan_xshort.3.gz
> man/man3/libowfat_socket_accept4.3.gz
> man/man3/libowfat_socket_accept6.3.gz
>-man/man3/libowfat_socket_bind4.3.gz
> man/man3/libowfat_socket_bind4_reuse.3.gz
>-man/man3/libowfat_socket_bind6.3.gz
>+man/man3/libowfat_socket_bind4.3.gz
> man/man3/libowfat_socket_bind6_reuse.3.gz
>+man/man3/libowfat_socket_bind6.3.gz
> man/man3/libowfat_socket_broadcast.3.gz
> man/man3/libowfat_socket_connect4.3.gz
> man/man3/libowfat_socket_connect6.3.gz
>@@ -370,33 +374,43 @@ man/man3/libowfat_taia_sub.3.gz
> man/man3/libowfat_taia_tai.3.gz
> man/man3/libowfat_taia_uint.3.gz
> man/man3/libowfat_taia_unpack.3.gz
>-man/man3/libowfat_uint16_pack.3.gz
> man/man3/libowfat_uint16_pack_big.3.gz
>-man/man3/libowfat_uint16_read.3.gz
>+man/man3/libowfat_uint16_pack.3.gz
> man/man3/libowfat_uint16_read_big.3.gz
>-man/man3/libowfat_uint16_unpack.3.gz
>+man/man3/libowfat_uint16_read.3.gz
> man/man3/libowfat_uint16_unpack_big.3.gz
>-man/man3/libowfat_uint32_pack.3.gz
>+man/man3/libowfat_uint16_unpack.3.gz
> man/man3/libowfat_uint32_pack_big.3.gz
>-man/man3/libowfat_uint32_read.3.gz
>+man/man3/libowfat_uint32_pack.3.gz
> man/man3/libowfat_uint32_read_big.3.gz
>-man/man3/libowfat_uint32_unpack.3.gz
>+man/man3/libowfat_uint32_read.3.gz
> man/man3/libowfat_uint32_unpack_big.3.gz
>-man/man3/libowfat_uint64_pack.3.gz
>+man/man3/libowfat_uint32_unpack.3.gz
> man/man3/libowfat_uint64_pack_big.3.gz
>-man/man3/libowfat_uint64_read.3.gz
>+man/man3/libowfat_uint64_pack.3.gz
> man/man3/libowfat_uint64_read_big.3.gz
>-man/man3/libowfat_uint64_unpack.3.gz
>+man/man3/libowfat_uint64_read.3.gz
> man/man3/libowfat_uint64_unpack_big.3.gz
>+man/man3/libowfat_uint64_unpack.3.gz
> man/man3/libowfat_umult16.3.gz
> man/man3/libowfat_umult32.3.gz
> man/man3/libowfat_umult64.3.gz
> man/man3/mmap_readat.3.gz
> man/man3/scan_asn1derlengthvalue.3.gz
>+man/man3/scan_base64.3.gz
>+man/man3/scan_base64url.3.gz
>+man/man3/scan_cescape.3.gz
>+man/man3/scan_hexdump.3.gz
> man/man3/scan_iso8601.3.gz
>+man/man3/scan_jsonescape.3.gz
>+man/man3/scan_ldapescape.3.gz
> man/man3/scan_netstring.3.gz
>-man/man3/socket_fastopen.3.gz
>+man/man3/scan_urlencoded.3.gz
>+man/man3/scan_urlencoded2.3.gz
>+man/man3/scan_utf8_sem.3.gz
>+man/man3/scan_uuencoded.3.gz
> man/man3/socket_fastopen_connect4.3.gz
> man/man3/socket_fastopen_connect6.3.gz
>+man/man3/socket_fastopen.3.gz
> man/man3/socket_quickack.3.gz
> man/man3/sub_of.3.gz
>-- 
>2.30.0
>

Actions: View | Diff

Attachments on bug 253762: 222722