libowfat: Bump to 0.33

packages/libowfat/GNUmakefile.patch

@@ -1,44 +1,34 @@
---- ../GNUmakefile.orig	2021-09-22 13:58:37.598012446 +0200
-+++ ./GNUmakefile	2021-09-22 13:59:03.258474130 +0200
-@@ -21,7 +21,9 @@
- CROSS=
- #CROSS=i686-mingw-
- CC?=gcc
--CCC=$(CROSS)$(CC)
-+AR?=$(CROSS)ar
-+RANLIB?=$(CROSS)ranlib
-+CCC=$(CROSS)clang
- WERROR=
- WARN=-W -Wall -Wextra $(WERROR)
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -41,8 +41,8 @@
  
-@@ -169,8 +171,8 @@
- $(IO_OBJS) $(CDB_OBJS) $(CRITBIT_OBJS)
+ DEFINE=-D_REENTRANT
  
- libowfat.a: $(ALL_OBJS)
--	$(CROSS)ar cru $@ $(ALL_OBJS)
--	-$(CROSS)ranlib $@
-+	$(AR) cru $@ $(ALL_OBJS)
-+	-$(RANLIB) $@
+-CFLAGS=-pipe $(WARN) $(DEFINE) $(OPT_REG)
+-CFLAGS_OPT=-pipe $(WARN) $(DEFINE) $(OPT_PLUS)
++CFLAGS+=-pipe $(WARN) $(DEFINE)
++CFLAGS_OPT=$(CFLAGS)
  
- CFLAGS+=-I.
- CFLAGS_OPT+=-I.
-@@ -182,8 +184,8 @@
- 	$(DIET) $(CCC) -c $< $(CFLAGS)
+ #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall
  
- %.a:
--	$(CROSS)ar cru $@ $^
--	-$(CROSS)ranlib $@
-+	$(AR) cru $@ $^
-+	-$(RANLIB) $@
+@@ -68,9 +68,9 @@
+ endif
+ gcc_path = $(foreach dir,$(path),$(wildcard $(dir)/gcc))
+ ifeq ($(strip $(gcc_path)),)
+-CC=clang
++CC?=clang
+ else
+-CC=gcc
++CC?=gcc
+ endif
  
- t.o: t.c fmt.h scan.h str.h uint16.h uint32.h stralloc.h socket.h \
-   buffer.h ip4.h ip6.h byte.h mmap.h open.h textcode.h dns.h iopause.h \
-@@ -192,7 +194,7 @@
+ ifneq ($(DIET),)
+@@ -197,7 +197,7 @@
    havesigio.h CAS.h
  
  t: t.o libowfat.a libsocket
--	$(DIET) $(CCC) -g -o $@ t.o libowfat.a `cat libsocket` -lpthread
-+	$(DIET) $(CCC) -g -o $@ t.o libowfat.a `cat libsocket`
+-	$(DIET) $(CCC) -g -o $@ t.o libowfat.a `cat libsocket` -lpthread $(LDFLAGS)
++	$(DIET) $(CCC) -g -o $@ t.o libowfat.a `cat libsocket` $(LDFLAGS)
  
  .PHONY: all clean tar install rename
  clean:

packages/libowfat/build.sh

@@ -2,18 +2,20 @@ TERMUX_PKG_HOMEPAGE=http://www.fefe.de/libowfat/
 TERMUX_PKG_DESCRIPTION="GPL reimplementation of libdjb"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.32
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SRCURL=http://www.fefe.de/libowfat/libowfat-$TERMUX_PKG_VERSION.tar.xz
-TERMUX_PKG_SHA256=f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1
+TERMUX_PKG_VERSION=0.33
+TERMUX_PKG_SRCURL=https://www.fefe.de/libowfat/libowfat-$TERMUX_PKG_VERSION.tar.xz
+TERMUX_PKG_SHA256=311ec8b3f4b72bb442e323fb013a98f956fa745547f2bc9456287b20d027cd7d
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_NO_STATICSPLIT=true
+TERMUX_PKG_EXTRA_MAKE_ARGS="
+prefix=$TERMUX_PREFIX
+LIBDIR=$TERMUX_PREFIX/lib
+MAN3DIR=$TERMUX_PREFIX/share/man/man3
+"
+TERMUX_MAKE_PROCESSES=1
 
-termux_step_make() {
-	make -j $TERMUX_MAKE_PROCESSES CROSS="${CC/clang}"
-}
-
-termux_step_make_install() {
-	make install prefix=$TERMUX_PREFIX LIBDIR=$TERMUX_PREFIX/lib \
-		MAN3DIR=$TERMUX_PREFIX/share/man/man3
+termux_step_pre_configure() {
+	# Use pregenerated entities.h.
+	cp $TERMUX_PKG_BUILDER_DIR/entities.h $TERMUX_PKG_BUILDDIR/
+	touch -d "next hour" $TERMUX_PKG_BUILDDIR/entities.h
 }

packages/libowfat/io_internal.h.patch

@@ -1,25 +0,0 @@
-From 67729f54c2e7a24b2bebfa23b75afe607c09a67a Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Thu, 26 Nov 2020 19:28:03 +0100
-Subject: [PATCH] Fix build with -fno-common or GCC 10
-
----
- io_internal.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/io_internal.h b/io_internal.h
-index 6d37c11..3e378d9 100644
---- a/io_internal.h
-+++ b/io_internal.h
-@@ -83,7 +83,7 @@ my_extern array io_pollfds;
- my_extern long first_readable;
- my_extern long first_writeable;
- 
--my_extern long first_deferred;
-+extern long first_deferred;
- 
- my_extern enum __io_waitmode {
-   UNDECIDED,
--- 
-2.27.0
-