lang: bump version

2025-01-07 07:07:02 +08:00 · 2021-06-14 19:43:42 +08:00 · 2021-06-14 19:43:42 +08:00 · dbf61a05fe
commit dbf61a05fe
parent 68f3a18d6f
300 changed files with 6931 additions and 1854 deletions
--- a/lang/chicken-scheme/Makefile
+++ b/lang/chicken-scheme/Makefile
@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=chicken-scheme
-PKG_VERSION=5.2.0
-PKG_RELEASE:=1
+PKG_VERSION:=5.2.0
+PKG_RELEASE:=2

 PKG_BUILD_DIR:=$(BUILD_DIR)/chicken-$(PKG_VERSION)
 PKG_SOURCE:=chicken-$(PKG_VERSION).tar.gz
@ -53,10 +53,7 @@ define Package/chicken-scheme-interpreter/description
  For more information, please refer to the Chicken Scheme website at https://call-cc.org.
 endef

-
-# csc calls gcc with "-lm -ldl", but "-lm" doesn't work with musl,
-# so we set LIBRARIES=-lm
-MAKE_FLAGS += PLATFORM=linux C_COMPILER=$(TARGET_CC) LINKER=$(TARGET_CC) PREFIX=/usr C_COMPILER_OPTIMIZATION_OPTIONS="$(TARGET_CFLAGS)" LIBRARIES=-lm
+MAKE_FLAGS += PLATFORM=linux C_COMPILER=$(TARGET_CC) LINKER=$(TARGET_CC) PREFIX=/usr C_COMPILER_OPTIMIZATION_OPTIONS="$(TARGET_CFLAGS)"

 # not installed:
 # - csc and chicken, the compiler
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=erlang
 PKG_VERSION:=23.0
-PKG_RELEASE:=1
+PKG_RELEASE:=4

 PKG_SOURCE:=otp_src_$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= http://www.erlang.org/download/
@ -314,20 +314,10 @@ endef

 HOST_CONFIGURE_ARGS += \
 	--disable-hipe \
+	--disable-pgo \
 	--disable-smp-support \
 	--without-javac

-HOST_CFLAGS += -D_GNU_SOURCE
-
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR) all
-endef
-
-define Host/Install
-	$(MAKE) -C $(HOST_BUILD_DIR) install
-endef
-
-
 # Target

 CONFIGURE_ARGS += \
--- a/lang/erlang/patches/010-openssl-deprecated.patch
+++ b/lang/erlang/patches/010-openssl-deprecated.patch
@ -0,0 +1,66 @@
+--- a/lib/crypto/c_src/crypto_callback.c
+++ b/lib/crypto/c_src/crypto_callback.c
+@@ -112,6 +112,7 @@ static ErlNifRWLock** lock_vec = NULL; /
+ 
+ #include <openssl/crypto.h>
+ 
+#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
+ static INLINE void locking(int mode, ErlNifRWLock* lock)
+ {
+     switch (mode) {
+@@ -132,7 +133,6 @@ static INLINE void locking(int mode, Erl
+     }
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
+ static void locking_function(int mode, int n, const char *file, int line)
+ {
+     locking(mode, lock_vec[n]);
+--- a/lib/crypto/c_src/engine.c
+++ b/lib/crypto/c_src/engine.c
+@@ -244,7 +244,7 @@ ERL_NIF_TERM engine_load_dynamic_nif(Erl
+ #ifdef HAS_ENGINE_SUPPORT
+     ASSERT(argc == 0);
+ 
+-    ENGINE_load_dynamic();
+    ENGINE_load_builtin_engines();
+     return atom_ok;
+ #else
+     return atom_notsup;
+--- a/lib/crypto/c_src/info.c
+++ b/lib/crypto/c_src/info.c
+@@ -20,6 +20,11 @@
+ 
+ #include "info.h"
+ 
+#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
+#define OPENSSL_VERSION	SSLEAY_VERSION
+#define OpenSSL_version	SSLeay_version
+#endif
+
+ #ifdef HAVE_DYNAMIC_CRYPTO_LIB
+ 
+ # if defined(DEBUG)
+@@ -77,7 +82,7 @@ ERL_NIF_TERM info_lib(ErlNifEnv *env, in
+     ASSERT(argc == 0);
+ 
+     name_sz = strlen(libname);
+-    ver = SSLeay_version(SSLEAY_VERSION);
+    ver = OpenSSL_version(OPENSSL_VERSION);
+     ver_sz = strlen(ver);
+     ver_num = OPENSSL_VERSION_NUMBER;
+ 
+--- a/lib/crypto/c_src/otp_test_engine.c
+++ b/lib/crypto/c_src/otp_test_engine.c
+@@ -100,9 +100,11 @@ static int test_init(ENGINE *e) {
+         goto err;
+ #endif /* if defined(FAKE_RSA_IMPL) */
+ 
+#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
+     /* Load all digest and cipher algorithms. Needed for password protected private keys */
+     OpenSSL_add_all_ciphers();
+     OpenSSL_add_all_digests();
+#endif
+ 
+     return 111;
+ 
--- a/lang/erlang/patches/020-erts-emulator-reorder-inclued-headers-paths.patch
+++ b/lang/erlang/patches/020-erts-emulator-reorder-inclued-headers-paths.patch
@ -0,0 +1,44 @@
+From 85a3e5b4f65e5284e59dcdd90e92ea7d50ef6907 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Sun, 8 Feb 2015 17:23:13 +0100
+Subject: [PATCH] erts/emulator: reorder inclued headers paths
+
+If the Perl Compatible Regular Expressions is installed on the
+host and the path to the headers is added to the CFLAGS, the
+pcre.h from the host is used instead of the one provided by
+erlang.
+
+Erlang use an old version of this file which is incompatible
+with the upstream one.
+
+Move INCLUDES before CFLAGS to use pcre.h from erlang.
+
+http://autobuild.buildroot.net/results/cbd/cbd8b54eef535f19d7d400fd269af1b3571d6143/build-end.log
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+[Bernd: rebased for erlang-21.0]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ erts/emulator/Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
+@@ -751,7 +751,7 @@ endif
+ # Usually the same as the default rule, but certain platforms (e.g. win32) mix
+ # different compilers
+ $(OBJDIR)/beam_emu.o: beam/beam_emu.c
+-	$(V_EMU_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
+	$(V_EMU_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
+ 
+ $(OBJDIR)/beam_emu.S: beam/beam_emu.c
+ 	$(V_EMU_CC) -S -fverbose-asm $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
+@@ -804,7 +804,7 @@ endif
+ # General targets
+ #
+ $(OBJDIR)/%.o: beam/%.c
+-	$(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
+ 
+ $(OBJDIR)/%.o: $(TARGET)/%.c
+ 	$(V_CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@
--- a/lang/linotify/Makefile
+++ b/lang/linotify/Makefile
@ -0,0 +1,44 @@
+#
+# This is free software, licensed under your choice of the following SPDX identifiers:
+# Apache-2.0, BSD-2-Clause, CC-BY-4.0, ISC, MIT, X11 or GPL-2.0-or-later
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=linotify
+PKG_VERSION:=0.5
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL=https://codeload.github.com/hoelzro/$(PKG_NAME)/tar.gz/$(PKG_VERSION)?
+PKG_HASH:=21d005f16043397a85913a7d14a267716d6384f0228718d5de464bfc0274e338
+
+PKG_MAINTAINER:=Karl Palsson <karlp@etactica.com>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=COPYRIGHT
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/linotify
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=inotify binding for lua
+  DEPENDS:=+lua
+  URL:=https://github.com/hoelzro/linotify
+endef
+
+define Package/linotify/description
+ This provides a lua binding to the inotify file system change notification system
+endef
+
+define Build/Compile
+  cd $(PKG_BUILD_DIR) && \
+  $(TARGET_CC) -o inotify.so -shared $(FPIC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) linotify.c
+endef
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/inotify.so $(1)/usr/lib/lua
+endef
+
+$(eval $(call BuildPackage,linotify))
--- a/lang/lua-argparse/Makefile
+++ b/lang/lua-argparse/Makefile
@ -0,0 +1,49 @@
+#
+# Copyright (C) 2006-2020 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lua-argparse
+PKG_VERSION:=0.6.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/mpeterv/argparse/tar.gz/$(PKG_VERSION)?
+PKG_HASH:=0eddda29d591536bc7310b99ce7acc3e5e00557f18d6e63ab10d56683e8952f1
+PKG_BUILD_DIR:=$(BUILD_DIR)/argparse-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Vladimir Malyutin <first-leon@yandex.ru>
+PKG_LICENSE:=MIT
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lua-argparse
+        SUBMENU:=Lua
+        SECTION:=lang
+        CATEGORY:=Languages
+        TITLE:=lua-argparse
+        URL:=https://github.com/mpeterv/argparse
+        DEPENDS:=+lua
+        PKGARCH:=all
+endef
+
+define Package/lua-argparse/description
+        Argparse is a feature-rich command line parser for Lua inspired by argparse for Python.
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/lua-argparse/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/argparse.lua $(1)/usr/lib/lua/
+endef
+
+$(eval $(call BuildPackage,lua-argparse))
--- a/lang/lua-coxpcall/patches/config.patch
+++ b/lang/lua-coxpcall/patches/config.patch
@ -1,4 +1,4 @@
--- lua-coxpcall-1.15.0_org/config	1970-01-01 08:00:00.000000000 +0800
-+++ lua-coxpcall-1.15.0/config	2014-06-04 16:51:55.487547258 +0800
+--- /dev/null
+++ b/config
@@ -0,0 +1 @@
 +LUA_DIR ?=$(DESTDIR)/usr/lib/lua
--- a/lang/lua-ev/Makefile
+++ b/lang/lua-ev/Makefile
@ -8,18 +8,16 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=lua-ev
-PKG_RELEASE:=1
+PKG_VERSION:=1.5
+PKG_RELEASE:=$(AUTORELEASE)

-PKG_SOURCE_URL=https://github.com/brimworks/lua-ev.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE=2015-8-4
-PKG_SOURCE_VERSION:=339426fbe528f11cb3cd1af69a88f06bba367981
-PKG_MIRROR_HASH:=fe138f05845d549998443628e1b63e07d797977548a30e75305085cca4b25567
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/brimworks/lua-ev/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=26ac116722a241bf59daf5315ce0ffe751c1babea9a146ffc0a389f1af3facca

 PKG_MAINTAINER:=Jianhui Zhao <jianhuizhao329@gmail.com>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@ -39,7 +37,7 @@ endef

 define Package/lua-ev/install
 	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ev.so $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/lua/cmod/ev.so $(1)/usr/lib/lua
 endef

 $(eval $(call BuildPackage,lua-ev))
--- a/lang/lua-libmodbus/Makefile
+++ b/lang/lua-libmodbus/Makefile
@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=lua-libmodbus
-PKG_VERSION:=0.4.2
+PKG_VERSION:=0.7
 PKG_RELEASE:=1

 PKG_SOURCE:=lua-libmodbus-$(PKG_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=lua-libmodbus-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://codeload.github.com/etactica/lua-libmodbus/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=90aff3a2cfe7f91f167ad4ea00f55c2aa86cf2aef93d022e3b2cf906a1791254
+PKG_HASH:=70369f4c4e36421095bf00dcee36c633b4284eaa79bcfdfd230bfefb27acefda
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)

 PKG_MAINTAINER:=Karl Palsson <karlp@etactica.com>
--- a/lang/lua-md5/patches/config.patch
+++ b/lang/lua-md5/patches/config.patch
@ -1,5 +1,5 @@
--- a/config	2019-11-01 13:58:27.907691645 +0800
-+++ b/config	2019-11-01 14:00:52.126290663 +0800
+--- a/config
+++ b/config
@@ -1,16 +1,16 @@
 # Installation directories
 
--- a/lang/lua-md5/patches/makefile.patch
+++ b/lang/lua-md5/patches/makefile.patch
@ -1,5 +1,5 @@
--- a/Makefile.orig	2014-06-04 17:16:40.083514808 +0800
-+++ b/Makefile	2014-06-04 17:17:27.111513780 +0800
+--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # $Id: Makefile,v 1.7 2007/10/11 00:02:56 carregal Exp $
 
--- a/lang/lua-mosquitto/Makefile
+++ b/lang/lua-mosquitto/Makefile
@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=lua-mosquitto
-PKG_VERSION:=0.3
+PKG_VERSION:=0.4.1
 PKG_RELEASE:=1
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_MIRROR_HASH:=104a143131812a507e74f9debde45614d006b6ea6c3b0265b83060b14b9d3a34
+PKG_MIRROR_HASH:=d6bc828ea05f9a1ff3241f575a6ce699e577f9b79277182699e8fa03ac094ac9
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/flukso/lua-mosquitto.git
--- a/lang/lua-openssl/Makefile
+++ b/lang/lua-openssl/Makefile
@ -8,19 +8,19 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=lua-openssl
-PKG_VERSION:=0.7.4
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/zhaozg/lua-openssl.git
+PKG_SOURCE_VERSION:=0.7.8-0
+PKG_MIRROR_HASH:=890dda7b23ff303e70ca8aa0d729836de347c0e58057282f55c6abf87e39c602
+
 PKG_MAINTAINER:=Amnon Paz <pazamnon@gmail.com>
 PKG_LICENSE:=MIT
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_MIRROR_HASH:=c27cedee438de95877823b1ae0607556564d82c8692be40f43743ca9cc5a029a
-PKG_SOURCE_URL:=https://github.com/zhaozg/lua-openssl.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=96effbaf477ca205f1787aaf1cce643bd208066b
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk

 define Package/lua-openssl
  SUBMENU:=Lua
@ -37,7 +37,7 @@ endef

 define Package/lua-openssl/install
 	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/openssl.so $(1)/usr/lib/lua/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lua/5.1/openssl.so $(1)/usr/lib/lua/
 endef

 $(eval $(call BuildPackage,lua-openssl))
--- a/lang/lua-openssl/patches/0001-Revise-Makefile.patch
+++ b/lang/lua-openssl/patches/0001-Revise-Makefile.patch
@ -1,148 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 10c1142..2a94df4 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1,121 +1,52 @@
- T=openssl
-+.PHONY: install clean
- 
-PREFIX		?=/usr/local
-CC		:= $(CROSS)$(CC)
-AR		:= $(CROSS)$(AR)
-LD		:= $(CROSS)$(LD)
-+PKGC ?= pkg-config
- 
-#OS auto detect
-ifneq (,$(TARGET_SYS))
-  SYS		:= $(TARGET_SYS)
-else
-  SYS		:= $(shell gcc -dumpmachine)
-endif
-
-#Lua auto detect
-LUA_VERSION	:= $(shell pkg-config luajit --print-provides)
-ifeq ($(LUA_VERSION),)
-  # Not found luajit package, try lua
-  LUA_VERSION	:= $(shell pkg-config lua --print-provides)
-  ifeq ($(LUA_VERSION),)
-    # Not found lua package, try from prefix
-    LUA_VERSION := $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)")
-    LUA_CFLAGS	?= -I$(PREFIX)/include/lua$(LUA_VERSION)
-    LUA_LIBS	?= -L$(PREFIX)/lib -llua
-    LUA_LIBDIR	?= $(PREFIX)/lib/lua/$(LUA_VERSION)
-  else
-    # Found lua package
-    LUA_VERSION	:= $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)")
-    LUA_CFLAGS	?= $(shell pkg-config lua --cflags)
-    LUA_LIBS	?= $(shell pkg-config lua --libs)
-    LUA_LIBDIR	?= $(PREFIX)/lib/lua/$(LUA_VERSION)
-  endif
-else
-  # Found luajit package
-  LUA_VERSION	:= $(shell luajit -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)")
-  LUA_CFLAGS	?= $(shell pkg-config luajit --cflags)
-  LUA_LIBS	?= $(shell pkg-config luajit --libs)
-  LUA_LIBDIR	?= $(PREFIX)/lib/lua/$(LUA_VERSION)
-endif
-
-#OpenSSL auto detect
-OPENSSL_CFLAGS	?= $(shell pkg-config openssl --cflags)
-OPENSSL_LIBS	?= $(shell pkg-config openssl --static --libs)
-
-ifneq (, $(findstring linux, $(SYS)))
-  # Do linux things
-  CFLAGS	 = -fpic
-  LDFLAGS	 = -Wl,--no-undefined -fpic -lrt -ldl -lm
-endif
-
-ifneq (, $(findstring apple, $(SYS)))
-  # Do darwin things
-  CFLAGS	 = -fPIC
-  LDFLAGS	 = -fPIC -undefined dynamic_lookup -ldl
-  #MACOSX_DEPLOYMENT_TARGET="10.3"
-  CC		:= MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(CC)
-endif
-+LIB_OPTION	= -shared
-+LUAPKGC = lua
- 
-ifneq (, $(findstring mingw, $(SYS)))
-  # Do mingw things
-  CFLAGS	 = -DLUA_LIB -DLUA_BUILD_AS_DLL -DWIN32_LEAN_AND_MEAN
-endif
-
-ifneq (, $(findstring cygwin, $(SYS)))
-  # Do cygwin things
-  CFLAGS	 = -fPIC
-endif
-+# LUA include/libraries build flags
-+LUA_CFLAGS  := $(shell $(PKGC) --cflags $(LUAPKGC))
-+LUA_LIBS_DIR := $(shell $(PKGC) --libs $(LUAPKGC))
- 
-ifneq (, $(findstring iOS, $(SYS)))
-  # Do iOS things
-  CFLAGS	 = -fPIC
-  LDFLAGS	 = -fPIC -ldl
-endif
-+# openssl include/libraries build flags
-+OPENSSL_CFLAGS      ?= $(shell $(PKGC) openssl --cflags)
-+OPENSSL_LIBS_DIR    ?= $(shell $(PKGC) openssl --libs)
- 
-#custom config
-+LDFLAGS		= -Wl,--no-undefined -fpic -lrt -ldl -lm $(OPENSSL_LIBS_DIR) $(LUA_LIBS_DIR)
-+CFLAGS          += -fPIC -DPTHREADS $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
- ifeq (.config, $(wildcard .config))
-  include .config
-+include .config
- endif
- 
-LIBNAME= $T.so.$V
-+LIBNAME= $T.so
- 
-CFLAGS		+= $(OPENSSL_CFLAGS) $(LUA_CFLAGS) $(TARGET_FLAGS)
-LDFLAGS		+= -shared $(OPENSSL_LIBS) $(LUA_LIBS)
- # Compilation directives
- WARN_MIN	 = -Wall -Wno-unused-value
- WARN		 = -Wall
- WARN_MOST	 = $(WARN) -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
- CFLAGS		+= -g $(WARN_MIN) -DPTHREADS -Ideps -Ideps/lua-compat -Ideps/auxiliar
- 
-
- OBJS=src/asn1.o deps/auxiliar/auxiliar.o src/bio.o src/cipher.o src/cms.o src/compat.o src/crl.o src/csr.o src/dh.o src/digest.o src/dsa.o \
- src/ec.o src/engine.o src/hmac.o src/lbn.o src/lhash.o src/misc.o src/ocsp.o src/openssl.o src/ots.o src/pkcs12.o src/pkcs7.o    \
- src/pkey.o src/rsa.o src/ssl.o src/th-lock.o src/util.o src/x509.o src/xattrs.o src/xexts.o src/xname.o src/xstore.o \
- src/xalgor.o src/callback.o src/srp.o deps/auxiliar/subsidiar.o
- 
-.c.o:
-	$(CC) $(CFLAGS) -c -o $@ $?
-+%.o: %.c
-+	$(CC) $(CFLAGS) -c $< -o $@
- 
- all: $T.so
-	@echo "Target system: "$(SYS)
-
-$T.so: lib$T.a
-	$(CC) -o $@ src/openssl.o -L. -l$T $(LDFLAGS)
-+	echo $(SYS)
-+	$(CC) $(LDFLAGS) $(LIB_OPTION) $(OBJS) -o $@
- 
-lib$T.a: $(OBJS)
-	$(AR) rcs $@ $?
-+$T.so: $(OBJS)
-+	echo "LUA LIBS_DIR: " $(LUA_LIBS_DIR)
-+	$(CC) $(CFLAGS) $(LIB_OPTION) -o $T.so $(OBJS) $(LDFLAGS)
- 
- install: all
- 	mkdir -p $(LUA_LIBDIR)
- 	cp $T.so $(LUA_LIBDIR)
- 
-info:
-	@echo "Target system: "$(SYS)
-	@echo "CC:" $(CC)
-	@echo "AR:" $(AR)
-	@echo "PREFIX:" $(PREFIX)
-
- clean:
-	rm -f $T.so lib$T.a $(OBJS)
-
-# vim: ts=8 sw=8 noet
-+	rm -f $T.so $(OBJS)
--- a/lang/lua-openssl/patches/010-cmake.patch
+++ b/lang/lua-openssl/patches/010-cmake.patch
@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -21,8 +21,6 @@ add_definitions(-DPTHREADS)
+ 
+ if(BUILD_SHARED_LUA_OPENSSL)
+     set(LUA_OPENSSL_LIBTYPE SHARED)
+-    add_definitions(-DLUA_BUILD_AS_DLL -DLUA_LIB)
+-    set(EXTRA_LIBS "ws2_32.lib" "crypt32.lib")
+ else()
+     set(LUA_OPENSSL_LIBTYPE STATIC)
+ endif()
--- a/lang/lua-openssl/patches/020-no-luajit.patch
+++ b/lang/lua-openssl/patches/020-no-luajit.patch
@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -8,7 +8,6 @@ option(BUILD_SHARED_LUA_OPENSSL "Shared
+ 
+ include(GNUInstallDirs)
+ 
+-find_package(LuaJIT)
+ if(NOT LUAJIT_FOUND)
+     find_package(Lua REQUIRED)
+ endif()
--- a/lang/lua-openssl/patches/020-openssl-deprecated.patch
+++ b/lang/lua-openssl/patches/020-openssl-deprecated.patch
@ -0,0 +1,143 @@
+--- a/src/cipher.c
+++ b/src/cipher.c
+@@ -8,6 +8,10 @@ cipher module for lua-openssl binding
+ #include "openssl.h"
+ #include "private.h"
+ 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#define EVP_CIPHER_CTX_reset EVP_CIPHER_CTX_init
+#endif
+
+ /***
+ list all support cipher algs
+ 
+@@ -109,7 +113,7 @@ static LUA_FUNCTION(openssl_evp_encrypt)
+       memcpy(evp_iv, iv, iv_len);
+     }
+ 
+-    EVP_CIPHER_CTX_init(c);
+    EVP_CIPHER_CTX_reset(c);
+     ret = EVP_EncryptInit_ex(c, cipher, e, (const byte*)evp_key, iv_len > 0 ? (const byte*)evp_iv : NULL);
+     if (ret == 1)
+     {
+@@ -131,8 +135,12 @@ static LUA_FUNCTION(openssl_evp_encrypt)
+         OPENSSL_free(buffer);
+       }
+     }
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+    EVP_CIPHER_CTX_reset(c);
+#else
+     EVP_CIPHER_CTX_cleanup(c);
+     EVP_CIPHER_CTX_free(c);
+#endif
+     return (ret == 1) ? ret : openssl_pushresult(L, ret);
+   }
+   else
+@@ -196,7 +204,7 @@ static LUA_FUNCTION(openssl_evp_decrypt)
+       memcpy(evp_iv, iv, iv_len);
+     }
+ 
+-    EVP_CIPHER_CTX_init(c);
+    EVP_CIPHER_CTX_reset(c);
+     ret = EVP_DecryptInit_ex(c, cipher, e, key ? (const byte*)evp_key : NULL, iv_len > 0 ? (const byte*)evp_iv : NULL);
+     if (ret == 1)
+     {
+@@ -220,8 +228,12 @@ static LUA_FUNCTION(openssl_evp_decrypt)
+         OPENSSL_free(buffer);
+       }
+     }
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+    EVP_CIPHER_CTX_reset(c);
+#else
+     EVP_CIPHER_CTX_cleanup(c);
+     EVP_CIPHER_CTX_free(c);
+#endif
+     return (ret == 1) ? ret : openssl_pushresult(L, ret);
+   }
+   else
+@@ -292,7 +304,7 @@ static LUA_FUNCTION(openssl_evp_cipher)
+       memcpy(evp_iv, iv, iv_len);
+     }
+ 
+-    EVP_CIPHER_CTX_init(c);
+    EVP_CIPHER_CTX_reset(c);
+     ret = EVP_CipherInit_ex(c, cipher, e, (const byte*)evp_key, iv_len > 0 ? (const byte*)evp_iv : NULL, enc);
+     if (ret == 1)
+     {
+@@ -317,8 +329,12 @@ static LUA_FUNCTION(openssl_evp_cipher)
+         OPENSSL_free(buffer);
+       }
+     }
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+    EVP_CIPHER_CTX_reset(c);
+#else
+     EVP_CIPHER_CTX_cleanup(c);
+     EVP_CIPHER_CTX_free(c);
+#endif
+     return (ret == 1) ? ret : openssl_pushresult(L, ret);
+   }
+   else
+@@ -376,7 +392,7 @@ static LUA_FUNCTION(openssl_cipher_new)
+       memcpy(evp_iv, iv, iv_len);
+     }
+     c = EVP_CIPHER_CTX_new();
+-    EVP_CIPHER_CTX_init(c);
+    EVP_CIPHER_CTX_reset(c);
+     if (!EVP_CipherInit_ex(c, cipher, e, key ? (const byte*)evp_key : NULL, iv_len > 0 ? (const byte*)evp_iv : NULL, enc))
+     {
+       luaL_error(L, "EVP_CipherInit_ex failed, please check openssl error");
+@@ -431,7 +447,7 @@ static LUA_FUNCTION(openssl_cipher_encry
+       memcpy(evp_iv, iv, iv_len);
+     }
+     c = EVP_CIPHER_CTX_new();
+-    EVP_CIPHER_CTX_init(c);
+    EVP_CIPHER_CTX_reset(c);
+     ret = EVP_EncryptInit_ex(c, cipher, e,
+                              key ? (const byte*)evp_key : NULL,
+                              iv_len > 0 ? (const byte*)evp_iv : NULL);
+@@ -491,7 +507,7 @@ static LUA_FUNCTION(openssl_cipher_decry
+       memcpy(evp_iv, iv, iv_len);
+     }
+     c = EVP_CIPHER_CTX_new();
+-    EVP_CIPHER_CTX_init(c);
+    EVP_CIPHER_CTX_reset(c);
+     ret = EVP_DecryptInit_ex(c, cipher, e,
+                              key ? (const byte*)evp_key : NULL,
+                              iv_len > 0 ? (const byte*)evp_iv : NULL);
+@@ -937,8 +953,12 @@ static LUA_FUNCTION(openssl_cipher_ctx_f
+     return 0;
+   lua_pushnil(L);
+   lua_rawsetp(L, LUA_REGISTRYINDEX, ctx);
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+  EVP_CIPHER_CTX_reset(ctx);
+#else
+   EVP_CIPHER_CTX_cleanup(ctx);
+   EVP_CIPHER_CTX_free(ctx);
+#endif
+   FREE_OBJECT(1);
+   return 0;
+ }
+--- a/src/openssl.c
+++ b/src/openssl.c
+@@ -523,9 +523,7 @@ LUALIB_API int luaopen_openssl(lua_State
+ #endif
+ 
+ #ifndef OPENSSL_NO_ENGINE
+-    ENGINE_load_dynamic();
+-    ENGINE_load_openssl();
+-    ENGINE_load_builtin_engines();
+    ENGINE_register_all_complete();
+ #endif
+ #ifdef LOAD_ENGINE_CUSTOM
+     LOAD_ENGINE_CUSTOM
+--- a/src/th-lock.c
+++ b/src/th-lock.c
+@@ -310,7 +310,7 @@ unsigned long irix_thread_id(void)
+ 
+ /* Linux and a few others */
+ #ifdef PTHREADS
+-#ifndef OPENSSL_SYS_WIN32
+#if !defined(OPENSSL_SYS_WIN32) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
+ static pthread_mutex_t *lock_cs;
+ static long *lock_count;
+ 
--- a/lang/lua-penlight/Makefile
+++ b/lang/lua-penlight/Makefile
@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=lua-penlight
-PKG_VERSION:=1.7.0
+PKG_VERSION:=1.8.0
 PKG_RELEASE:=1

 PKG_BUILD_DIR:=$(BUILD_DIR)/Penlight-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/Tieske/Penlight/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=5b793fc93fa7227190e191e5b24a8f0ce9dd5958ccebe7a53842a58b5d46057f
+PKG_HASH:=a1a41c5ec82c0459bc0508a0fb1cb56dfaa83a1dd7754d7174b336ad65420d3d
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE.md

--- a/lang/lua-rings/patches/config.patch
+++ b/lang/lua-rings/patches/config.patch
@ -1,5 +1,5 @@
--- lua-rings-1.3.0_org/config	2014-06-04 15:24:24.223662038 +0800
-+++ lua-rings-1.3.0/config	2014-06-04 16:16:15.183594040 +0800
+--- a/config
+++ b/config
@@ -1,15 +1,15 @@
 # Installation directories
 
@ -19,7 +19,7 @@
 
 # Lua includes directory
 LUA_INC ?= $(PREFIX)/include
-@@ -24,6 +24,5 @@
+@@ -24,6 +24,5 @@ LIBNAME ?= $T.so.$V
 WARN ?= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -Wpointer-arith -pedantic
 INCS ?= -I$(LUA_INC)
 CFLAGS ?= $(WARN) $(INCS)
--- a/lang/lua-rings/patches/makefile.patch
+++ b/lang/lua-rings/patches/makefile.patch
@ -1,5 +1,5 @@
--- lua-rings-1.3.0_org/Makefile	2014-06-04 15:24:37.583661746 +0800
-+++ lua-rings-1.3.0/Makefile	2014-06-04 15:23:41.611662970 +0800
+--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,8 @@
 T= rings
 CONFIG= ./config
--- a/lang/lua-rs232/patches/100-remove-build-timestamps.patch
+++ b/lang/lua-rs232/patches/100-remove-build-timestamps.patch
@ -8,7 +8,7 @@
 #define MODULE_NAMESPACE "luars232"
 #define MODULE_VERSION "1.0.3"
 #define MODULE_BUILD "$Id: luars232.c 15 2011-02-23 09:02:20Z sp $"
-@@ -553,9 +552,6 @@
+@@ -553,9 +552,6 @@ RS232_LIB int luaopen_luars232(lua_State
 	lua_pushstring(L, MODULE_BUILD);
 	lua_setfield(L, -2, "_BUILD");
 
--- a/lang/luafilesystem/Makefile
+++ b/lang/luafilesystem/Makefile
@ -8,15 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=luafilesystem
-PKG_VERSION:=1.7.0.2
+PKG_VERSION:=1.8.0
 PKG_RELEASE:=1

-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MIRROR_HASH:=f109017711dd77d74a39bd1c0975be7edf726da0265f16496ea468481fac0b85
+PKG_MIRROR_HASH:=0342b54bcbd4aa1679bf23b2a4cc8177f630e6415b7a82e58cefb9f8991e0a8e
 PKG_SOURCE_URL:=https://github.com/keplerproject/luafilesystem.git
-PKG_SOURCE_VERSION:=de87218e9798c4dd1a40d65403d99e9e82e1cfa0
+PKG_SOURCE_VERSION:=v$(subst .,_,$(PKG_VERSION))
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

 include $(INCLUDE_DIR)/package.mk

--- a/lang/luajit/Makefile
+++ b/lang/luajit/Makefile
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=luajit
 PKG_VERSION:=2.1.0-beta3
-PKG_RELEASE:=4
+PKG_RELEASE:=5

 PKG_SOURCE:=LuaJIT-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://luajit.org/download
@ -24,7 +24,7 @@ define Package/luajit
 CATEGORY:=Languages
 TITLE:=LuaJIT
 URL:=https://www.luajit.org
- DEPENDS:=@(i386||x86_64||arm||armeb||aarch64||powerpc||mips||mipsel||mips64)
+ DEPENDS:=@(i386||x86_64||arm||armeb||aarch64||(powerpc&&HAS_FPU)||mips||mipsel||mips64)
 endef

 define Package/luajit/description
--- a/lang/luajit/patches/020-clang.patch
+++ b/lang/luajit/patches/020-clang.patch
@ -0,0 +1,12 @@
+--- a/src/lj_arch.h
+++ b/src/lj_arch.h
+@@ -391,9 +391,6 @@
+ #endif
+ #endif
+ #elif !LJ_TARGET_PS3
+-#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
+-#error "Need at least GCC 4.3 or newer"
+-#endif
+ #endif
+ #endif
+ 
--- a/lang/lualanes/Makefile
+++ b/lang/lualanes/Makefile
@ -9,49 +9,49 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=lualanes
 PKG_VERSION:=3.13.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/LuaLanes/lanes/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=53a17d7ee11f17ca0543ae5aa640208dcb62d37862a0d0ea450455fae12c8ff1
 PKG_BUILD_DIR:=$(BUILD_DIR)/lanes-$(PKG_VERSION)

-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
+PKG_MAINTAINER:=Vladimir Malyutin <first-leon@yandex.ru>
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=COPYRIGHT

 PKG_BUILD_DEPENDS:=lua/host

 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk

 define Package/lualanes
 	SUBMENU:=Lua
 	SECTION:=lang
 	CATEGORY:=Languages
 	TITLE:=LuaLanes
-	URL:=http://luaforge.net/projects/lanes/
+	URL:=http://lualanes.github.io/lanes/
 	DEPENDS:=+lua +luac +liblua +libpthread
-	MAINTAINER:=Vladimir Malyutin <first-leon@yandex.ru>
 endef

 define Package/lualanes/description
-	Lanes is a lightweight, native, lazy evaluating multithreading library for Lua 5.1 and 5.2.
-endef
+ Lua Lanes is a Lua extension library providing the possibility to run
+multiple Lua states in parallel. It is intended to be used for optimizing
+performance on multicore CPU's and to study ways to make Lua programs
+naturally parallel to begin with.

-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all \
-        CC="$(TARGET_CC)" \
-        LUA="$(STAGING_DIR_HOSTPKG)/bin/lua" \
-        LUAC="$(STAGING_DIR_HOSTPKG)/bin/luac" \
-	LUA_FLAGS= \
-	LUA_LIBS=-llua \
-        OPT_FLAGS="$(TARGET_CFLAGS) -Dpthread_yield=sched_yield"
+Lanes is included into your software by the regular require "lanes" method.
+No C side programming is needed; all APIs are Lua side, and most existing
+extension modules should work seamlessly together with the multiple lanes.
+
+Lanes supports Lua 5.1, 5.2 and 5.3
 endef

 define Package/lualanes/install
 	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lanes.lua $(1)/usr/lib/lua/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/lua/lmod/lanes.lua $(1)/usr/lib/lua/
 	$(INSTALL_DIR) $(1)/usr/lib/lua/lanes
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lanes/core.so $(1)/usr/lib/lua/lanes/core.so
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/lua/cmod/core.so $(1)/usr/lib/lua/lanes/core.so
 endef

 $(eval $(call BuildPackage,lualanes))
--- a/lang/lualanes/patches/100-musl-compat.patch
+++ b/lang/lualanes/patches/100-musl-compat.patch
@ -1,11 +1,11 @@
 --- a/src/threading.h
 +++ b/src/threading.h
-@@ -110,7 +110,7 @@ enum e_status { PENDING, RUNNING, WAITING, DONE, ERROR_ST, CANCELLED };
+@@ -110,7 +110,7 @@ enum e_status { PENDING, RUNNING, WAITIN
   #endif // PLATFORM_WIN32
   #include <pthread.h>
 
 -  #ifdef PLATFORM_LINUX
-+  #if defined(PLATFORM_LINUX) && defined(__UCLIBC__)
+  #if defined(PLATFORM_LINUX) && defined(__GLIBC__)
   # define _MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
   #else
     /* OS X, ... */
--- a/lang/luaposix/Makefile
+++ b/lang/luaposix/Makefile
@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=luaposix
-PKG_VERSION:=34.1.1
+PKG_VERSION:=35.0
 PKG_RELEASE:=1

 PKG_SOURCE_URL:=https://codeload.github.com/$(PKG_NAME)/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)?
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=7948f4ac8b953172e928753632e37ad97cc3014df74b524fe7839f71216a7e90
+PKG_HASH:=a4edf2f715feff65acb009e8d1689e57ec665eb79bc36a6649fae55eafd56809
 PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
--- a/lang/luaposix/patches/102-disable-compat-deprecated.diff
+++ b/lang/luaposix/patches/102-disable-compat-deprecated.diff
@ -1,19 +0,0 @@
-diff --git i/lib/posix/init.lua w/lib/posix/init.lua
-index c17693a..d4db923 100644
--- i/lib/posix/init.lua
-+++ w/lib/posix/init.lua
-@@ -325,14 +325,6 @@ do
-          end
-       end
-    end
-
-   -- Inject deprecated APIs (overwriting submodules) for backwards compatibility.
-   for k, v in next, require 'posix.deprecated' do
-      M[k] = v
-   end
-   for k, v in next, require 'posix.compat' do
-      M[k] = v
-   end
- end
- 
- 
--- a/lang/luaposix/patches/102-disable-compat-deprecated.patch
+++ b/lang/luaposix/patches/102-disable-compat-deprecated.patch
@ -0,0 +1,17 @@
+--- a/lib/posix/init.lua
+++ b/lib/posix/init.lua
+@@ -325,14 +325,6 @@ do
+          end
+       end
+    end
+-
+-   -- Inject deprecated APIs (overwriting submodules) for backwards compatibility.
+-   for k, v in next, (require 'posix.deprecated') do
+-      M[k] = v
+-   end
+-   for k, v in next, (require 'posix.compat') do
+-      M[k] = v
+-   end
+ end
+ 
+ 
--- a/lang/luaposix/patches/900-disable-ldoc.patch
+++ b/lang/luaposix/patches/900-disable-ldoc.patch
@ -1,5 +1,3 @@
-diff --git a/lukefile b/lukefile
-index 2d4bb2f..1e48540 100644
 --- a/lukefile
 +++ b/lukefile
@@ -29,8 +29,6 @@ incdirs  = {
--- a/lang/luarocks/patches/01_dont_modify_bin_shebang.diff
+++ b/lang/luarocks/patches/01_dont_modify_bin_shebang.diff
@ -1,7 +1,6 @@
-diff -rupN luarocks/Makefile luarocks.new/Makefile
--- luarocks/Makefile	2015-02-19 13:24:07.027310956 +0200
-+++ luarocks.new/Makefile	2015-02-22 13:28:24.497353543 +0200
-@@ -104,7 +104,7 @@ build_bins: cleanup_bins
+--- a/Makefile
+++ b/Makefile
+@@ -89,7 +89,7 @@ build_bins: cleanup_bins
 	for f in $(BIN_FILES) ;\
 	do \
 	   sed "1d" src/bin/$$f > src/bin/$$f.bak ;\
@ -10,4 +9,3 @@ diff -rupN luarocks/Makefile luarocks.new/Makefile
 	   echo "package.path = [[$(LUADIR)/?.lua;]]..package.path" | sed "s,//,/,g" >> src/bin/$$f ;\
 	   cat src/bin/$$f.bak >> src/bin/$$f ;\
 	   chmod +x src/bin/$$f ;\
-Binary files luarocks/src/bin/.luarocks.swp and luarocks.new/src/bin/.luarocks.swp differ
--- a/lang/luarocks/patches/02_allow_configure_uname_siteconfig_adjustment.patch
+++ b/lang/luarocks/patches/02_allow_configure_uname_siteconfig_adjustment.patch
@ -1,7 +1,5 @@
-Index: luarocks-2.2.2/configure
-===================================================================
--- luarocks-2.2.2.orig/configure
-+++ luarocks-2.2.2/configure
+--- a/configure
+++ b/configure
@@ -388,18 +388,22 @@ then
 fi
 
--- a/lang/luasec/patches/100-fix-compilation.patch
+++ b/lang/luasec/patches/100-fix-compilation.patch
@ -1,6 +1,6 @@
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -15,8 +15,8 @@ WARN=-Wall -pedantic
+@@ -16,8 +16,8 @@ WARN=-Wall -pedantic
 BSD_CFLAGS=-O2 -fPIC $(WARN) $(INCDIR) $(DEFS)
 BSD_LDFLAGS=-O -fPIC -shared $(LIBDIR)
 
@ -11,7 +11,7 @@
 
 MAC_ENV=env MACOSX_DEPLOYMENT_TARGET='$(MACVER)'
 MAC_CFLAGS=-O2 -fno-common $(WARN) $(INCDIR) $(DEFS)
-@@ -33,10 +33,10 @@ LDFLAGS += $(MYLDFLAGS)
+@@ -34,10 +34,10 @@ LDFLAGS += $(MYLDFLAGS)
 all:
 
 install: $(CMOD) $(LMOD)
--- a/lang/luasocket/patches/0001-Add-interface-support.patch
+++ b/lang/luasocket/patches/0001-Add-interface-support.patch
@ -13,9 +13,6 @@ Subject: [PATCH] Add interface resolving
 create mode 100644 src/if.c
 create mode 100644 src/if.h

-diff --git a/src/if.c b/src/if.c
-new file mode 100644
-index 0000000..db231aa
 --- /dev/null
 +++ b/src/if.c
@@ -0,0 +1,117 @@
@ -136,9 +133,6 @@ index 0000000..db231aa
 +  if_freenameindex(oni);
 +  return 1;
 +}
-diff --git a/src/if.h b/src/if.h
-new file mode 100644
-index 0000000..dc7faf8
 --- /dev/null
 +++ b/src/if.h
@@ -0,0 +1,27 @@
@ -169,8 +163,6 @@ index 0000000..dc7faf8
 +int if_open(lua_State *L);
 +
 +#endif /* IF_H */
-diff --git a/src/luasocket.c b/src/luasocket.c
-index e6ee747..85d41a6 100644
 --- a/src/luasocket.c
 +++ b/src/luasocket.c
@@ -21,6 +21,7 @@
@ -189,11 +181,8 @@ index e6ee747..85d41a6 100644
     {NULL, NULL}
 };
 
-diff --git a/src/makefile b/src/makefile
-index 8d3521e..09d4882 100644
 --- a/src/makefile
 +++ b/src/makefile
-
@@ -303,6 +303,7 @@ SOCKET_OBJS= \
 	compat.$(O) \
 	options.$(O) \
@ -210,8 +199,6 @@ index 8d3521e..09d4882 100644
 io.$(O): io.c io.h timeout.h
 luasocket.$(O): luasocket.c luasocket.h auxiliar.h except.h \
 	timeout.h buffer.h io.h inet.h socket.h usocket.h tcp.h \
-diff --git a/src/options.c b/src/options.c
-index 8ac2a14..1c73e6f 100644
 --- a/src/options.c
 +++ b/src/options.c
@@ -7,7 +7,10 @@
@ -239,5 +226,3 @@ index 8ac2a14..1c73e6f 100644
         } else
           luaL_argerror(L, -1, "number 'interface' field expected");
     }
--
-1.8.4.rc3
--- a/lang/luasocket/patches/0301-Fix-mpc85xx-build.patch
+++ b/lang/luasocket/patches/0301-Fix-mpc85xx-build.patch
@ -1,6 +1,6 @@
 --- a/src/makefile
 +++ b/src/makefile
-@@ -397,18 +398,18 @@ none:
+@@ -397,18 +397,18 @@ none:
 all: $(SOCKET_SO) $(MIME_SO)
 
 $(SOCKET_SO): $(SOCKET_OBJS)
--- a/lang/luv/Makefile
+++ b/lang/luv/Makefile
@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=luv
-PKG_VERSION:=1.22.0-1
-PKG_RELEASE:=1
+PKG_VERSION:=1.40.0-0
+PKG_RELEASE:=$(AUTORELEASE)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/luvit/luv/releases/download/$(PKG_VERSION)
-PKG_HASH:=27886acb3d3f531a3d6ca70360d2593ddf1a8d4daf94ca3beea14d9381227ff7
+PKG_HASH:=24473a081c3928eec2a352369cbafda97059574f4a4276861274473e7c7d17a0

 PKG_MAINTAINER:=Morteza Milani <milani@pichak.co>
 PKG_LICENSE:=Apache-2.0
@ -32,27 +32,27 @@ define Package/luv/config
 	source "$(SOURCE)/Config.in"
 endef

-CMAKE_OPTIONS += -DLUA_BUILD_TYPE=System
-CMAKE_OPTIONS += -DWITH_SHARED_LIBUV=ON
-CMAKE_OPTIONS += -DBUILD_MODULE=OFF
-CMAKE_OPTIONS += -DBUILD_SHARED_LIBS=ON
-
-ifeq ($(CONFIG_LUV_USE_LUAJIT_ENGINE),y)
-	CMAKE_OPTIONS += -DWITH_LUA_ENGINE=Luajit
-else
-	CMAKE_OPTIONS += -DWITH_LUA_ENGINE=Lua
-endif
+CMAKE_OPTIONS += \
+	-DLUA_BUILD_TYPE=System \
+	-DWITH_SHARED_LIBUV=ON \
+	-DBUILD_MODULE=OFF \
+	-DBUILD_SHARED_LIBS=ON \
+	-DWITH_LUA_ENGINE=$(if $(CONFIG_LUV_USE_LUAJIT_ENGINE),Luajit,Lua)

 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/luv
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/luv/*.h $(1)/usr/include/luv
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/luv/*.h $(1)/usr/include/luv
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libluv.so* $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libluv.pc $(1)/usr/lib/pkgconfig
+	$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libluv.pc
+	$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libluv.pc
 endef

 define Package/luv/install
 	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libluv.so.1.9.1 $(1)/usr/lib/lua/luv.so
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libluv.so.1.40.0 $(1)/usr/lib/lua/luv.so
 endef


--- a/lang/lyaml/Makefile
+++ b/lang/lyaml/Makefile
@ -0,0 +1,62 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lyaml
+PKG_VERSION:=6.2.7
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/gvvaughan/lyaml/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=9bb489cefae48b150d66f6bab4141d8d5831fcb7465bfc52a9845fa01efc63b0
+
+PKG_MAINTAINER:=Mathew McBride <matt@traverse.com.au>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=lua/host luarocks/host
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lyaml
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Lua lib-yaml bindings
+  URL:=https://github.com/gvvaughan/lyaml
+  DEPENDS:= +lua +libyaml
+endef
+
+define Package/lyaml/description
+  Lua bindings for libyaml
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include
+
+# Note: the duplicate environment exports are not a typo!
+# First is for luarocks, then the second is for the compilation
+# invoked by luarocks
+# (Same setup as luaposix)
+define Build/Compile
+	cd $(PKG_BUILD_DIR) && \
+	LUA_LIBDIR=$(STAGING_DIR)/usr/lib/lua \
+	LUA_PKGNAME=lua5.1 \
+	CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	CC="$(TARGET_CC)" LD="$(TARGET_CC)" \
+	luarocks make --pack-binary-rock lyaml-$(PKG_VERSION)-1.rockspec \
+		LUA_LIBDIR=$(STAGING_DIR)/usr/lib/lua \
+		YAML_DIR=$(STAGING_DIR)/usr \
+		LUA_INCDIR=$(STAGING_DIR)/usr/include \
+		LUA_PKGNAME=lua5.1 \
+		CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		CC="$(TARGET_CC)" LD="$(TARGET_CC)"
+endef
+
+define Package/lyaml/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua/lyaml
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/linux/yaml.so $(1)/usr/lib/lua/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/lyaml/*.lua $(1)/usr/lib/lua/lyaml/
+endef
+
+$(eval $(call BuildPackage,lyaml))
--- a/lang/node-hid/Makefile
+++ b/lang/node-hid/Makefile
@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk

 PKG_NPM_NAME:=node-hid
 PKG_NAME:=$(PKG_NPM_NAME)
-PKG_VERSION:=1.2.0
+PKG_VERSION:=2.1.1
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=https://registry.npmjs.org/$(PKG_NPM_NAME)/-/
-PKG_HASH:=b4a3e4c5a42dcdb4b6ef3ceeec18ed073322e8bca4160b95ef1671b062796bde
+PKG_HASH:=6c1f05935215feed4e8d2f4aecf31abbad8fa783d252b0bd6041ed2f2e96e9ba

 PKG_BUILD_DEPENDS:=node/host
 PKG_USE_MIPS16:=0
@ -31,8 +31,8 @@ define Package/node-hid
  SECTION:=lang
  CATEGORY:=Languages
  TITLE:=Node.js package to access HID devices
-  URL:=https://github.com/node-hid/node-hid
-  DEPENDS:=+node +node-npm +libusb-1.0 +hidapi +libudev-fbsd $(ICONV_DEPENDS)
+  URL:=https://www.npmjs.com/package/node-hid
+  DEPENDS:=+node +node-npm +libusb-1.0 +libudev $(ICONV_DEPENDS)
 endef

 define Package/node-hid/description
@ -49,7 +49,7 @@ TARGET_CFLAGS+=$(FPIC) -I$(STAGING_DIR)/usr/include/libusb-1.0
 TARGET_LDFLAGS+=$(if $(ICONV_FULL),-liconv)

 define Build/Compile
-	git init $(PKG_BUILD_DIR)
+	GYP_DEFINES='driver="hidraw"' \
 	$(MAKE_VARS) \
 	$(MAKE_FLAGS) \
 	npm_config_arch=$(NODEJS_CPU) \
@ -66,9 +66,7 @@ endef

 define Package/node-hid/install
 	$(INSTALL_DIR) $(1)/usr/lib/node/$(PKG_NPM_NAME)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{package.json,*.md} \
-		$(1)/usr/lib/node/$(PKG_NPM_NAME)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{binding.gyp,*.js} \
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{package.json,*.md,*.js} \
 		$(1)/usr/lib/node/$(PKG_NPM_NAME)/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{node_modules,src} \
 		$(1)/usr/lib/node/$(PKG_NPM_NAME)/
@ -76,7 +74,7 @@ define Package/node-hid/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/build/Release/HID*.node \
 		$(1)/usr/lib/node/$(PKG_NPM_NAME)/build/Release/
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(LN) ../lib/node/node-hid/src/show-devices.js $(1)/usr/bin/hid-showdevices
+	$(LN) ../lib/node/$(PKG_NPM_NAME)/src/show-devices.js $(1)/usr/bin/hid-showdevices
 endef

 $(eval $(call BuildPackage,node-hid))
--- a/lang/node-hid/patches/000-support_musl.patch
+++ b/lang/node-hid/patches/000-support_musl.patch
@ -1,6 +1,5 @@
-diff -urN a/hidapi/linux/hid.c b/hidapi/linux/hid.c
--- a/hidapi/linux/hid.c	1985-10-26 17:15:00.000000000 +0900
-+++ b/hidapi/linux/hid.c	2019-12-12 11:15:11.164454207 +0900
+--- a/hidapi/linux/hid.c
+++ b/hidapi/linux/hid.c
@@ -24,6 +24,7 @@
 /* C */
 #include <stdio.h>
--- a/lang/node-homebridge/Makefile
+++ b/lang/node-homebridge/Makefile
@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk

 PKG_NPM_NAME:=homebridge
 PKG_NAME:=node-$(PKG_NPM_NAME)
-PKG_VERSION:=0.4.53
+PKG_VERSION:=1.2.4
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://registry.npmjs.org/$(PKG_NPM_NAME)/-/
-PKG_HASH:=c616c004451a2d508b810927488abece965a0c099f6d8bf13bbfc9b647e886bb
+PKG_SOURCE_URL:=https://registry.npmjs.org/$(PKG_NPM_NAME)/-/
+PKG_HASH:=f91ab0058707a0498d97d87f45f19682065f80660fac942e0985caf9bb205f2a

 PKG_BUILD_DEPENDS:=node/host
 PKG_USE_MIPS16:=0
@ -34,16 +34,17 @@ endef

 define Package/node-homebridge/description
 Homebridge is a lightweight Node.js server you can run on your home network that emulates the iOS HomeKit API
+ *** You need to install avahi-nodbus-daemon or avahi-dbus-daemon or umdns or mdnsd package. ***
 endef

+TAR_OPTIONS+= --strip-components 1
+TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+
 NODEJS_CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH)))))
 TMPNPM:=$(shell mktemp -u XXXXXXXXXX)

 TARGET_CFLAGS+=$(FPIC)
-
-define Build/Prepare
-	$(INSTALL_DIR) $(PKG_BUILD_DIR)
-endef
+TARGET_CPPFLAGS+=$(FPIC)

 define Build/Compile
 	$(MAKE_VARS) \
@ -55,16 +56,21 @@ define Build/Compile
 	npm_config_prefix=$(PKG_INSTALL_DIR)/usr/ \
 	npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \
 	npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) \
-	npm install -g $(DL_DIR)/$(PKG_SOURCE)
+	npm install -g $(PKG_BUILD_DIR)
 	rm -rf $(TMP_DIR)/npm-tmp-$(TMPNPM)
 	rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM)
 endef

 define Package/node-homebridge/install
-	$(INSTALL_DIR) $(1)/usr/lib/node
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/* $(1)/usr/lib/node/
+	$(INSTALL_DIR) $(1)/usr/lib/node/$(PKG_NPM_NAME)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{*.json,*.md} \
+		$(1)/usr/lib/node/$(PKG_NPM_NAME)/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{node_modules,lib} \
+		$(1)/usr/lib/node/$(PKG_NPM_NAME)/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{LICENSE,bin} \
+		$(1)/usr/lib/node/$(PKG_NPM_NAME)/
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(LN) ../lib/node/homebridge/bin/homebridge $(1)/usr/bin/homebridge
+	$(LN) ../lib/node/$(PKG_NPM_NAME)/bin/homebridge $(1)/usr/bin/homebridge
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/homebridge.init $(1)/etc/init.d/homebridge
 endef
--- a/lang/node-homebridge/patches/000-add_module_search_path.patch
+++ b/lang/node-homebridge/patches/000-add_module_search_path.patch
@ -0,0 +1,10 @@
+--- a/lib/pluginManager.js
+++ b/lib/pluginManager.js
+@@ -324,6 +324,7 @@ class PluginManager {
+             else {
+                 this.searchPaths.add("/usr/local/lib/node_modules");
+                 this.searchPaths.add("/usr/lib/node_modules");
+                this.searchPaths.add("/usr/lib/node");
+                 this.searchPaths.add(child_process_1.execSync("/bin/echo -n \"$(npm --no-update-notifier -g prefix)/lib/node_modules\"").toString("utf8"));
+             }
+         }
--- a/lang/node-javascript-obfuscator/Makefile
+++ b/lang/node-javascript-obfuscator/Makefile
@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk

 PKG_NPM_NAME:=javascript-obfuscator
 PKG_NAME:=node-$(PKG_NPM_NAME)
-PKG_VERSION:=1.2.2
+PKG_VERSION:=2.9.4
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=https://registry.npmjs.org/$(PKG_NPM_NAME)/-/
-PKG_HASH:=adac10d3afe244833b74e6c965b7631a2a4417879e022fc4b7beea8be60ca86b
+PKG_HASH:=db443ed7c07a7a111352dac4aa7c6edd7969f97386f37c1cfe884d5a8c5f5408

 PKG_BUILD_DEPENDS:=node/host
 HOST_BUILD_PARALLEL:=1
--- a/lang/node-serialport-bindings/Makefile
+++ b/lang/node-serialport-bindings/Makefile
@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk
 PKG_NPM_SCOPE:=serialport
 PKG_NPM_NAME:=bindings
 PKG_NAME:=node-$(PKG_NPM_SCOPE)-$(PKG_NPM_NAME)
-PKG_VERSION:=8.0.7
+PKG_VERSION:=9.0.4
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=https://registry.npmjs.org/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/-/
-PKG_HASH:=b555aabf8f47a914589e5e625c87b1ec6f0ce63f284cf59d5bf18c934ac988c4
+PKG_HASH:=aec200860bd175e4b14b4ab1aa56a5f750172b6c8e20ccb234846206395848d4

 PKG_BUILD_DEPENDS:=node/host
 PKG_USE_MIPS16:=0
@ -55,7 +55,7 @@ define Build/Compile
 	npm_config_prefix=$(PKG_INSTALL_DIR)/usr/ \
 	npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \
 	npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) \
-	npm install -g --build-from-source $(PKG_BUILD_DIR)
+	npm install -g $(PKG_BUILD_DIR)
 	rm -rf $(TMP_DIR)/npm-tmp-$(TMPNPM)
 	rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM)
 endef
--- a/lang/node-serialport-bindings/patches/000-powerpc_termios_header.patch
+++ b/lang/node-serialport-bindings/patches/000-powerpc_termios_header.patch
@ -1,16 +0,0 @@
--- a/src/serialport_linux.cpp
-+++ b/src/serialport_linux.cpp
-@@ -1,8 +1,13 @@
- #if defined(__linux__)
- 
- #include <sys/ioctl.h>
-+#if defined(__powerpc__) || defined(__powerpc64__)
-+#include <asm-generic/ioctls.h>
-+#include <asm-generic/termbits.h>
-+#else
- #include <asm/ioctls.h>
- #include <asm/termbits.h>
-+#endif
- 
- // Uses the termios2 interface to set nonstandard baud rates
- int linuxSetCustomBaudRate(const int fd, const unsigned int baudrate) {
--- a/lang/node-serialport/Makefile
+++ b/lang/node-serialport/Makefile
@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk

 PKG_NPM_NAME:=serialport
 PKG_NAME:=node-$(PKG_NPM_NAME)
-PKG_VERSION:=8.0.7
+PKG_VERSION:=9.0.4
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=https://registry.npmjs.org/$(PKG_NPM_NAME)/-/
-PKG_HASH:=b70000ad4560dbd7170e657554d6302024a340ae868e1db0fc672aaab2efbd9c
+PKG_HASH:=e19fe993ad16ae0e03fc42e24cfe4babf8fd90f8358e1885d5e216277dda1086

 PKG_BUILD_DEPENDS:=node/host
 PKG_USE_MIPS16:=0
@ -56,7 +56,7 @@ define Build/Compile
 	npm_config_prefix=$(PKG_INSTALL_DIR)/usr/ \
 	npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \
 	npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) \
-	npm install -g --build-from-source $(PKG_BUILD_DIR)
+	npm install -g $(PKG_BUILD_DIR)
 	rm -rf $(TMP_DIR)/npm-tmp-$(TMPNPM)
 	rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM)
 endef
@ -65,7 +65,7 @@ define Package/node-serialport/install
 	$(INSTALL_DIR) $(1)/usr/lib/node/$(PKG_NPM_NAME)
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{package.json,LICENSE,*.md} \
 		$(1)/usr/lib/node/$(PKG_NPM_NAME)/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/test.js \
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/*.js \
 		$(1)/usr/lib/node/$(PKG_NPM_NAME)/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{node_modules,lib} \
 		$(1)/usr/lib/node/$(PKG_NPM_NAME)/
--- a/lang/node-serialport/patches/000-remove_depends.patch
+++ b/lang/node-serialport/patches/000-remove_depends.patch
@ -0,0 +1,10 @@
+--- a/package.json
+++ b/package.json
+@@ -46,7 +46,6 @@
+   ],
+   "dependencies": {
+     "@serialport/binding-mock": "^9.0.2",
+-    "@serialport/bindings": "^9.0.4",
+     "@serialport/parser-byte-length": "^9.0.1",
+     "@serialport/parser-cctalk": "^9.0.1",
+     "@serialport/parser-delimiter": "^9.0.1",
--- a/lang/node-serialport/patches/001-turn_off_depends.patch
+++ b/lang/node-serialport/patches/001-turn_off_depends.patch
@ -1,10 +0,0 @@
--- a/package.json
-+++ b/package.json
-@@ -46,7 +46,6 @@
-   ],
-   "dependencies": {
-     "@serialport/binding-mock": "^8.0.6",
-    "@serialport/bindings": "^8.0.7",
-     "@serialport/parser-byte-length": "^8.0.6",
-     "@serialport/parser-cctalk": "^8.0.6",
-     "@serialport/parser-delimiter": "^8.0.6",
--- a/lang/node-yarn/Makefile
+++ b/lang/node-yarn/Makefile
@ -0,0 +1,71 @@
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NPM_NAME:=yarn
+PKG_NAME:=node-$(PKG_NPM_NAME)
+PKG_VERSION:=1.22.10
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=https://registry.npmjs.org/$(PKG_NPM_NAME)/-/
+PKG_HASH:=05a22fff30d7d8e8005bed277bf20d55111ba2bed65a6b91a0fcd1307b71fd8d
+
+PKG_MAINTAINER:=Hirokazu MORIKAWA <morikw2@gmail.com>, Patrik Laszlo <alabard@gmail.com>, Dobroslaw Kijowski <dobo90@gmail.com>
+PKG_LICENSE:=BSD-2-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_HOST_ONLY:=1
+HOST_BUILD_DEPENDS:=node/host
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/node-yarn
+  SUBMENU:=Node.js
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Fast, reliable, and secure dependency management
+  URL:=https://yarnpkg.com/
+  DEPENDS:=+node
+  BUILDONLY:=1
+endef
+
+define Package/node-yarn/description
+ Fast, reliable, and secure dependency management
+endef
+
+TAR_OPTIONS+= --strip-components 1
+TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+
+HOSTTMPNPM:=$(shell mktemp -u XXXXXXXXXX)
+
+define Host/Compile
+	$(HOST_MAKE_VARS) \
+	npm_config_nodedir=$(STAGING_DIR)/usr/ \
+	npm_config_prefix=$(HOST_INSTALL_DIR)/usr/ \
+	npm_config_cache=$(TMP_DIR)/npm-cache-$(HOSTTMPNPM) \
+	npm_config_tmp=$(TMP_DIR)/npm-tmp-$(HOSTTMPNPM) \
+	npm install -g $(HOST_BUILD_DIR)
+	rm -rf $(TMP_DIR)/npm-tmp-$(HOSTTMPNPM)
+	rm -rf $(TMP_DIR)/npm-cache-$(HOSTTMPNPM)
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(1)/lib/node_modules/$(PKG_NPM_NAME)
+	$(CP) $(HOST_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{package.json,LICENSE} \
+		$(1)/lib/node_modules/$(PKG_NPM_NAME)/
+	$(CP) $(HOST_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/README.md \
+		$(1)/lib/node_modules/$(PKG_NPM_NAME)/
+	$(CP) $(HOST_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{bin,lib} \
+		$(1)/lib/node_modules/$(PKG_NPM_NAME)/
+	$(INSTALL_DIR) $(1)/bin
+	$(LN) ../lib/node_modules/$(PKG_NPM_NAME)/bin/yarn.js $(1)/bin/yarn
+	$(LN) ../lib/node_modules/$(PKG_NPM_NAME)/bin/yarn.js $(1)/bin/yarnpkg
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,node-yarn))
--- a/lang/node/Makefile
+++ b/lang/node/Makefile
@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=node
-PKG_VERSION:=v12.18.4
-PKG_RELEASE:=1
+PKG_VERSION:=v14.17.0
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://nodejs.org/dist/$(PKG_VERSION)
-PKG_HASH:=25f03cb18e53b6d0959d0c219e701a85eb4693f526bdda7c72bc6199b364f609
+PKG_HASH:=56e05bff9331039317db417f772e635e0cd1c55f733f7b1b079d71ab5842c9ed

-PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>, Adrian Panella <ianchi74@outlook.com>
+PKG_MAINTAINER:=Hirokazu MORIKAWA <morikw2@gmail.com>, Adrian Panella <ianchi74@outlook.com>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:nodejs:node.js
@ -38,8 +38,8 @@ define Package/node
  SUBMENU:=Node.js
  TITLE:=Node.js is a platform built on Chrome's JavaScript runtime
  URL:=https://nodejs.org/
-  DEPENDS:=@(HAS_FPU||KERNEL_MIPS_FPU_EMULATOR) @!arc @!armeb @!powerpc \
-	   +libstdcpp +libopenssl +zlib +libnghttp2 +libuv +libhttp-parser \
+  DEPENDS:=@HAS_FPU @(i386||x86_64||arm||aarch64||mipsel) \
+	   +libstdcpp +libopenssl +zlib +libnghttp2 +libuv \
 	   +libcares +libatomic +NODEJS_ICU_SYSTEM:icu +NODEJS_ICU_SYSTEM:icu-full-data
 endef

@ -71,7 +71,7 @@ define Package/node/config
 	if PACKAGE_node
 	choice
 		prompt "i18n features"
-		default NODEJS_ICU_NONE
+		default NODEJS_ICU_SMALL
 		help
 		 Select i18n features

@ -79,17 +79,16 @@ define Package/node/config
 			bool "Disable"

 		config NODEJS_ICU_SMALL
-			depends on !BIG_ENDIAN
 			bool "small-icu"

 		config NODEJS_ICU_SYSTEM
-			depends on ARCH_64BIT&&!BIG_ENDIAN
+			depends on ARCH_64BIT
 			bool "system-icu"
 	endchoice
 	endif
 endef

-NODEJS_CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH)))))
+NODEJS_CPU:=$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))

 ifneq ($(CONFIG_ARCH_64BIT),y)
 FORCE_32BIT:=-m32
@ -97,8 +96,11 @@ endif

 MAKE_VARS+= \
 	DESTCPU=$(NODEJS_CPU) \
+	NO_LOAD='cctest.target.mk embedtest.target.mk node_mksnapshot.target.mk' \
 	LD_LIBRARY_PATH=$(STAGING_DIR_HOSTPKG)/share/icu/current/lib

+HOST_MAKE_VARS+=NO_LOAD='cctest.target.mk embedtest.target.mk'
+
 CONFIGURE_VARS:= \
 	CC="$(TARGET_CC) $(TARGET_OPTIMIZATION)" \
 	CXX="$(TARGET_CXX) $(TARGET_OPTIMIZATION)" \
@ -113,12 +115,8 @@ CONFIGURE_ARGS:= \
 	--shared-openssl \
 	--shared-nghttp2 \
 	--shared-libuv \
-	--shared-http-parser \
 	--shared-cares \
-	$(if $(CONFIG_NODEJS_ICU_SMALL),, \
-		--with-intl=$(if $(CONFIG_NODEJS_ICU_SYSTEM),system-icu,none)) \
-	$(if $(findstring mips,$(NODEJS_CPU)), \
-		$(if $(CONFIG_SOFT_FLOAT),--with-mips-float-abi=soft)) \
+	--with-intl=$(if $(CONFIG_NODEJS_ICU_SMALL),small-icu,$(if $(CONFIG_NODEJS_ICU_SYSTEM),system-icu,none)) \
 	$(if $(findstring +neon,$(CONFIG_CPU_TYPE)),--with-arm-fpu=neon) \
 	$(if $(findstring +vfp",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfp) \
 	$(if $(findstring +vfpv3",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3-d16) \
@ -129,7 +127,7 @@ HOST_CONFIGURE_VARS:=

 HOST_CONFIGURE_ARGS:= \
 	--dest-os=$(if $(findstring Darwin,$(HOST_OS)),mac,linux) \
-	--with-intl=none \
+	--with-intl=small-icu \
 	--prefix=$(STAGING_DIR_HOSTPKG)

 define Build/InstallDev
@ -143,8 +141,13 @@ define Package/node/install
 endef

 define Package/node-npm/install
-	$(INSTALL_DIR) $(1)/usr/lib/node_modules
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/* $(1)/usr/lib/node_modules/
+	$(INSTALL_DIR) $(1)/usr/lib/node_modules/npm
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/npm/{package.json,LICENSE} \
+		$(1)/usr/lib/node_modules/npm/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/npm/{AUTHORS,*.md} \
+		$(1)/usr/lib/node_modules/npm/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/npm/{node_modules,bin,lib} \
+		$(1)/usr/lib/node_modules/npm/
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(LN) ../lib/node_modules/npm/bin/npm-cli.js $(1)/usr/bin/npm
 	$(LN) ../lib/node_modules/npm/bin/npx-cli.js $(1)/usr/bin/npx
--- a/lang/node/patches/001-hardfloat.patch
+++ b/lang/node/patches/001-hardfloat.patch
@ -1,10 +0,0 @@
--- a/deps/v8/src/base/cpu.cc
-+++ b/deps/v8/src/base/cpu.cc
-@@ -143,6 +143,7 @@
-       ".set push\n\t"
-       ".set noreorder\n\t"
-       ".set oddspreg\n\t"
-+      ".set hardfloat\n\t"
-       "lui $t0, 0x3FF0\n\t"
-       "ldc1 $f0, %0\n\t"
-       "mtc1 $t0, $f1\n\t"
--- a/lang/node/patches/002-addr_info.patch
+++ b/lang/node/patches/002-addr_info.patch
@ -1,10 +0,0 @@
--- a/deps/uv/src/unix/getaddrinfo.c
-+++ b/deps/uv/src/unix/getaddrinfo.c
-@@ -103,6 +103,7 @@
-   int err;
- 
-   req = container_of(w, uv_getaddrinfo_t, work_req);
-+  req->hints->ai_flags &= ~AI_V4MAPPED;
-   err = getaddrinfo(req->hostname, req->service, req->hints, &req->addrinfo);
-   req->retcode = uv__getaddrinfo_translate_error(err);
- }
--- a/lang/node/patches/003-path.patch
+++ b/lang/node/patches/003-path.patch
@ -1,6 +1,6 @@
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
-@@ -1239,7 +1239,8 @@
+@@ -1184,7 +1184,8 @@ Module._initPaths = function() {
     path.resolve(process.execPath, '..') :
     path.resolve(process.execPath, '..', '..');
 
--- a/lang/node/patches/004-musl_support.patch
+++ b/lang/node/patches/004-musl_support.patch
@ -1,7 +1,6 @@
-diff -urN a/deps/v8/src/base/platform/condition-variable.cc b/deps/v8/src/base/platform/condition-variable.cc
--- a/deps/v8/src/base/platform/condition-variable.cc	2019-09-05 00:36:23.000000000 +0900
-+++ b/deps/v8/src/base/platform/condition-variable.cc	2019-09-12 15:10:01.063792083 +0900
-@@ -16,7 +16,7 @@
+--- a/deps/v8/src/base/platform/condition-variable.cc
+++ b/deps/v8/src/base/platform/condition-variable.cc
+@@ -16,7 +16,7 @@ namespace base {
 
 ConditionVariable::ConditionVariable() {
 #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
@ -10,7 +9,7 @@ diff -urN a/deps/v8/src/base/platform/condition-variable.cc b/deps/v8/src/base/p
   // On Free/Net/OpenBSD and Linux with glibc we can change the time
   // source for pthread_cond_timedwait() to use the monotonic clock.
   pthread_condattr_t attr;
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* m
       &native_handle_, &mutex->native_handle(), &ts);
 #else
 #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
@ -19,10 +18,9 @@ diff -urN a/deps/v8/src/base/platform/condition-variable.cc b/deps/v8/src/base/p
   // On Free/Net/OpenBSD and Linux with glibc we can change the time
   // source for pthread_cond_timedwait() to use the monotonic clock.
   result = clock_gettime(CLOCK_MONOTONIC, &ts);
-diff -urN a/deps/v8/src/base/platform/platform-posix.cc b/deps/v8/src/base/platform/platform-posix.cc
--- a/deps/v8/src/base/platform/platform-posix.cc	2019-09-05 00:36:23.000000000 +0900
-+++ b/deps/v8/src/base/platform/platform-posix.cc	2019-09-12 15:10:01.063792083 +0900
-@@ -772,7 +772,7 @@
+--- a/deps/v8/src/base/platform/platform-posix.cc
+++ b/deps/v8/src/base/platform/platform-posix.cc
+@@ -839,7 +839,7 @@ bool Thread::Start() {
 #if V8_OS_MACOSX
     // Default on Mac OS X is 512kB -- bump up to 1MB
     stack_size = 1 * 1024 * 1024;
@ -31,9 +29,8 @@ diff -urN a/deps/v8/src/base/platform/platform-posix.cc b/deps/v8/src/base/platf
     // Default on AIX is 96kB -- bump up to 2MB
     stack_size = 2 * 1024 * 1024;
 #endif
-diff -urN a/deps/v8/src/codegen/external-reference-table.cc b/deps/v8/src/codegen/external-reference-table.cc
--- a/deps/v8/src/codegen/external-reference-table.cc	2019-09-05 00:36:23.000000000 +0900
-+++ b/deps/v8/src/codegen/external-reference-table.cc	2019-09-12 15:09:41.959828134 +0900
+--- a/deps/v8/src/codegen/external-reference-table.cc
+++ b/deps/v8/src/codegen/external-reference-table.cc
@@ -9,7 +9,7 @@
 #include "src/ic/stub-cache.h"
 #include "src/logging/counters.h"
@ -43,19 +40,3 @@ diff -urN a/deps/v8/src/codegen/external-reference-table.cc b/deps/v8/src/codege
 #define SYMBOLIZE_FUNCTION
 #include <execinfo.h>
 #include <vector>
-diff -urN a/deps/v8/src/compiler-dispatcher/optimizing-compile-dispatcher.cc b/deps/v8/src/compiler-dispatcher/optimizing-compile-dispatcher.cc
--- a/deps/v8/src/compiler-dispatcher/optimizing-compile-dispatcher.cc	2019-09-05 00:36:23.000000000 +0900
-+++ b/deps/v8/src/compiler-dispatcher/optimizing-compile-dispatcher.cc	2019-09-12 15:10:01.063792083 +0900
-@@ -134,8 +134,10 @@
-     // The function may have already been optimized by OSR.  Simply continue.
-     // Use a mutex to make sure that functions marked for install
-     // are always also queued.
-    base::MutexGuard access_output_queue_(&output_queue_mutex_);
-    output_queue_.push(job);
-+    {
-+      base::MutexGuard access_output_queue_(&output_queue_mutex_);
-+      output_queue_.push(job);
-+    }
-   }
- 
-   isolate_->stack_guard()->RequestInstallCode();
--- a/lang/node/patches/006-mips64_support.patch
+++ b/lang/node/patches/006-mips64_support.patch
@ -1,30 +0,0 @@
--- a/configure.py
-+++ b/configure.py
-@@ -48,7 +48,7 @@
- 
- valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux',
-             'android', 'aix', 'cloudabi')
-valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc',
-+valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64', 'mips64el', 'ppc',
-               'ppc64', 'x32','x64', 'x86', 'x86_64', 's390x')
- valid_arm_float_abi = ('soft', 'softfp', 'hard')
- valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon')
-@@ -956,6 +956,9 @@
-   if rtn == 'mipsel' and '_LP64' in k:
-     rtn = 'mips64el'
- 
-+  if rtn == 'mips' and '_LP64' in k:
-+    rtn = 'mips64'
-+
-   return rtn
- 
- 
-@@ -1063,7 +1066,7 @@
- 
-   if target_arch == 'arm':
-     configure_arm(o)
-  elif target_arch in ('mips', 'mipsel', 'mips64el'):
-+  elif target_arch in ('mips', 'mipsel', 'mips64', 'mips64el'):
-     configure_mips(o, target_arch)
- 
-   if flavor == 'aix':
--- a/lang/node/patches/007-fix_host_build_on_macos.patch
+++ b/lang/node/patches/007-fix_host_build_on_macos.patch
@ -1,6 +1,6 @@
 --- a/tools/gyp/pylib/gyp/generator/make.py
 +++ b/tools/gyp/pylib/gyp/generator/make.py
-@@ -176,7 +176,7 @@
+@@ -180,7 +180,7 @@ cmd_solink_module = $(LINK.$(TOOLSET)) -
 
 LINK_COMMANDS_MAC = """\
 quiet_cmd_alink = LIBTOOL-STATIC $@
--- a/lang/node/patches/008-deps_v8_fix_big_endian.patch
+++ b/lang/node/patches/008-deps_v8_fix_big_endian.patch
@ -1,11 +0,0 @@
--- a/deps/v8/src/runtime/runtime-utils.h
-+++ b/deps/v8/src/runtime/runtime-utils.h
-@@ -126,7 +126,7 @@
- #if defined(V8_TARGET_LITTLE_ENDIAN)
-   return x.ptr() | (static_cast<ObjectPair>(y.ptr()) << 32);
- #elif defined(V8_TARGET_BIG_ENDIAN)
-  return y->ptr() | (static_cast<ObjectPair>(x->ptr()) << 32);
-+  return y.ptr() | (static_cast<ObjectPair>(x.ptr()) << 32);
- #else
- #error Unknown endianness
- #endif
--- a/lang/node/patches/999-delete_unnecessary_libraries_for_host_execute.patch
+++ b/lang/node/patches/999-delete_unnecessary_libraries_for_host_execute.patch
@ -1,6 +1,6 @@
 --- a/tools/icu/icu-generic.gyp
 +++ b/tools/icu/icu-generic.gyp
-@@ -517,6 +517,7 @@
+@@ -419,6 +419,7 @@
       'target_name': 'genrb',
       'type': 'executable',
       'toolsets': [ 'host' ],
@ -8,7 +8,7 @@
       'dependencies': [ 'icutools' ],
       'sources': [
         '<@(icu_src_genrb)'
-@@ -533,6 +534,7 @@
+@@ -435,6 +436,7 @@
       'target_name': 'iculslocs',
       'toolsets': [ 'host' ],
       'type': 'executable',
@ -16,7 +16,7 @@
       'dependencies': [ 'icutools' ],
       'sources': [
         'iculslocs.cc',
-@@ -545,6 +547,7 @@
+@@ -447,6 +449,7 @@
       'target_name': 'icupkg',
       'toolsets': [ 'host' ],
       'type': 'executable',
@ -24,7 +24,7 @@
       'dependencies': [ 'icutools' ],
       'sources': [
         '<@(icu_src_icupkg)',
-@@ -556,6 +559,7 @@
+@@ -458,6 +461,7 @@
       'target_name': 'genccode',
       'toolsets': [ 'host' ],
       'type': 'executable',
@ -32,9 +32,9 @@
       'dependencies': [ 'icutools' ],
       'sources': [
         '<@(icu_src_genccode)',
--- a/tools/v8_gypfiles/v8.gyp	2019-06-27 19:12:20.000000000 +0900
-+++ b/tools/v8_gypfiles/v8.gyp	2019-07-01 14:40:48.292020880 +0900
-@@ -1255,6 +1255,7 @@
+--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
+@@ -1310,6 +1310,7 @@
     {
       'target_name': 'bytecode_builtins_list_generator',
       'type': 'executable',
@ -42,7 +42,7 @@
       'conditions': [
         ['want_separate_host_toolset', {
           'toolsets': ['host'],
-@@ -1278,6 +1279,8 @@
+@@ -1333,6 +1334,8 @@
     {
       'target_name': 'mksnapshot',
       'type': 'executable',
@ -51,7 +51,7 @@
       'dependencies': [
         'v8_base_without_compiler',
         'v8_compiler_for_mksnapshot',
-@@ -1300,6 +1303,7 @@
+@@ -1354,6 +1357,7 @@
     {
       'target_name': 'torque',
       'type': 'executable',
@ -59,7 +59,7 @@
       'dependencies': [
         'torque_base',
         # "build/win:default_exe_manifest",
-@@ -1338,6 +1342,7 @@
+@@ -1392,6 +1396,7 @@
     {
       'target_name': 'torque-language-server',
       'type': 'executable',
@ -67,7 +67,7 @@
       'conditions': [
         ['want_separate_host_toolset', {
           'toolsets': ['host'],
-@@ -1365,6 +1370,8 @@
+@@ -1419,6 +1424,8 @@
     {
       'target_name': 'gen-regexp-special-case',
       'type': 'executable',
--- a/lang/node/patches/999-fix_icu_conflict.patch
+++ b/lang/node/patches/999-fix_icu_conflict.patch
@ -0,0 +1,74 @@
+--- a/tools/icu/icu-generic.gyp
+++ b/tools/icu/icu-generic.gyp
+@@ -107,6 +107,7 @@
+           'sources': [
+             '<@(icu_src_i18n)'
+           ],
+          'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+           'include_dirs': [
+             '<(icu_path)/source/i18n',
+           ],
+@@ -115,6 +116,7 @@
+           ],
+           'dependencies': [ 'icuucx', 'icu_implementation', 'icu_uconfig', 'icu_uconfig_target' ],
+           'direct_dependent_settings': {
+            'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+             'include_dirs': [
+               '<(icu_path)/source/i18n',
+             ],
+@@ -201,6 +203,7 @@
+               # full data - no trim needed
+               'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)_dat.<(icu_asm_ext)' ],
+               'dependencies': [ 'genccode#host', 'icupkg#host', 'icu_implementation#host', 'icu_uconfig' ],
+              'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+               'include_dirs': [
+                 '<(icu_path)/source/common',
+               ],
+@@ -285,6 +288,7 @@
+               # This file contains the small ICU data
+               'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icusmdt<(icu_ver_major)_dat.<(icu_asm_ext)' ],
+               # for umachine.h
+              'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+               'include_dirs': [
+                 '<(icu_path)/source/common',
+               ],
+@@ -301,6 +305,7 @@
+       'sources': [
+         '<@(icu_src_stubdata)'
+       ],
+      'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+       'include_dirs': [
+         '<(icu_path)/source/common',
+       ],
+@@ -340,6 +345,7 @@
+           '_XOPEN_SOURCE_EXTENDED=0',
+         ]}],
+       ],
+      'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+       'include_dirs': [
+         '<(icu_path)/source/common',
+       ],
+@@ -349,6 +355,7 @@
+       'cflags_c': ['-std=c99'],
+       'export_dependent_settings': [ 'icu_uconfig', 'icu_uconfig_target' ],
+       'direct_dependent_settings': {
+        'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+         'include_dirs': [
+           '<(icu_path)/source/common',
+         ],
+@@ -379,6 +386,7 @@
+         '<(icu_path)/source/tools/toolutil/dbgutil.cpp',
+         '<(icu_path)/source/tools/toolutil/dbgutil.h',
+       ],
+      'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+       'include_dirs': [
+         '<(icu_path)/source/common',
+         '<(icu_path)/source/i18n',
+@@ -398,6 +406,7 @@
+         }]
+       ],
+       'direct_dependent_settings': {
+        'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+         'include_dirs': [
+           '<(icu_path)/source/common',
+           '<(icu_path)/source/i18n',
--- a/lang/node/patches/999-fix_missing_llhttp_depends.patch
+++ b/lang/node/patches/999-fix_missing_llhttp_depends.patch
@ -1,14 +0,0 @@
-diff -urN a/node.gypi b/node.gypi
--- a/node.gypi	2019-09-05 00:36:25.000000000 +0900
-+++ b/node.gypi	2019-09-13 09:57:54.073191914 +0900
-@@ -149,6 +149,10 @@
-         'deps/http_parser/http_parser.gyp:http_parser',
-         'deps/llhttp/llhttp.gyp:llhttp'
-       ],
-+    }, {
-+      'dependencies': [
-+        'deps/llhttp/llhttp.gyp:llhttp'
-+      ],
-     } ],
- 
-     [ 'node_shared_cares=="false"', {
--- a/lang/node/patches/999-localhost-no-addrconfig.patch
+++ b/lang/node/patches/999-localhost-no-addrconfig.patch
@ -13,7 +13,7 @@ Forwarded: https://github.com/nodejs/node/issues/33816
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
-@@ -1028,13 +1029,6 @@
+@@ -1026,13 +1027,6 @@ function lookupAndConnect(self, options)
     hints: options.hints || 0
   };
 
--- a/lang/node/patches/999-mips-fix.patch
+++ b/lang/node/patches/999-mips-fix.patch
@ -1,210 +0,0 @@
-Description: upstream mips fix
-Origin: https://github.com/nodejs/node/issues/31118
-Last-Update: 2020-05-30
-
--- a/deps/v8/AUTHORS
-+++ b/deps/v8/AUTHORS
-@@ -106,6 +106,7 @@
- James M Snell <jasnell@gmail.com>
- Jianghua Yang <jianghua.yjh@alibaba-inc.com>
- Jiawen Geng <technicalcute@gmail.com>
-+Jiaxun Yang <jiaxun.yang@flygoat.com>
- Joel Stanley <joel@jms.id.au>
- Johan Bergström <johan@bergstroem.nu>
- Jonathan Liu <net147@gmail.com>
--- a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-aix.cc
-+++ b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-aix.cc
-@@ -94,10 +94,6 @@
- 
- void PlatformEmbeddedFileWriterAIX::DeclareFunctionEnd(const char* name) {}
- 
-int PlatformEmbeddedFileWriterAIX::HexLiteral(uint64_t value) {
-  return fprintf(fp_, "0x%" PRIx64, value);
-}
-
- void PlatformEmbeddedFileWriterAIX::FilePrologue() {}
- 
- void PlatformEmbeddedFileWriterAIX::DeclareExternalFilename(
-@@ -120,12 +116,6 @@
-   return kLong;
- }
- 
-int PlatformEmbeddedFileWriterAIX::WriteByteChunk(const uint8_t* data) {
-  DCHECK_EQ(ByteChunkDataDirective(), kLong);
-  const uint32_t* long_ptr = reinterpret_cast<const uint32_t*>(data);
-  return HexLiteral(*long_ptr);
-}
-
- #undef SYMBOL_PREFIX
- 
- }  // namespace internal
--- a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-aix.h
-+++ b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-aix.h
-@@ -37,8 +37,6 @@
-   void DeclareFunctionBegin(const char* name) override;
-   void DeclareFunctionEnd(const char* name) override;
- 
-  int HexLiteral(uint64_t value) override;
-
-   void Comment(const char* string) override;
- 
-   void FilePrologue() override;
-@@ -48,7 +46,6 @@
-   int IndentedDataDirective(DataDirective directive) override;
- 
-   DataDirective ByteChunkDataDirective() const override;
-  int WriteByteChunk(const uint8_t* data) override;
- 
-  private:
-   void DeclareSymbolGlobal(const char* name);
--- a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc
-+++ b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc
-@@ -24,6 +24,10 @@
-   }
- }
- 
-+int PlatformEmbeddedFileWriterBase::HexLiteral(uint64_t value) {
-+  return fprintf(fp_, "0x%" PRIx64, value);
-+}
-+
- int DataDirectiveSize(DataDirective directive) {
-   switch (directive) {
-     case kByte:
-@@ -39,24 +43,37 @@
- }
- 
- int PlatformEmbeddedFileWriterBase::WriteByteChunk(const uint8_t* data) {
-  DCHECK_EQ(ByteChunkDataDirective(), kOcta);
-
-  static constexpr size_t kSize = kInt64Size;
-
-  uint64_t part1, part2;
-  // Use memcpy for the reads since {data} is not guaranteed to be aligned.
-+  size_t kSize = DataDirectiveSize(ByteChunkDataDirective());
-+  size_t kHalfSize = kSize / 2;
-+  uint64_t high = 0, low = 0;
-+
-+  switch (kSize) {
-+    case 1:
-+      low = *data;
-+      break;
-+    case 4:
-+      low = *reinterpret_cast<const uint32_t*>(data);
-+      break;
-+    case 8:
-+      low = *reinterpret_cast<const uint64_t*>(data);
-+      break;
-+    case 16:
- #ifdef V8_TARGET_BIG_ENDIAN
-  memcpy(&part1, data, kSize);
-  memcpy(&part2, data + kSize, kSize);
-+      memcpy(&high, data, kHalfSize);
-+      memcpy(&low, data + kHalfSize, kHalfSize);
- #else
-  memcpy(&part1, data + kSize, kSize);
-  memcpy(&part2, data, kSize);
-+      memcpy(&high, data + kHalfSize, kHalfSize);
-+      memcpy(&low, data, kHalfSize);
- #endif  // V8_TARGET_BIG_ENDIAN
-+      break;
-+    default:
-+      UNREACHABLE();
-+  }
- 
-  if (part1 != 0) {
-    return fprintf(fp(), "0x%" PRIx64 "%016" PRIx64, part1, part2);
-+  if (high != 0) {
-+    return fprintf(fp(), "0x%" PRIx64 "%016" PRIx64, high, low);
-   } else {
-    return fprintf(fp(), "0x%" PRIx64, part2);
-+    return fprintf(fp(), "0x%" PRIx64, low);
-   }
- }
- 
--- a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-base.h
-+++ b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-base.h
-@@ -67,7 +67,7 @@
-   virtual void DeclareFunctionEnd(const char* name) = 0;
- 
-   // Returns the number of printed characters.
-  virtual int HexLiteral(uint64_t value) = 0;
-+  virtual int HexLiteral(uint64_t value);
- 
-   virtual void Comment(const char* string) = 0;
-   virtual void Newline() { fprintf(fp_, "\n"); }
--- a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc
-+++ b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc
-@@ -112,10 +112,6 @@
- 
- void PlatformEmbeddedFileWriterGeneric::DeclareFunctionEnd(const char* name) {}
- 
-int PlatformEmbeddedFileWriterGeneric::HexLiteral(uint64_t value) {
-  return fprintf(fp_, "0x%" PRIx64, value);
-}
-
- void PlatformEmbeddedFileWriterGeneric::FilePrologue() {}
- 
- void PlatformEmbeddedFileWriterGeneric::DeclareExternalFilename(
-@@ -142,6 +138,18 @@
-   return fprintf(fp_, "  %s ", DirectiveAsString(directive));
- }
- 
-+DataDirective PlatformEmbeddedFileWriterGeneric::ByteChunkDataDirective()
-+    const {
-+#if defined(V8_TARGET_ARCH_MIPS) || defined(V8_TARGET_ARCH_MIPS64)
-+  // MIPS uses a fixed 4 byte instruction set, using .long
-+  // to prevent any unnecessary padding.
-+  return kLong;
-+#else
-+  // Other ISAs just listen to the base
-+  return PlatformEmbeddedFileWriterBase::ByteChunkDataDirective();
-+#endif
-+}
-+
- #undef SYMBOL_PREFIX
- 
- }  // namespace internal
--- a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-generic.h
-+++ b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-generic.h
-@@ -39,8 +39,6 @@
-   void DeclareFunctionBegin(const char* name) override;
-   void DeclareFunctionEnd(const char* name) override;
- 
-  int HexLiteral(uint64_t value) override;
-
-   void Comment(const char* string) override;
- 
-   void FilePrologue() override;
-@@ -49,6 +47,8 @@
- 
-   int IndentedDataDirective(DataDirective directive) override;
- 
-+  DataDirective ByteChunkDataDirective() const override;
-+
-  private:
-   void DeclareSymbolGlobal(const char* name);
- 
--- a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-mac.cc
-+++ b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-mac.cc
-@@ -87,10 +87,6 @@
- 
- void PlatformEmbeddedFileWriterMac::DeclareFunctionEnd(const char* name) {}
- 
-int PlatformEmbeddedFileWriterMac::HexLiteral(uint64_t value) {
-  return fprintf(fp_, "0x%" PRIx64, value);
-}
-
- void PlatformEmbeddedFileWriterMac::FilePrologue() {}
- 
- void PlatformEmbeddedFileWriterMac::DeclareExternalFilename(
--- a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-mac.h
-+++ b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-mac.h
-@@ -37,8 +37,6 @@
-   void DeclareFunctionBegin(const char* name) override;
-   void DeclareFunctionEnd(const char* name) override;
- 
-  int HexLiteral(uint64_t value) override;
-
-   void Comment(const char* string) override;
- 
-   void FilePrologue() override;
--- a/lang/node/patches/999-mips-less-memory.patch
+++ b/lang/node/patches/999-mips-less-memory.patch
@ -1,26 +0,0 @@
-Description: mksnapshot uses too much memory on 32-bit mipsel
-Author: Jérémy Lal <kapouer@melix.org>
-Last-Update: 2020-06-03
-Forwarded: https://bugs.chromium.org/p/v8/issues/detail?id=10586
--- a/deps/v8/src/common/globals.h
-+++ b/deps/v8/src/common/globals.h
-@@ -206,7 +206,7 @@
- constexpr size_t kMinExpectedOSPageSize = 64 * KB;  // OS page on PPC Linux
- #elif V8_TARGET_ARCH_MIPS
- constexpr bool kRequiresCodeRange = false;
-constexpr size_t kMaximalCodeRangeSize = 2048LL * MB;
-+constexpr size_t kMaximalCodeRangeSize = 512 * MB;
- constexpr size_t kMinimumCodeRangeSize = 0 * MB;
- constexpr size_t kMinExpectedOSPageSize = 4 * KB;  // OS page.
- #else
--- a/deps/v8/src/codegen/mips/constants-mips.h
-+++ b/deps/v8/src/codegen/mips/constants-mips.h
-@@ -137,7 +137,7 @@
- namespace v8 {
- namespace internal {
- 
-constexpr size_t kMaxPCRelativeCodeRangeInMB = 4096;
-+constexpr size_t kMaxPCRelativeCodeRangeInMB = 1024;
- 
- // -----------------------------------------------------------------------------
- // Registers and FPURegisters.
--- a/lang/node/patches/999-v8_this_build_method_will_be_deprecated.patch
+++ b/lang/node/patches/999-v8_this_build_method_will_be_deprecated.patch
@ -1,27 +0,0 @@
-diff -urN a/configure.py b/configure.py
--- a/configure.py	2019-09-05 00:36:21.000000000 +0900
-+++ b/configure.py	2019-09-27 11:49:55.445800884 +0900
-@@ -1276,6 +1276,15 @@
-     options.build_v8_with_gn = FetchDeps(v8_path)
-   o['variables']['build_v8_with_gn'] = b(options.build_v8_with_gn)
- 
-+def configure_v8_deprecated(o):
-+  target_arch = options.dest_cpu
-+  if target_arch == 'x86':
-+    target_arch = 'ia32'
-+  if target_arch == 'x86_64':
-+    target_arch = 'x64'
-+
-+  if target_arch in ('mips', 'mips64'):
-+    o['variables']['v8_use_snapshot'] = 'false'
- 
- def configure_openssl(o):
-   variables = o['variables']
-@@ -1713,6 +1732,7 @@
- configure_intl(output)
- configure_static(output)
- configure_inspector(output)
-+configure_v8_deprecated(output)
- 
- # variables should be a root level element,
- # move everything else to target_defaults
--- a/lang/perl-ack/Makefile
+++ b/lang/perl-ack/Makefile
@ -0,0 +1,63 @@
+# SPDX-License-Identifier: GPL-3.0-only
+#
+# Copyright (C) 2021 ImmortalWrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-ack
+PKG_VERSION:=3.5.0
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/P/PE/PETDANCE/
+PKG_SOURCE:=ack-v$(PKG_VERSION).tar.gz
+PKG_HASH:=66053e884e803387a02ddee0d68abf2a10239fab654364dab33287309a725521
+
+PKG_LICENSE:=Artistic-2.0
+PKG_LICENSE_FILE:=LICENSE.md
+PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/ack-v$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/ack
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=A grep-like source code search tool
+  URL:=https://beyondgrep.com
+  DEPENDS:=+perl +perl-ack
+  PROVIDES:=ack-grep
+endef
+
+define Package/perl-ack
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=grep-like text finder
+  URL:=http://search.cpan.org/dist/ack/
+  DEPENDS:=perl +perl-file-next +perlbase-filetest +perlbase-if \
+    +perlbase-list +perlbase-pod +perlbase-test +perlbase-text \
+    +perlbase-term
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/ack/install
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ack $(1)/usr/bin/
+	$(SED) "1"'!'"b;s,^#"'!'".*perl.*,#"'!'"/usr/bin/perl," -i --follow-symlinks $(1)/usr/bin/ack
+endef
+
+define Package/perl-ack/install
+	$(call perlmod/Install,$(1),App auto/ack)
+endef
+
+$(eval $(call BuildPackage,ack))
+$(eval $(call BuildPackage,perl-ack))
--- a/lang/perl-ack/test.sh
+++ b/lang/perl-ack/test.sh
@ -0,0 +1,6 @@
+#!/bin/sh
+case "$1" in
+	"ack")
+		ack --version | grep "$PKG_VERSION"
+		;;
+esac
--- a/lang/perl-authen-sasl-xs/patches/100-remove-devel-checklib-checks.patch
+++ b/lang/perl-authen-sasl-xs/patches/100-remove-devel-checklib-checks.patch
@ -1,5 +1,5 @@
--- a/Makefile.PL	2009-09-22 16:22:09.000000000 -0600
-+++ b/Makefile.PL	2018-01-01 18:54:13.023366252 -0700
+--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,7 +1,6 @@
 # Do yourself a favour, and don't edit this file, see README for build instructions
 
@ -8,7 +8,7 @@
 
 my @inc_search = qw(/opt/local/include /usr/local/include);
 my @lib_search = qw(/opt/local/lib64 /usr/local/lib64 /opt/local/lib /usr/local/lib);
-@@ -12,15 +12,7 @@ unless (exists $args{INC} or exists $arg
+@@ -13,28 +12,13 @@ unless (exists $args{INC} or exists $arg
 
   my @incpath = grep {-d} @inc_search;
   my @libpath = grep {-d} @lib_search;
@ -25,7 +25,6 @@
 
   if ($have_sasl2) {
     $mmopt{DEFINE} = "-DSASL2" unless $use_sasl2;
-@@ -28,13 +27,6 @@ unless (exists $args{INC} or exists $arg
   }
   else {
     exit(0) if $use_sasl2;
@ -39,7 +38,7 @@
   }
 
   $mmopt{INC}  = join " ", map {"-I$_"} @incpath;
-@@ -58,7 +50,6 @@ WriteMakefile(
+@@ -58,7 +42,6 @@ WriteMakefile(
           repository => 'http://github.com/gbarr/perl-authen-sasl-xs',
         },
         build_requires => {
--- a/lang/perl-device-usb/patches/100-fix_buildsystem.patch
+++ b/lang/perl-device-usb/patches/100-fix_buildsystem.patch
@ -6,7 +6,7 @@ Last-Update: 2013-10-28

 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -2,6 +2,11 @@
+@@ -2,6 +2,11 @@ use strict;
 use warnings;
 use Inline::MakeMaker;
 
--- a/lang/perl-device-usb/patches/110-just_assume_libusb_is_there.patch
+++ b/lang/perl-device-usb/patches/110-just_assume_libusb_is_there.patch
@ -8,9 +8,9 @@ From: Ansgar Burchardt <ansgar@debian.org>
 Reviewed-by: gregor herrmann <gregoa@debian.org>
 Last-Update: 2013-10-28

--- libdevice-usb-perl.orig/Makefile.PL
-+++ libdevice-usb-perl/Makefile.PL
-@@ -21,7 +21,7 @@
+--- a/Makefile.PL
+++ b/Makefile.PL
+@@ -21,7 +21,7 @@ END
     }
 }
 
@ -19,7 +19,7 @@ Last-Update: 2013-10-28
 {
     die <<"END";
 ERROR: Can't find usb.h header.
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ following environment variables:
 END
 }
 
--- a/lang/perl-device-usb/patches/140-avoid-libusb-name-conflicts.patch
+++ b/lang/perl-device-usb/patches/140-avoid-libusb-name-conflicts.patch
@ -98,7 +98,7 @@
     }
 #if LIBUSB_HAS_GET_DRIVER_NP
     ret = usb_get_driver_np((usb_dev_handle *)dev, interface, name, namelen);
-@@ -735,11 +736,11 @@ int libusb_get_driver_np(void *dev, int interface, char *name, unsigned int name
+@@ -735,11 +736,11 @@ int libusb_get_driver_np(void *dev, int
 #endif
 }
 
@ -112,7 +112,7 @@
     }
 #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
     return usb_detach_kernel_driver_np((usb_dev_handle *)dev, interface);
-@@ -748,25 +749,25 @@ int libusb_detach_kernel_driver_np(void *dev, int interface)
+@@ -748,25 +749,25 @@ int libusb_detach_kernel_driver_np(void
 #endif
 }
 
@ -143,7 +143,7 @@
 {
     int i = 0;
     int retval = 0;
-@@ -775,7 +776,7 @@ void libusb_control_msg(void *dev, int requesttype, int request, int value, int
+@@ -775,7 +776,7 @@ void libusb_control_msg(void *dev, int r
 
     if(DeviceUSBDebugLevel())
     {
@ -152,7 +152,7 @@
             requesttype, request, value, index, bytes, size, timeout
         );
         /* maybe need to add support for printing the bytes string. */
-@@ -808,54 +809,54 @@ void libusb_control_msg(void *dev, int requesttype, int request, int value, int
+@@ -808,54 +809,54 @@ void libusb_control_msg(void *dev, int r
     Inline_Stack_Done;
 }
 
--- a/lang/perl-file-next/Makefile
+++ b/lang/perl-file-next/Makefile
@ -0,0 +1,44 @@
+# SPDX-License-Identifier: GPL-3.0-only
+#
+# Copyright (C) 2021 ImmortalWrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-file-next
+PKG_VERSION:=1.18
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/P/PE/PETDANCE/
+PKG_SOURCE:=File-Next-$(PKG_VERSION).tar.gz
+PKG_HASH:=f900cb39505eb6e168a9ca51a10b73f1bbde1914b923a09ecd72d9c02e6ec2ef
+
+PKG_LICENSE:=Artistic-2.0
+PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/File-Next-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/perl-file-next
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=File finding module
+  URL:=http://search.cpan.org/dist/File-Next/
+  DEPENDS:=perl +perlbase-file
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-file-next/install
+	$(call perlmod/Install,$(1),File auto/File)
+endef
+
+$(eval $(call BuildPackage,perl-file-next))
--- a/lang/perl-file-rsyncp/patches/001-no-subdirs.patch
+++ b/lang/perl-file-rsyncp/patches/001-no-subdirs.patch
@ -1,6 +1,6 @@
--- a/Makefile.PL	2010-07-25 22:50:02.000000000 +0200
-+++ b/Makefile.PL	2018-03-27 15:46:16.724000000 +0200
-@@ -8,7 +8,7 @@
+--- a/Makefile.PL
+++ b/Makefile.PL
+@@ -8,7 +8,7 @@ WriteMakefile(
                             Getopt::Long => 2.24,	# need OO interface
                          },
     'PMLIBDIRS'       => ['lib'],
--- a/lang/perl-html-parser/Makefile
+++ b/lang/perl-html-parser/Makefile
@ -8,20 +8,23 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-html-parser
-PKG_VERSION:=3.72
-PKG_RELEASE:=2
+PKG_VERSION:=3.75
+PKG_RELEASE:=1

-PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS/
 PKG_SOURCE:=HTML-Parser-$(PKG_VERSION).tar.gz
-PKG_HASH:=ec28c7e1d9e67c45eca197077f7cdc41ead1bb4c538c7f02a3296a4bb92f608b
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/C/CA/CAPOEIRAB
+PKG_HASH:=ac6b5e25a8df7af54885201e91c45fb9ab6744c08cedc1a38fcc7d95d21193a9

 PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
 PKG_CPE_ID:=cpe:/a:derrick_oswald:html-parser

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Parser-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/HTML-Parser-$(PKG_VERSION)
+HOST_BUILD_DEPENDS:=perl/host

 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
 include ../perl/perlmod.mk

 define Package/perl-html-parser
@ -45,5 +48,17 @@ define Package/perl-html-parser/install
 	$(call perlmod/Install,$(1),HTML auto/HTML)
 endef

+define Host/Configure
+	$(call perlmod/host/Configure,,,)
+endef
+
+define Host/Compile
+	$(call perlmod/host/Compile,,)
+endef
+
+define Host/Install
+	$(call perlmod/host/Install,$(1),)
+endef

 $(eval $(call BuildPackage,perl-html-parser))
+$(eval $(call HostBuild))
--- a/lang/perl-mail-spamassassin/Makefile
+++ b/lang/perl-mail-spamassassin/Makefile
@ -0,0 +1,101 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-mail-spamassassin
+PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=3.4.6
+PKG_HASH:=500c7e2a7cdf3aa4dd822d97aaff2ab22235a60cf17a68ab817861d215a4e568
+
+PKG_SOURCE_NAME:=Mail-SpamAssassin
+PKG_SOURCE_URL:=@APACHE/spamassassin/source
+PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
+PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+PKG_LICENSE:=Apache-2.0
+PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:apache:spamassassin
+
+PKG_BUILD_DEPENDS:=perl-dbi/host perl-html-parser/host perl-net-dns/host perl-netaddr-ip/host
+PKG_INSTALL:=1
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+CONFIGURE_PATH:=spamc
+
+define Package/spamassassin
+  SECTION:=mail
+  CATEGORY:=Mail
+  TITLE:=SpamAssassin
+  URL:=https://spamassassin.apache.org/
+  DEPENDS:=perl +perlbase-autoloader +perlbase-config +perlbase-data +perlbase-digest \
+          +perlbase-encode +perlbase-essential +perlbase-file +perlbase-getopt \
+          +perlbase-hash +perlbase-mime +perlbase-net +perlbase-socket \
+          +perl-dbi +perl-html-parser +perl-net-dns +perl-netaddr-ip
+  VARIANT:=ssl
+endef
+
+define Package/spamc/Default
+  SECTION:=mail
+  CATEGORY:=Mail
+  TITLE:=SpamAssassin client binary
+  URL:=https://spamassassin.apache.org/
+  DEPENDS:=+zlib
+endef
+
+define Package/spamc
+  $(call Package/spamc/Default)
+  VARIANT:=nossl
+endef
+
+define Package/spamc-ssl
+  $(call Package/spamc/Default)
+  TITLE+= (with SSL)
+  DEPENDS+=+libopenssl
+  VARIANT:=ssl
+endef
+
+ifeq ($(BUILD_VARIANT),ssl)
+TARGET_CFLAGS += -DSPAMC_SSL
+CONFIGURE_ARGS += --enable-ssl
+endif
+
+define Package/spamassassin/conffiles
+/etc/mail/spamassassin
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,,)
+	$(call Build/Configure/Default)
+	( cd "$(PKG_BUILD_DIR)/$(CONFIGURE_PATH)" && ./version.h.pl --with-version=$(PKG_SOURCE_VERSION) )
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+	$(call Build/Compile/Default,,,spamc)
+endef
+
+define Package/spamassassin/install
+	$(call perlmod/Install,$(1),Mail/SpamAssassin auto/Mail/SpamAssassin)
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sa-awl $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sa-learn $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sa-compile $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/spamassassin $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sa-update $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/spamd $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sa-check_spamd $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/etc/mail/spamassassin
+	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/mail/spamassassin/* $(1)/etc/mail/spamassassin
+endef
+
+define Package/spamc/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/spamc $(1)/usr/bin
+endef
+
+Package/spamc-ssl/install = $(Package/spamc/install)
+
+$(eval $(call BuildPackage,spamassassin))
+$(eval $(call BuildPackage,spamc))
+$(eval $(call BuildPackage,spamc-ssl))
--- a/lang/perl-mail-spamassassin/patches/010-openssl-deprecated.patch
+++ b/lang/perl-mail-spamassassin/patches/010-openssl-deprecated.patch
@ -0,0 +1,28 @@
+--- a/spamc/libspamc.c
+++ b/spamc/libspamc.c
+@@ -1213,9 +1213,11 @@ int message_filter(struct transport *tp,
+ 
+     if (flags & SPAMC_USE_SSL) {
+ #ifdef SPAMC_SSL
+#if 0
+ 	SSLeay_add_ssl_algorithms();
+-	meth = SSLv23_client_method();
+ 	SSL_load_error_strings();
+#endif
+	meth = SSLv23_client_method();
+ 	ctx = SSL_CTX_new(meth);
+ #else
+ 	UNUSED_VARIABLE(ssl);
+@@ -1600,9 +1602,11 @@ int message_tell(struct transport *tp, c
+ 
+     if (flags & SPAMC_USE_SSL) {
+ #ifdef SPAMC_SSL
+#if 0
+ 	SSLeay_add_ssl_algorithms();
+-	meth = SSLv23_client_method();
+ 	SSL_load_error_strings();
+#endif
+	meth = SSLv23_client_method();
+ 	ctx = SSL_CTX_new(meth);
+ #else
+ 	UNUSED_VARIABLE(ssl);
--- a/lang/perl-net-dns/Makefile
+++ b/lang/perl-net-dns/Makefile
@ -0,0 +1,56 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-net-dns
+PKG_VERSION:=1.30
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_NAME:=Net-DNS
+PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://www.net-dns.org/download
+PKG_HASH:=055e70b67255615724d91ec41788f75af317561c519971f6e6e384273b30a5da
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+PKG_LICENSE:=MIT
+HOST_BUILD_DEPENDS:=perl/host
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+include ../perl/perlmod.mk
+
+define Package/perl-net-dns
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Net::DNS DNS resolver implemented in Perl
+  URL:=https://www.net-dns.org/
+  DEPENDS:=perl +perlbase-essential +perlbase-io
+endef
+
+define Build/Configure
+        $(call perlmod/Configure,,)
+endef
+
+define Build/Compile
+        $(call perlmod/Compile,,)
+endef
+
+define Package/perl-net-dns/install
+        $(call perlmod/Install,$(1),Net auto/Net)
+endef
+
+define Host/Configure
+        $(call perlmod/host/Configure,,,)
+endef
+
+define Host/Compile
+        $(call perlmod/host/Compile,,)
+endef
+
+define Host/Install
+        $(call perlmod/host/Install,$(1),)
+endef
+
+$(eval $(call BuildPackage,perl-net-dns))
+$(eval $(call HostBuild))
--- a/lang/perl-netaddr-ip/Makefile
+++ b/lang/perl-netaddr-ip/Makefile
@ -0,0 +1,62 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-netaddr-ip
+PKG_VERSION:=4.079
+PKG_RELEASE:=1
+
+PKG_SOURCE_NAME:=NetAddr-IP
+PKG_SOURCE_URL:=https://www.cpan.org/authors/id/M/MI/MIKER/
+PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz
+PKG_HASH:=ec5a82dfb7028bcd28bb3d569f95d87dd4166cc19867f2184ed3a59f6d6ca0e7
+
+PKG_LICENSE:=GPL-2.0-or-later Artistic-1.0-Perl
+PKG_LICENSE_FILES:=Copying
+PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/NetAddr-IP-$(PKG_VERSION)
+HOST_BUILD_DEPENDS:=perl/host
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/NetAddr-IP-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+include ../perl/perlmod.mk
+
+define Package/perl-netaddr-ip
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=NetAddr::IP - Manages IPv4 and IPv6 addresses and subnets
+  URL:=http://search.cpan.org/dist/NetAddr::IP/
+  DEPENDS:=perl +perlbase-essential +perlbase-test
+endef
+
+define Host/Configure
+	$(call perlmod/host/Configure,-noxs,,)
+	$(call Host/Configure/Default,,,Lite/Util)
+endef
+
+define Host/Compile
+	$(call Host/Compile/Default,,,Lite/Util)
+	$(call perlmod/host/Compile,,)
+endef
+
+define Host/Install
+	$(call perlmod/host/Install,$(1),)
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,-noxs,)
+	$(call Build/Configure/Default,,,Lite/Util)
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default,,,Lite/Util)
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-netaddr-ip/install
+	$(call perlmod/Install,$(1),NetAddr auto/NetAddr)
+endef
+
+$(eval $(call BuildPackage,perl-netaddr-ip))
+$(eval $(call HostBuild))
--- a/lang/perl-parse-yapp/Makefile
+++ b/lang/perl-parse-yapp/Makefile
@ -24,7 +24,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Parse-Yapp-$(PKG_VERSION)

 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
-include $(TOPDIR)/feeds/packages/lang/perl/perlmod.mk
+include ../perl/perlmod.mk

 define Package/perl-parse-yapp
  SUBMENU:=Perl
--- a/lang/perl-try-tiny/Makefile
+++ b/lang/perl-try-tiny/Makefile
@ -0,0 +1,47 @@
+#
+# Copyright (C) 2021 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-try-tiny
+PKG_VERSION:=0.30
+PKG_RELEASE:=2
+
+PKG_SOURCE_URL:=https://cpan.metacpan.org/authors/id/E/ET/ETHER/
+PKG_SOURCE:=Try-Tiny-$(PKG_VERSION).tar.gz
+PKG_HASH:=da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Try-Tiny-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Matt Merhar <mattmerhar@protonmail.com>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/perl-try-tiny
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Minimal try/catch with proper preservation of $$$$@
+  URL:=https://metacpan.org/pod/Try::Tiny
+  DEPENDS:=perl +perlbase-essential
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-try-tiny/install
+	$(call perlmod/Install,$(1),Try auto/Try)
+endef
+
+$(eval $(call BuildPackage,perl-try-tiny))
--- a/lang/perl-www-curl/patches/101-skip-preprocessor-symbol.path
+++ b/lang/perl-www-curl/patches/101-skip-preprocessor-symbol.path
@ -16,8 +16,6 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
 Makefile.PL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/Makefile.PL b/Makefile.PL
-index f9170bb..ad2bd3d 100644
 --- a/Makefile.PL
 +++ b/Makefile.PL
@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
@ -29,6 +27,3 @@ index f9170bb..ad2bd3d 100644
           next;
        }
        my ($group) = $e =~ m/^([^_]+_)/;
-- 
-2.7.4
-
--- a/lang/perl-www-curl/patches/210-curl_7.66_compat.patch
+++ b/lang/perl-www-curl/patches/210-curl_7.66_compat.patch
@ -1,6 +1,6 @@
 --- a/Curl.xs
 +++ b/Curl.xs
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ typedef struct {
 
 
 typedef struct {
@ -9,7 +9,7 @@
     struct CURLM *curlm;
 #else
     struct void *curlm;
-@@ -234,7 +234,7 @@
+@@ -234,7 +234,7 @@ static perl_curl_multi * perl_curl_multi
 {
     perl_curl_multi *self;
     Newz(1, self, 1, perl_curl_multi);
@ -18,7 +18,7 @@
     self->curlm=curl_multi_init();
 #else
     croak("curl version too old to support curl_multi_init()");
-@@ -245,7 +245,7 @@
+@@ -245,7 +245,7 @@ static perl_curl_multi * perl_curl_multi
 /* delete the multi */
 static void perl_curl_multi_delete(perl_curl_multi *self)
 {
@ -27,7 +27,7 @@
     if (self->curlm) 
         curl_multi_cleanup(self->curlm);
     Safefree(self);
-@@ -1065,7 +1065,7 @@
+@@ -1065,7 +1065,7 @@ curl_multi_add_handle(curlm, curl)
     WWW::Curl::Multi curlm
     WWW::Curl::Easy curl
     CODE:
@ -36,7 +36,7 @@
         curl_multi_add_handle(curlm->curlm, curl->curl);
 #endif
 
-@@ -1074,7 +1074,7 @@
+@@ -1074,7 +1074,7 @@ curl_multi_remove_handle(curlm, curl)
     WWW::Curl::Multi curlm
     WWW::Curl::Easy curl
     CODE:
@ -45,7 +45,7 @@
         curl_multi_remove_handle(curlm->curlm, curl->curl);
 #endif
 
-@@ -1149,7 +1149,7 @@
+@@ -1149,7 +1149,7 @@ curl_multi_perform(self)
     PREINIT:
         int remaining;
     CODE:
--- a/lang/perl-www-curl/patches/220-curl_7.69_compat.patch
+++ b/lang/perl-www-curl/patches/220-curl_7.69_compat.patch
@ -1,6 +1,6 @@
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -127,7 +127,7 @@
+@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
     close H;
 
     for my $e (sort @syms) {
--- a/lang/perl-www/Makefile
+++ b/lang/perl-www/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-www
 PKG_VERSION:=6.43
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=https://cpan.metacpan.org/authors/id/O/OA/OALDERS
 PKG_SOURCE:=libwww-perl-$(PKG_VERSION).tar.gz
@ -30,7 +30,7 @@ define Package/perl-www
  CATEGORY:=Languages
  TITLE:=WWW client/server library for Perl (aka LWP)
  URL:=https://search.cpan.org/dist/libwww-perl/
-  DEPENDS:=perl +perl-encode-locale +perl-file-listing +perl-html-parser +perl-http-cookies +perl-http-daemon +perl-http-date +perl-http-message +perl-http-negotiate +perl-lwp-mediatypes +perl-net-http +perl-uri +perl-www-robotrules +perlbase-base +perlbase-digest +perlbase-encode +perlbase-essential +perlbase-io +perlbase-mime +perlbase-net
+  DEPENDS:=perl +perl-encode-locale +perl-file-listing +perl-html-parser +perl-http-cookies +perl-http-daemon +perl-http-date +perl-http-message +perl-http-negotiate +perl-lwp-mediatypes +perl-net-http +perl-try-tiny +perl-uri +perl-www-robotrules +perlbase-base +perlbase-digest +perlbase-encode +perlbase-essential +perlbase-io +perlbase-mime +perlbase-net
 endef

 define Build/Configure
--- a/lang/perl/Makefile
+++ b/lang/perl/Makefile
@ -11,7 +11,7 @@ include perlver.mk

 PKG_NAME:=perl
 PKG_VERSION:=$(PERL_VERSION)
-PKG_RELEASE:=4
+PKG_RELEASE:=5

 PKG_SOURCE_URL:=\
 		https://cpan.metacpan.org/src/5.0 \
--- a/lang/perl/patches/001-macos_11_support.patch
+++ b/lang/perl/patches/001-macos_11_support.patch
@ -0,0 +1,29 @@
+--- a/hints/darwin.sh
+++ b/hints/darwin.sh
+@@ -301,7 +301,7 @@ case "$osvers" in  # Note: osvers is the
+    # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
+    # capturing its value and adding it to the flags.
+     case "$MACOSX_DEPLOYMENT_TARGET" in
+-    10.*)
+    [1-9][0-9].*)
+       add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
+       add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
+       ;;
+@@ -313,7 +313,7 @@ case "$osvers" in  # Note: osvers is the
+ 
+ *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
+ ***
+-*** Please either set it to 10.something, or to empty.
+*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
+ 
+ EOM
+       exit 1
+@@ -327,7 +327,7 @@ EOM
+     # "ProductVersion:    10.11"     "10.11"
+         prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
+     case "$prodvers" in
+-    10.*)
+    [1-9][0-9].*)
+       add_macosx_version_min ccflags $prodvers
+       add_macosx_version_min ldflags $prodvers
+       ;;
--- a/lang/perl/patches/002-add-Internals-getcwd.patch
+++ b/lang/perl/patches/002-add-Internals-getcwd.patch
@ -0,0 +1,85 @@
+From 15f67d146cf1f32504e8a11de3faa2abc0f467cd Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Mon, 25 Mar 2019 16:48:40 +1100
+Subject: [PATCH] (perl #133951) add Internals::getcwd
+
+---
+ MANIFEST      |  1 +
+ t/io/getcwd.t | 22 ++++++++++++++++++++++
+ universal.c   | 22 ++++++++++++++++++++++
+ 3 files changed, 45 insertions(+)
+ create mode 100644 t/io/getcwd.t
+
+--- a/MANIFEST
+++ b/MANIFEST
+@@ -5456,6 +5456,7 @@ t/io/errno.t			See if $! is correctly se
+ t/io/errnosig.t			Test case for restoration $! when leaving signal handlers
+ t/io/fflush.t			See if auto-flush on fork/exec/system/qx works
+ t/io/fs.t			See if directory manipulations work
+t/io/getcwd.t			See if Internals::getcwd is sane
+ t/io/inplace.t			See if inplace editing works
+ t/io/iofile.t			See if we can load IO::File on demand
+ t/io/iprefix.t			See if inplace editing works with prefixes
+--- /dev/null
+++ b/t/io/getcwd.t
+@@ -0,0 +1,22 @@
+#!./perl -w
+
+BEGIN {
+    chdir 't' if -d 't';
+    require "./test.pl";
+    set_up_inc('../lib');
+}
+
+use Config;
+
+$Config{d_getcwd}
+  or plan skip_all => "no getcwd";
+
+my $cwd = Internals::getcwd();
+ok(!defined $cwd || $cwd ne "",
+   "Internals::getcwd() returned a reasonable result");
+
+if (defined $cwd) {
+    ok(-d $cwd, "check a success result is a directory");
+}
+
+done_testing();
+--- a/universal.c
+++ b/universal.c
+@@ -986,6 +986,25 @@ XS(XS_re_regexp_pattern)
+     NOT_REACHED; /* NOTREACHED */
+ }
+ 
+#ifdef HAS_GETCWD
+
+XS(XS_Internals_getcwd)
+{
+    dXSARGS;
+    SV *sv = sv_newmortal();
+
+    if (items != 0)
+        croak_xs_usage(cv, "");
+
+    (void)getcwd_sv(sv);
+
+    SvTAINTED_on(sv);
+    PUSHs(sv);
+    XSRETURN(1);
+}
+
+#endif
+
+ #include "vutil.h"
+ #include "vxs.inc"
+ 
+@@ -1020,6 +1039,9 @@ static const struct xsub_details details
+     {"re::regnames", XS_re_regnames, ";$"},
+     {"re::regnames_count", XS_re_regnames_count, ""},
+     {"re::regexp_pattern", XS_re_regexp_pattern, "$"},
+#ifdef HAS_GETCWD
+    {"Internals::getcwd", XS_Internals_getcwd, ""},
+#endif
+ };
+ 
+ STATIC OP*
--- a/lang/perl/patches/003-fallback-to-the-built-in-getcwd-if-we-ca.patch
+++ b/lang/perl/patches/003-fallback-to-the-built-in-getcwd-if-we-ca.patch
@ -0,0 +1,40 @@
+--- a/dist/PathTools/Cwd.pm
+++ b/dist/PathTools/Cwd.pm
+@@ -659,6 +659,10 @@ if (exists $METHOD_MAP{$^O}) {
+   }
+ }
+ 
+# built-in from 5.30
+*getcwd = \&Internals::getcwd
+  if !defined &getcwd && defined &Internals::getcwd;
+
+ # In case the XS version doesn't load.
+ *abs_path = \&_perl_abs_path unless defined &abs_path;
+ *getcwd = \&_perl_getcwd unless defined &getcwd;
+--- a/dist/PathTools/t/cwd.t
+++ b/dist/PathTools/t/cwd.t
+@@ -10,6 +10,7 @@ chdir 't';
+ use Config;
+ use File::Spec;
+ use File::Path;
+use Errno qw(EACCES);
+ 
+ use lib File::Spec->catdir('t', 'lib');
+ use Test::More;
+@@ -208,7 +209,15 @@ SKIP: {
+ 
+     like($abs_path,      qr|$want$|i, "Cwd::abs_path produced $abs_path");
+     like($fast_abs_path, qr|$want$|i, "Cwd::fast_abs_path produced $fast_abs_path");
+-    like($pas,           qr|$want$|i, "Cwd::_perl_abs_path produced $pas") if $EXTRA_ABSPATH_TESTS;
+    if ($EXTRA_ABSPATH_TESTS) {
+        # _perl_abs_path() can fail if some ancestor directory isn't readable
+        if (defined $pas) {
+            like($pas,           qr|$want$|i, "Cwd::_perl_abs_path produced $pas");
+        }
+        else {
+            is($!+0, EACCES, "check we got the expected error on failure");
+        }
+    }
+ 
+     rmtree($test_dirs[0], 0, 0);
+     1 while unlink $file;
--- a/lang/perl/patches/998-Errno_errno.h_path.patch
+++ b/lang/perl/patches/998-Errno_errno.h_path.patch
@ -1,6 +1,6 @@
 --- a/ext/Errno/Errno_pm.PL
 +++ b/ext/Errno/Errno_pm.PL
-@@ -133,7 +133,7 @@
+@@ -133,7 +133,7 @@ sub get_files {
 	# Some Linuxes have weird errno.hs which generate
 	# no #file or #line directives
 	my ($linux_errno_h) = grep { -e $_ } map { "$_/errno.h" }
--- a/lang/perl/patches/999-fix-build-failure-against-gcc-10.patch
+++ b/lang/perl/patches/999-fix-build-failure-against-gcc-10.patch
@ -20,11 +20,9 @@ patch fixes all of them I found.
 cflags.SH |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

-diff --git a/Configure b/Configure
-index fad1c9f2b1..706c0b64ed 100755
 --- a/Configure
 +++ b/Configure
-@@ -4701,7 +4701,7 @@ else
+@@ -4689,7 +4689,7 @@ else
 fi
 $rm -f try try.*
 case "$gccversion" in
@ -33,7 +31,7 @@ index fad1c9f2b1..706c0b64ed 100755
 esac
 case "$gccversion" in
 '') gccosandvers='' ;;
-@@ -4741,7 +4741,7 @@ esac
+@@ -4729,7 +4729,7 @@ esac
 # gcc 3.* complain about adding -Idirectories that they already know about,
 # so we will take those off from locincpth.
 case "$gccversion" in
@ -42,7 +40,7 @@ index fad1c9f2b1..706c0b64ed 100755
     echo "main(){}">try.c
     for incdir in $locincpth; do
        warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
-@@ -5467,13 +5467,13 @@ fi
+@@ -5455,13 +5455,13 @@ fi
 case "$hint" in
 default|recommended)
 	case "$gccversion" in
@ -58,7 +56,7 @@ index fad1c9f2b1..706c0b64ed 100755
 			$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
 		then
 			# Interactive Systems (ISC) POSIX mode.
-@@ -5482,7 +5482,7 @@ default|recommended)
+@@ -5470,7 +5470,7 @@ default|recommended)
 		;;
 	esac
 	case "$gccversion" in
@ -67,7 +65,7 @@ index fad1c9f2b1..706c0b64ed 100755
 	2.[0-8]*) ;;
 	?*)	set strict-aliasing -fno-strict-aliasing
 		eval $checkccflag
-@@ -5600,7 +5600,7 @@ case "$cppflags" in
+@@ -5588,7 +5588,7 @@ case "$cppflags" in
     ;;
 esac
 case "$gccversion" in
@ -76,7 +74,7 @@ index fad1c9f2b1..706c0b64ed 100755
 esac
 case "$mips_type" in
 '');;
-@@ -23103,7 +23103,7 @@ fi
+@@ -22957,7 +22957,7 @@ fi
 
 : add -D_FORTIFY_SOURCE if feasible and not already there
 case "$gccversion" in
@ -85,8 +83,6 @@ index fad1c9f2b1..706c0b64ed 100755
 	*-O*)	case "$ccflags$cppsymbols" in
 		*_FORTIFY_SOURCE=*) # Don't add it again.
 			echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
-diff --git a/cflags.SH b/cflags.SH
-index e60742fed1..f1bcd6c38e 100755
 --- a/cflags.SH
 +++ b/cflags.SH
@@ -156,7 +156,7 @@ esac
@ -98,6 +94,3 @@ index e60742fed1..f1bcd6c38e 100755
 Intel*) ;; # # Is that you, Intel C++?
 #
 # NOTE 1: the -std=c89 without -pedantic is a bit pointless.
-- 
-2.17.1
-
--- a/lang/php7-pecl-dio/Makefile
+++ b/lang/php7-pecl-dio/Makefile
@ -28,5 +28,5 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 include ../php7/pecl.mk

-$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
+$(eval $(call PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/lang/php7-pecl-http/Makefile
+++ b/lang/php7-pecl-http/Makefile
@ -54,5 +54,5 @@ CONFIGURE_ARGS+= \
 	--with-http-libidnkit-dir=no \
 	--with-http-libidnkit2-dir=no

-$(eval $(call PECLPackage,http,$(PECL_LONGNAME),+icu +libcurl +librt +libevent2 +PACKAGE_libidn:libidn +libidn2 +php7-mod-iconv +php7-mod-session +php7-pecl-raphf +php7-pecl-propro,30))
+$(eval $(call PHP7PECLPackage,http,$(PECL_LONGNAME),+icu +libcurl +librt +libevent2 +PACKAGE_libidn:libidn +libidn2 +php7-mod-iconv +php7-mod-session +php7-pecl-raphf +php7-pecl-propro,30))
 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/lang/php7-pecl-imagick/Makefile
+++ b/lang/php7-pecl-imagick/Makefile
@ -0,0 +1,35 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PECL_NAME:=imagick
+PECL_LONGNAME:=Image Processing (ImageMagick binding)
+
+PKG_VERSION:=3.4.4
+PKG_RELEASE:=2
+PKG_HASH:=8dd5aa16465c218651fc8993e1faecd982e6a597870fd4b937e9ece02d567077
+
+PKG_NAME:=php7-pecl-imagick
+PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://pecl.php.net/get/
+
+PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+
+PKG_LICENSE:=PHP-3.01
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=php7
+PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+include ../php7/pecl.mk
+
+CONFIGURE_ARGS+= --with-imagick="$(STAGING_DIR)/usr"
+
+$(eval $(call PHP7PECLPackage,imagick,$(PECL_LONGNAME),+imagemagick,30))
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/lang/php7-pecl-krb5/Makefile
+++ b/lang/php7-pecl-krb5/Makefile
@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk
 PECL_NAME:=krb5
 PECL_LONGNAME:=Bindings for the Kerberos library

-PKG_VERSION:=1.1.3
+PKG_VERSION:=1.1.4
 PKG_RELEASE:=1
-PKG_HASH:=3a65bb5f7d64ed5f6fbcf07250c17b0de29f693ac88f96cd1cc9737b996da120
+PKG_HASH:=8aba35bb9f2892be9092e8717d3e13604a817cdfb478dbc3855a226abc6c5979

 PKG_NAME:=php7-pecl-krb5
 PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
@ -33,5 +33,5 @@ CONFIGURE_ARGS+= \
 	--with-krb5=shared,"$(STAGING_DIR)/usr" \
 	--with-krb5config=$(STAGING_DIR)/usr/bin/krb5-config

-$(eval $(call PECLPackage,krb5,$(PECL_LONGNAME),+krb5-libs,30))
+$(eval $(call PHP7PECLPackage,krb5,$(PECL_LONGNAME),+krb5-libs,30))
 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/lang/php7-pecl-libevent/Makefile
+++ b/lang/php7-pecl-libevent/Makefile
@ -33,5 +33,5 @@ include ../php7/pecl.mk

 CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr"

-$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+libevent2 +php7-mod-sockets,25))
+$(eval $(call PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+libevent2 +php7-mod-sockets,25))
 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/lang/php7-pecl-libevent/patches/010-libevent2.patch
+++ b/lang/php7-pecl-libevent/patches/010-libevent2.patch
@ -1,7 +1,7 @@
 --- a/libevent.c
 +++ b/libevent.c
-@@ -42,10 +42,12 @@
- 	(rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 1, resource_type))
+@@ -37,10 +37,12 @@
+ # define LIBEVENT_SOCKETS_SUPPORT
 #endif
 
 -#ifdef PHP_WIN32
--- a/lang/php7-pecl-mcrypt/Makefile
+++ b/lang/php7-pecl-mcrypt/Makefile
@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk
 PECL_NAME:=mcrypt
 PECL_LONGNAME:=Bindings for the libmcrypt library

-PKG_VERSION:=1.0.3
-PKG_RELEASE:=2
-PKG_HASH:=affd675843a079e9efd49ac2f723286dd5bcb0916315aa53e2ae5edd5eadb034
+PKG_VERSION:=1.0.4
+PKG_RELEASE:=1
+PKG_HASH:=98153e78958d7a48dcd0dcfe1fc3c16ec987121a0cb2d7c273d280ee7e4ea00d

 PKG_NAME:=php7-pecl-mcrypt
 PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
@ -31,5 +31,5 @@ include ../php7/pecl.mk

 CONFIGURE_ARGS+= --with-mcrypt=shared,"$(STAGING_DIR)/usr"

-$(eval $(call PECLPackage,mcrypt,$(PECL_LONGNAME),+libmcrypt +libltdl,30))
+$(eval $(call PHP7PECLPackage,mcrypt,$(PECL_LONGNAME),+libmcrypt +libltdl,30))
 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/lang/php7-pecl-propro/Makefile
+++ b/lang/php7-pecl-propro/Makefile
@ -24,8 +24,6 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1

-#PKG_FIXUP:=autoreconf
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 include ../php7/pecl.mk
@ -39,5 +37,5 @@ define Build/InstallDev
 	$(CP) $(PKG_BUILD_DIR)/php_propro_api.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
 endef

-$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
+$(eval $(call PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/lang/php7-pecl-raphf/Makefile
+++ b/lang/php7-pecl-raphf/Makefile
@ -37,5 +37,5 @@ define Build/InstallDev
 	cp $(PKG_BUILD_DIR)/php_raphf_api.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
 endef

-$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
+$(eval $(call PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/lang/php7-pecl-redis/Makefile
+++ b/lang/php7-pecl-redis/Makefile
@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk
 PECL_NAME:=redis
 PECL_LONGNAME:=PHP extension for interfacing with Redis

-PKG_VERSION:=5.2.2
+PKG_VERSION:=5.3.2
 PKG_RELEASE:=1
-PKG_HASH:=9965269ec8da48761873e943b770d7053e7579b2b858af97e582eadc7e6eaa11
+PKG_HASH:=f4e92de628abcb917cdc810df045ca3fa0f2af34673eaa2a03350e3c5c5fdab1

 PKG_NAME:=php7-pecl-redis
 PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
@ -35,5 +35,5 @@ CONFIGURE_ARGS+= \
 	--disable-redis-lzf \
 	--disable-redis-msgpack

-$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+php7-mod-json +php7-mod-session,25))
+$(eval $(call PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+php7-mod-json +php7-mod-session,25))
 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/lang/php7/Makefile
+++ b/lang/php7/Makefile
@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=php
-PKG_VERSION:=7.4.7
+PKG_VERSION:=7.4.20
 PKG_RELEASE:=1

 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.php.net/distributions/
-PKG_HASH:=53558f8f24cd8ab6fa0ea252ca8198e2650160649681ce5230c1df1dc2b52faf
+PKG_HASH:=1fa46ca6790d780bf2cb48961df65f0ca3640c4533f0bca743cd61b71cb66335

 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
@ -47,7 +47,7 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk

 define Package/php7/Default
-  SUBMENU:=PHP
+  SUBMENU:=PHP7
  SECTION:=lang
  CATEGORY:=Languages
  TITLE:=PHP7 Hypertext preprocessor
@ -257,9 +257,9 @@ endif

 ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-imap),)
  CONFIGURE_ARGS+= \
-		--with-imap=shared,"$(STAGING_DIR)/usr" \
-		--with-kerberos=no \
-		--with-imap-ssl="$(STAGING_DIR)/usr"
+	--with-imap=shared,"$(STAGING_DIR)/usr" \
+	--with-kerberos=no \
+	--with-imap-ssl="$(STAGING_DIR)/usr"
 else
  CONFIGURE_ARGS+= --without-imap
 endif
@ -530,7 +530,12 @@ endef

 define Build/Prepare
 	$(call Build/Prepare/Default)
-	( cd $(PKG_BUILD_DIR); touch configure.ac; ./buildconf --force )
+	$(if $(QUILT),,( cd $(PKG_BUILD_DIR); touch configure.ac; ./buildconf --force ))
+endef
+
+define Build/Configure
+	$(if $(QUILT),( cd $(PKG_BUILD_DIR); touch configure.ac; ./buildconf --force ))
+	$(call Build/Configure/Default)
 endef

 define Build/InstallDev
--- a/lang/php7/patches/0013-Add-support-for-use-of-the-system-timezone-database.patch
+++ b/lang/php7/patches/0013-Add-support-for-use-of-the-system-timezone-database.patch
@ -40,8 +40,6 @@ r1: initial revision
 ext/date/lib/parse_tz.c | 535 +++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 545 insertions(+), 3 deletions(-)

-diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
-index 20e4164..a612436 100644
 --- a/ext/date/config0.m4
 +++ b/ext/date/config0.m4
@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
@ -64,8 +62,6 @@ index 20e4164..a612436 100644
 PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
 timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
-diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
-index 020da31..9b39c6e 100644
 --- a/ext/date/lib/parse_tz.c
 +++ b/ext/date/lib/parse_tz.c
@@ -26,8 +26,21 @@
@ -90,7 +86,7 @@ index 020da31..9b39c6e 100644
 
 #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
 # if defined(__LITTLE_ENDIAN__)
-@@ -88,6 +101,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
+@@ -88,6 +101,11 @@ static int read_php_preamble(const unsig
 {
 	uint32_t version;
 
@ -102,7 +98,7 @@ index 020da31..9b39c6e 100644
 	/* read ID */
 	version = (*tzf)[3] - '0';
 	*tzf += 4;
-@@ -412,7 +430,429 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
+@@ -412,7 +430,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
 	}
 }
 
@ -533,7 +529,7 @@ index 020da31..9b39c6e 100644
 {
 	int left = 0, right = tzdb->index_size - 1;
 
-@@ -438,9 +878,48 @@ static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const
+@@ -438,9 +878,48 @@ static int seek_to_tz_position(const uns
 	return 0;
 }
 
@ -582,7 +578,7 @@ index 020da31..9b39c6e 100644
 }
 
 const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
-@@ -452,7 +931,30 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_
+@@ -452,7 +931,30 @@ const timelib_tzdb_index_entry *timelib_
 int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
 {
 	const unsigned char *tzf;
@ -614,7 +610,7 @@ index 020da31..9b39c6e 100644
 }
 
 static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
-@@ -494,12 +996,14 @@ static timelib_tzinfo* timelib_tzinfo_ctor(char *name)
+@@ -494,12 +996,14 @@ static timelib_tzinfo* timelib_tzinfo_ct
 timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code)
 {
 	const unsigned char *tzf;
@ -630,7 +626,7 @@ index 020da31..9b39c6e 100644
 		tmp = timelib_tzinfo_ctor(timezone);
 
 		version = read_preamble(&tzf, tmp, &type);
-@@ -534,11 +1038,36 @@ timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, i
+@@ -534,11 +1038,36 @@ timelib_tzinfo *timelib_parse_tzfile(cha
 		}
 		skip_posix_string(&tzf, tmp);
 
--- a/Show More
+++ b/Show More