fix

2025-03-09 15:40:03 +00:00 · 2022-05-03 10:04:20 +08:00 · 2022-05-03 10:04:20 +08:00 · 7f4e9142ac
commit 7f4e9142ac
parent c97b3256a9
39 changed files with 20586 additions and 4809 deletions
--- a/bpftools/Makefile
+++ b/bpftools/Makefile
@ -1,169 +0,0 @@
-#
-# Copyright (C) 2020 Tony Ambardar <itugrok@yahoo.com>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bpftools
-PKG_VERSION:=5.11.16
-PKG_RELEASE:=1
-
-PKG_SOURCE:=linux-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@KERNEL/linux/kernel/v5.x
-PKG_HASH:=21163681d130cbce5a6be39019e2c69e44f284855ddd70b1a3bd039249540f43
-
-PKG_MAINTAINER:=Tony Ambardar <itugrok@yahoo.com>
-
-PKG_USE_MIPS16:=0
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-LINUX_VERSION:=$(PKG_VERSION)
-LINUX_TLD:=linux-$(LINUX_VERSION)
-
-BPF_FILES:= \
-	kernel/bpf scripts tools/Makefile tools/bpf tools/perf/perf-sys.h \
-	tools/arch tools/build tools/include tools/lib tools/scripts
-TAR_OPTIONS+= \
-	--transform="s;$(LINUX_TLD)/;$(PKG_NAME)-$(PKG_VERSION)/;" \
-	$(addprefix $(LINUX_TLD)/,$(BPF_FILES))
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/bpftool/Default
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=bpftool - eBPF subsystem utility
-  LICENSE:=GPL-2.0-only OR BSD-2-Clause
-  URL:=http://www.kernel.org
-  DEPENDS:=+libelf
-endef
-
-define Package/bpftool-minimal
-  $(call Package/bpftool/Default)
-  TITLE+= (Minimal)
-  VARIANT:=minimal
-  DEFAULT_VARIANT:=1
-  PROVIDES:=bpftool
-  ALTERNATIVES:=200:/usr/sbin/bpftool:/usr/libexec/bpftool-minimal
-endef
-
-define Package/bpftool-full
-  $(call Package/bpftool/Default)
-  TITLE+= (Full)
-  VARIANT:=full
-  PROVIDES:=bpftool
-  ALTERNATIVES:=300:/usr/sbin/bpftool:/usr/libexec/bpftool-full
-  DEPENDS+= +libbfd +libopcodes
-endef
-
-define Package/bpftool-minimal/description
-  A tool for inspection and simple manipulation of eBPF programs and maps.
-endef
-
-define Package/bpftool-full/description
-  A tool for inspection and simple manipulation of eBPF programs and maps.
-  This full version uses libbfd and libopcodes to support disassembly of
-  eBPF programs and jited code.
-endef
-
-define Package/libbpf
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libbpf - eBPF helper library
-  VARIANT:=lib
-  LICENSE:=LGPL-2.1 OR BSD-2-Clause
-  ABI_VERSION:=0
-  URL:=http://www.kernel.org
-  DEPENDS:=+libelf
-endef
-
-define Package/libbpf/description
-  libbpf is a library for loading eBPF programs and reading and manipulating eBPF objects from user-space.
-endef
-
-
-# LTO not compatible with DSO using PIC
-ifneq ($(BUILD_VARIANT),lib)
-  TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto
-  TARGET_LDFLAGS += -Wl,--gc-sections
-endif
-
-MAKE_VARS = \
-	EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)"
-
-MAKE_FLAGS += \
-	BPFTOOL_VERSION="$(LINUX_VERSION)" \
-	FEATURES_DUMP="$(PKG_BUILD_DIR)/FEATURE-DUMP.openwrt" \
-	OUTPUT="$(PKG_BUILD_DIR)/" \
-	prefix="/usr" \
-	$(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='')
-
-ifeq ($(BUILD_VARIANT),full)
-  HAVE_LIBBFD:=1
-  HAVE_LIBCAP:=0
-  HAVE_CLANG:=0
-  MAKE_PATH:=tools/bpf/bpftool
-else ifeq ($(BUILD_VARIANT),minimal)
-  HAVE_LIBBFD:=0
-  HAVE_LIBCAP:=0
-  HAVE_CLANG:=0
-  MAKE_PATH:=tools/bpf/bpftool
-else ifeq ($(BUILD_VARIANT),lib)
-  HAVE_LIBBFD:=0
-  HAVE_LIBCAP:=0
-  HAVE_CLANG:=0
-  MAKE_PATH:=tools/lib/bpf
-endif
-
-# Perform a "throw-away" make to create a FEATURE-DUMP.* file to edit later.
-# The "//" in the make target is actually needed, very unPOSIXly.
-define Build/Configure
-	+$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/tools/bpf/bpftool \
-		$(MAKE_FLAGS) FEATURES_DUMP= $(PKG_BUILD_DIR)//libbpf/libbpf.a
-	(cd $(PKG_BUILD_DIR); cat FEATURE-DUMP.bpftool libbpf/FEATURE-DUMP.libbpf \
-		| sort | uniq > FEATURE-DUMP.openwrt)
-	$(SED) 's/feature-libbfd=1/feature-libbfd=$(HAVE_LIBBFD)/' \
-		-e 's/feature-libcap=1/feature-libcap=$(HAVE_LIBCAP)/' \
-		-e 's/feature-clang-bpf-co-re=1/feature-clang-bpf-co-re=$(HAVE_CLANG)/' \
-		$(PKG_BUILD_DIR)/FEATURE-DUMP.openwrt
-endef
-
-define Build/InstallDev/libbpf
-	$(INSTALL_DIR) $(1)/usr/include/bpf
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/bpf/*.h $(1)/usr/include/bpf/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/libbpf.{a,so*} \
-		$(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/pkgconfig/libbpf.pc \
-		$(1)/usr/lib/pkgconfig/
-	$(SED) 's,/usr/include,$$$${prefix}/include,g' \
-		$(1)/usr/lib/pkgconfig/libbpf.pc
-	$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' \
-		$(1)/usr/lib/pkgconfig/libbpf.pc
-endef
-
-ifeq ($(BUILD_VARIANT),lib)
-  Build/InstallDev=$(Build/InstallDev/libbpf)
-endif
-
-define Package/bpftool-$(BUILD_VARIANT)/install
-	$(INSTALL_DIR) $(1)/usr/libexec
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bpftool \
-		$(1)/usr/libexec/bpftool-$(BUILD_VARIANT)
-endef
-
-define Package/libbpf/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/libbpf.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libbpf))
-$(eval $(call BuildPackage,bpftool-full))
-$(eval $(call BuildPackage,bpftool-minimal))
--- a/bpftools/patches/005-tools-arch-powerpc-fix-EDEADLOCK-redefinition-errors.patch
+++ b/bpftools/patches/005-tools-arch-powerpc-fix-EDEADLOCK-redefinition-errors.patch
@ -1,51 +0,0 @@
-From afe3f4c765b17ced23811fe652c7f7adf7a0c0cf Mon Sep 17 00:00:00 2001
-From: Tony Ambardar <Tony.Ambardar@gmail.com>
-Date: Mon, 14 Sep 2020 23:05:26 -0700
-Subject: [PATCH] tools/arch/powerpc: fix EDEADLOCK redefinition errors in
- errno.h
-
-A few archs like powerpc have different errno.h values for macros
-EDEADLOCK and EDEADLK. In code including both libc and linux versions of
-errno.h, this can result in multiple definitions of EDEADLOCK in the
-include chain. Definitions to the same value (e.g. seen with mips) do
-not raise warnings, but on powerpc there are redefinitions changing the
-value, which raise warnings and errors (with "-Werror").
-
-Guard against these redefinitions to avoid build errors like the following,
-first seen cross-compiling libbpf v5.8.9 for powerpc using GCC 8.4.0 with
-musl 1.1.24:
-
-  In file included from ../../arch/powerpc/include/uapi/asm/errno.h:5,
-                   from ../../include/linux/err.h:8,
-                   from libbpf.c:29:
-  ../../include/uapi/asm-generic/errno.h:40: error: "EDEADLOCK" redefined [-Werror]
-   #define EDEADLOCK EDEADLK
-
-  In file included from toolchain-powerpc_8540_gcc-8.4.0_musl/include/errno.h:10,
-                   from libbpf.c:26:
-  toolchain-powerpc_8540_gcc-8.4.0_musl/include/bits/errno.h:58: note: this is the location of the previous definition
-   #define EDEADLOCK       58
-
-  cc1: all warnings being treated as errors
-  make[5]: *** [target-powerpc_8540_musl/bpftools-5.8.9/tools/build/Makefile.build:97: /home/kodidev/openwrt-project/build_dir/target-powerpc_8540_musl/bpftools-minimal/bpftools-5.8.9//libbpf/staticobjs/libbpf.o] Error 1
-
-Fixes: 95f28190aa01 ("tools include arch: Grab a copy of errno.h for arch's
-                      supported by perf")
-Fixes: c3617f72036c ("UAPI: (Scripted) Disintegrate arch/powerpc/include/asm")
-
-Reported-by: Rosen Penev <rosenp@gmail.com>
-Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
---
- tools/arch/powerpc/include/uapi/asm/errno.h | 1 +
- 1 file changed, 1 insertion(+)
-
--- a/tools/arch/powerpc/include/uapi/asm/errno.h
-+++ b/tools/arch/powerpc/include/uapi/asm/errno.h
-@@ -2,6 +2,7 @@
- #ifndef _ASM_POWERPC_ERRNO_H
- #define _ASM_POWERPC_ERRNO_H
- 
-+#undef	EDEADLOCK
- #include <asm-generic/errno.h>
- 
- #undef	EDEADLOCK
--- a/curl/Config.in
+++ b/curl/Config.in
@ -1,164 +0,0 @@
-if PACKAGE_libcurl
-
-comment "SSL support"
-
-choice
-	prompt "Selected SSL library"
-	default LIBCURL_WOLFSSL
-
-	config LIBCURL_MBEDTLS
-		bool "mbed TLS"
-
-	config LIBCURL_WOLFSSL
-		bool "wolfSSL"
-
-	config LIBCURL_OPENSSL
-		bool "OpenSSL"
-
-	config LIBCURL_GNUTLS
-		bool "GNUTLS"
-
-	config LIBCURL_NOSSL
-		bool "No SSL support"
-
-endchoice
-
-comment "Supported protocols"
-
-config LIBCURL_DICT
-	bool "DICT protocol"
-	default n
-
-config LIBCURL_FILE
-	bool "FILE protocol"
-	default y
-
-config LIBCURL_FTP
-	bool "FTP / FTPS protocol"
-	default y
-
-config LIBCURL_GOPHER
-	bool "Gopher protocol"
-	default n
-
-config LIBCURL_HTTP
-	bool "HTTP / HTTPS protocol"
-	default y
-
-config LIBCURL_COOKIES
-	bool "Enable Cookies support"
-	depends on LIBCURL_HTTP
-	default y
-
-config LIBCURL_IMAP
-	bool "IMAP / IMAPS protocol"
-	default n
-
-config LIBCURL_LDAP
-	bool "LDAP protocol"
-	default n
-
-config LIBCURL_LDAPS
-	bool "Enable LDAPS support"
-	depends on LIBCURL_LDAP && !LIBCURL_NOSSL
-	default y
-
-config LIBCURL_POP3
-	bool "POP3 / POP3S protocol"
-	default n
-
-config LIBCURL_RTSP
-	bool "RTSP protocol"
-	depends on LIBCURL_HTTP
-	default n
-config LIBCURL_NO_RTSP
-	string "RTSP require HTTP protocol"
-	depends on !LIBCURL_HTTP
-	default "!"
-
-config LIBCURL_SSH2
-	bool "SCP / SFTP protocol"
-	default n
-
-config LIBCURL_SMB
-	bool "SMB protocol (CIFS)"
-	depends on LIBCURL_CRYPTO_AUTH && (LIBCURL_GNUTLS || LIBCURL_OPENSSL)
-	default n
-config LIBCURL_NO_SMB
-	string "SMB require 'cryptographic authentication' and either 'GnuTLS' or 'OpenSSL'"
-	depends on !LIBCURL_CRYPTO_AUTH || (!LIBCURL_GNUTLS && !LIBCURL_OPENSSL)
-	default "!"
-
-config LIBCURL_SMTP
-	bool "SMTP / SMTPS protocol"
-	default n
-
-config LIBCURL_TELNET
-	bool "TELNET protocol"
-	default n
-
-config LIBCURL_TFTP
-	bool "TFTP protocol"
-	default n
-
-config LIBCURL_NGHTTP2
-	bool "HTTP2 protocol"
-	default y
-
-comment "Miscellaneous"
-
-config LIBCURL_PROXY
-	bool "Enable proxy support"
-	default y
-
-config LIBCURL_CRYPTO_AUTH
-	bool "Enable cryptographic authentication"
-	default n
-
-config LIBCURL_TLS_SRP
-	bool "Enable TLS-SRP authentication"
-	default n
-
-config LIBCURL_LIBIDN2
-	bool "Enable IDN2 support"
-	default n
-
-config LIBCURL_THREADED_RESOLVER
-	bool "Enable threaded DNS resolver"
-	default n
-	help
-		Enable POSIX threaded asynchronous DNS resolution
-
-config LIBCURL_ZLIB
-	bool "Enable zlib support"
-	default n
-
-config LIBCURL_ZSTD
-	bool "Enable zstd support"
-	default n
-
-config LIBCURL_UNIX_SOCKETS
-	bool "Enable unix domain socket support"
-	default n
-	help
-		Enable HTTP over unix domain sockets.
-		To use this with the curl command line, you specify the socket path to the new --unix-domain option.
-		This feature is actually not limited to HTTP, you can do all the TCP-based protocols 
-		except FTP over the unix domain socket, but it is only HTTP that is regularly used this way. 
-		The reason FTP isn't supported is of course its use of two connections 
-		which would be even weirder to do like this.
-
-config LIBCURL_LIBCURL_OPTION
-	bool "Enable generation of C code"
-	default n
-
-config LIBCURL_VERBOSE
-	bool "Enable verbose error strings"
-	default n
-
-config LIBCURL_NTLM
-	bool "Enable NTLM support"
-	depends on LIBCURL_CRYPTO_AUTH && !LIBCURL_NOSSL
-	default n
-
-endif
--- a/curl/Makefile
+++ b/curl/Makefile
@ -1,183 +0,0 @@
-#
-# Copyright (C) 2007-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:=curl
-PKG_VERSION:=7.82.0
-PKG_RELEASE:=$(AUTORELEASE)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
-	https://curl.askapache.com/download/ \
-	https://curl.se/download/
-PKG_HASH:=0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=COPYING
-PKG_CPE_ID:=cpe:/a:haxx:libcurl
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-PKG_CONFIG_DEPENDS:= \
-  CONFIG_IPV6 \
-  \
-  CONFIG_LIBCURL_WOLFSSL \
-  CONFIG_LIBCURL_GNUTLS \
-  CONFIG_LIBCURL_OPENSSL \
-  CONFIG_LIBCURL_MBEDTLS \
-  CONFIG_LIBCURL_NOSSL \
-  \
-  CONFIG_LIBCURL_LIBIDN2 \
-  CONFIG_LIBCURL_SSH2 \
-  CONFIG_LIBCURL_ZLIB \
-  CONFIG_LIBCURL_ZSTD \
-  \
-  CONFIG_LIBCURL_DICT \
-  CONFIG_LIBCURL_FILE \
-  CONFIG_LIBCURL_FTP \
-  CONFIG_LIBCURL_GOPHER \
-  CONFIG_LIBCURL_HTTP \
-  CONFIG_LIBCURL_IMAP \
-  CONFIG_LIBCURL_LDAP \
-  CONFIG_LIBCURL_LDAPS \
-  CONFIG_LIBCURL_POP3 \
-  CONFIG_LIBCURL_RTSP \
-  CONFIG_LIBCURL_NO_RTSP \
-  CONFIG_LIBCURL_SMB \
-  CONFIG_LIBCURL_NO_SMB \
-  CONFIG_LIBCURL_SMTP \
-  CONFIG_LIBCURL_TELNET \
-  CONFIG_LIBCURL_TFTP \
-  CONFIG_LIBCURL_NGHTTP2 \
-  \
-  CONFIG_LIBCURL_COOKIES \
-  CONFIG_LIBCURL_CRYPTO_AUTH \
-  CONFIG_LIBCURL_LIBCURL_OPTION \
-  CONFIG_LIBCURL_PROXY \
-  CONFIG_LIBCURL_THREADED_RESOLVER \
-  CONFIG_LIBCURL_TLS_SRP \
-  CONFIG_LIBCURL_UNIX_SOCKETS \
-  CONFIG_LIBCURL_VERBOSE \
-  CONFIG_LIBCURL_NTLM \
-  $(if $(CONFIG_LIBCURL_OPENSSL), \
-	CONFIG_OPENSSL_ENGINE \
-	CONFIG_OPENSSL_WITH_COMPRESSION \
-	CONFIG_OPENSSL_WITH_NPN)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/curl/Default
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://curl.se/
-  MAINTAINER:=Stan Grishin <stangri@melmac.ca>
-endef
-
-define Package/curl
-  $(call Package/curl/Default)
-  SUBMENU:=File Transfer
-  DEPENDS:=+libcurl
-  TITLE:=A client-side URL transfer utility
-endef
-
-define Package/libcurl
-  $(call Package/curl/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:= +LIBCURL_WOLFSSL:libwolfssl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls
-  DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_ZSTD:libzstd +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap
-  DEPENDS += +LIBCURL_LIBIDN2:libidn2 +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 +ca-bundle
-  TITLE:=A client-side URL transfer library
-  MENU:=1
-  ABI_VERSION:=4
-endef
-
-define Package/libcurl/config
-  source "$(SOURCE)/Config.in"
-endef
-
-TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections
-TARGET_CPPFLAGS += $(if $(CONFIG_LIBCURL_NTLM),,-DCURL_DISABLE_NTLM)
-TARGET_LDFLAGS += -Wl,--gc-sections
-
-CONFIGURE_ARGS += \
-	--disable-debug \
-	--disable-ares \
-	--enable-shared \
-	--enable-static \
-	--disable-manual \
-	--without-nss \
-	--without-librtmp \
-	--without-libidn \
-	--without-ca-path \
-	--without-libpsl \
-	--without-zstd \
-	--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
-	\
-	$(call autoconf_bool,CONFIG_IPV6,ipv6) \
-	\
-	$(if $(CONFIG_LIBCURL_WOLFSSL),--with-wolfssl="$(STAGING_DIR)/usr",--without-wolfssl) \
-	$(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr",--without-gnutls) \
-	$(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr",--without-ssl) \
-	$(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr",--without-mbedtls) \
-	\
-	$(if $(CONFIG_LIBCURL_LIBIDN2),--with-libidn2="$(STAGING_DIR)/usr",--without-libidn2) \
-	$(if $(CONFIG_LIBCURL_SSH2),--with-libssh2="$(STAGING_DIR)/usr",--without-libssh2) \
-	$(if $(CONFIG_LIBCURL_ZLIB),--with-zlib="$(STAGING_DIR)/usr",--without-zlib) \
-	$(if $(CONFIG_LIBCURL_ZSTD),--with-zstd="$(STAGING_DIR)/usr",--without-zstd) \
-	$(if $(CONFIG_LIBCURL_NGHTTP2),--with-nghttp2="$(STAGING_DIR)/usr",--without-nghttp2) \
-	\
-	$(call autoconf_bool,CONFIG_LIBCURL_DICT,dict) \
-	$(call autoconf_bool,CONFIG_LIBCURL_FILE,file) \
-	$(call autoconf_bool,CONFIG_LIBCURL_FTP,ftp) \
-	$(call autoconf_bool,CONFIG_LIBCURL_GOPHER,gopher) \
-	$(call autoconf_bool,CONFIG_LIBCURL_HTTP,http) \
-	$(call autoconf_bool,CONFIG_LIBCURL_IMAP,imap) \
-	$(call autoconf_bool,CONFIG_LIBCURL_LDAP,ldap) \
-	$(call autoconf_bool,CONFIG_LIBCURL_LDAPS,ldaps) \
-	$(call autoconf_bool,CONFIG_LIBCURL_POP3,pop3) \
-	$(call autoconf_bool,CONFIG_LIBCURL_RTSP,rtsp) \
-	$(call autoconf_bool,CONFIG_LIBCURL_SMB,smb) \
-	$(call autoconf_bool,CONFIG_LIBCURL_SMTP,smtp) \
-	$(call autoconf_bool,CONFIG_LIBCURL_TELNET,telnet) \
-	$(call autoconf_bool,CONFIG_LIBCURL_TFTP,tftp) \
-	\
-	$(call autoconf_bool,CONFIG_LIBCURL_COOKIES,cookies) \
-	$(call autoconf_bool,CONFIG_LIBCURL_CRYPTO_AUTH,crypto-auth) \
-	$(call autoconf_bool,CONFIG_LIBCURL_LIBCURL_OPTION,libcurl-option) \
-	$(call autoconf_bool,CONFIG_LIBCURL_PROXY,proxy) \
-	$(call autoconf_bool,CONFIG_LIBCURL_THREADED_RESOLVER,threaded-resolver) \
-	$(call autoconf_bool,CONFIG_LIBCURL_TLS_SRP,tls-srp) \
-	$(call autoconf_bool,CONFIG_LIBCURL_UNIX_SOCKETS,unix-sockets) \
-	$(call autoconf_bool,CONFIG_LIBCURL_VERBOSE,verbose) \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/libcurl.pc $(1)/usr/lib/pkgconfig/
-	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/curl-config
-	[ -n "$(TARGET_LDFLAGS)" ] && $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/libcurl.pc || true
-	$(LN) $(STAGING_DIR)/usr/bin/curl-config $(2)/bin/
-endef
-
-define Package/curl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl $(1)/usr/bin/
-endef
-
-define Package/libcurl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libcurl))
-$(eval $(call BuildPackage,curl))
--- a/curl/patches/0001-wolfssl-fix-compiler-error-without-IPv6.patch
+++ b/curl/patches/0001-wolfssl-fix-compiler-error-without-IPv6.patch
@ -1,26 +0,0 @@
-From 471d5f44c5189bd78f8839ce8ac1b4b14f4b7d61 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 7 Mar 2022 08:40:47 +0100
-Subject: [PATCH] wolfssl: fix compiler error without IPv6
-
-Reported-by: Joseph Chen
-Fixes #8550
-Closes #8552
---
- lib/vtls/wolfssl.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
--- a/lib/vtls/wolfssl.c
-+++ b/lib/vtls/wolfssl.c
-@@ -462,9 +462,9 @@ wolfssl_connect_step1(struct Curl_easy *
-     const char * const hostname = SSL_HOST_NAME();
-     size_t hostname_len = strlen(hostname);
-     if((hostname_len < USHRT_MAX) &&
-       (0 == Curl_inet_pton(AF_INET, hostname, &addr4)) &&
-+       !Curl_inet_pton(AF_INET, hostname, &addr4)
- #ifdef ENABLE_IPV6
-       (0 == Curl_inet_pton(AF_INET6, hostname, &addr6))
-+       && !Curl_inet_pton(AF_INET6, hostname, &addr6)
- #endif
-       ) {
-       size_t snilen;
--- a/curl/patches/200-no_docs_tests.patch
+++ b/curl/patches/200-no_docs_tests.patch
@ -1,20 +0,0 @@
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -156,7 +156,7 @@ CLEANFILES = $(VC10_LIBVCXPROJ) $(VC10_S
- bin_SCRIPTS = curl-config
- 
- SUBDIRS = lib src
-DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs
-+DIST_SUBDIRS = $(SUBDIRS) packages include
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libcurl.pc
-@@ -270,8 +270,6 @@ cygwinbin:
- # We extend the standard install with a custom hook:
- install-data-hook:
- 	(cd include && $(MAKE) install)
-	(cd docs && $(MAKE) install)
-	(cd docs/libcurl && $(MAKE) install)
- 
- # We extend the standard uninstall with a custom hook:
- uninstall-hook:
--- a/frp/Makefile
+++ b/frp/Makefile
@ -1,70 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=frp
-PKG_VERSION:=0.39.0
-PKG_RELEASE:=$(AUTORELEASE)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v${PKG_VERSION}?
-PKG_HASH:=639ad416587b03751569b0d51c097bcc52727643e0656064843efb5d0b08ba72
-
-PKG_MAINTAINER:=Richard Yu <yurichard3839@gmail.com>
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DEPENDS:=golang/host
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-GO_PKG:=github.com/fatedier/frp
-GO_PKG_BUILD_PKG:=github.com/fatedier/frp/cmd/...
-
-include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
-
-define Package/frp/install
-	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
-
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/frp/$(2).d/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/$(2)_full.ini $(1)/etc/frp/$(2).d/
-	$(INSTALL_DIR) $(1)/etc/config/
-	$(INSTALL_CONF) ./files/$(2).config $(1)/etc/config/$(2)
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) ./files/$(2).init $(1)/etc/init.d/$(2)
-
-	if [ -r ./files/$(2).uci-defaults ]; then \
-		$(INSTALL_DIR) $(1)/etc/uci-defaults; \
-		$(INSTALL_DATA) ./files/$(2).uci-defaults $(1)/etc/uci-defaults/$(2); \
-	fi
-endef
-
-define Package/frp/template
-  define Package/$(1)
-    SECTION:=net
-    CATEGORY:=Network
-    SUBMENU:=Web Servers/Proxies
-    TITLE:=$(1) - fast reverse proxy $(2)
-    URL:=https://github.com/fatedier/frp
-    DEPENDS:=$(GO_ARCH_DEPENDS)
-  endef
-
-  define Package/$(1)/description
-    $(1) is a fast reverse proxy $(2) to help you expose a local server behind
-    a NAT or firewall to the internet.
-  endef
-
-  define Package/$(1)/conffiles
-/etc/config/$(1)
-  endef
-
-  define Package/$(1)/install
-    $(call Package/frp/install,$$(1),$(1))
-  endef
-endef
-
-$(eval $(call Package/frp/template,frpc,client))
-$(eval $(call Package/frp/template,frps,server))
-$(eval $(call BuildPackage,frpc))
-$(eval $(call BuildPackage,frps))
--- a/frp/files/frpc.config
+++ b/frp/files/frpc.config
@ -1,23 +0,0 @@
-config init
-	option stdout 1
-	option stderr 1
-	option user frpc
-	option group frpc
-	option respawn 1
-#	OS environments pass to frp for config file template, see
-#	https://github.com/fatedier/frp#configuration-file-template
-#	list env 'ENV_NAME=value'
-#	Config files include in temporary config file.
-#	list conf_inc '/etc/frp/frpc.d/frpc_full.ini'
-
-config conf 'common'
-	option server_addr 127.0.0.1
-	option server_port 7000
-#	List options with name="_" will be directly appended to config file
-#	list _ '# Key-A=Value-A'
-
-config conf 'ssh'
-	option type tcp
-	option local_ip 127.0.0.1
-	option local_port 22
-	option remote_port 6000
--- a/frp/files/frpc.init
+++ b/frp/files/frpc.init
@ -1,84 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-USE_PROCD=1
-
-NAME=frpc
-PROG=/usr/bin/$NAME
-
-_err() {
-	echo "$*" >&2
-	logger -p daemon.err -t "$NAME" "$*"
-}
-
-config_cb() {
-	[ $# -eq 0 ] && return
-
-	local type="$1"
-	local name="$2"
-	if [ "$type" = "conf" ]; then
-		echo "[$name]" >> "$conf_file"
-		option_cb() {
-			local option="$1"
-			local value="$2"
-			[ "$option" = "name" ] && \
-			sed -i "s/$CONFIG_SECTION/$value/g" "$conf_file" || \
-			echo "$option = $value" >> "$conf_file";
-		}
-		list_cb() {
-			local name="$1"
-			local value="$2"
-			[ "$name" = "_" ] && echo "$value" >> "$conf_file"
-		}
-	else
-		[ "$type" = "init" ] && init_cfg="$name"
-		option_cb() { return 0; }
-		list_cb() { return 0; }
-	fi
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "$NAME"
-}
-
-start_service() {
-	local init_cfg=" "
-	local conf_file="/var/etc/$NAME.ini"
-
-	> "$conf_file"
-	config_load "$NAME"
-
-	local stdout stderr user group respawn env conf_inc
-	uci_validate_section "$NAME" init "$init_cfg" \
-		'stdout:bool:1' \
-		'stderr:bool:1' \
-		'user:string' \
-		'group:string' \
-		'respawn:bool:1' \
-		'env:list(string)' \
-		'conf_inc:list(string)'
-
-	local err=$?
-	[ $err -ne 0 ] && {
-		_err "uci_validate_section returned $err"
-		return 1
-	}
-
-	[ -n "$conf_inc" ] && config_list_foreach "$init_cfg" conf_inc cat >> "$conf_file"
-
-	procd_open_instance
-	procd_set_param command "$PROG" -c "$conf_file"
-	procd_set_param stdout $stdout
-	procd_set_param stderr $stderr
-	[ -n "$user" ] && procd_set_param user "$user"
-	[ -n "$group" ] && procd_set_param group "$group"
-	[ $respawn -eq 1 ] && procd_set_param respawn
-	[ -n "$env" ] && config_list_foreach "$init_cfg" env "procd_append_param env"
-	procd_close_instance
-}
-
-reload_service() {
-	stop
-	start
-}
--- a/frp/files/frpc.uci-defaults
+++ b/frp/files/frpc.uci-defaults
@ -1,19 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-upgrade() {
-	local section=$1
-	local name
-	[ "$section" != "common" ] || return 0
-	config_get name $section name
-	if [ -z "$name" ]; then
-		uci_set frpc "$section" name "$section"
-		uci_commit frpc
-	fi
-}
-
-config_load frpc
-config_foreach upgrade conf
-
-exit 0
--- a/frp/files/frps.config
+++ b/frp/files/frps.config
@ -1,16 +0,0 @@
-config init
-	option stdout 1
-	option stderr 1
-	option user frps
-	option group frps
-	option respawn 1
-#	OS environments pass to frp for config file template, see
-#	https://github.com/fatedier/frp#configuration-file-template
-#	list env 'ENV_NAME=value'
-#	Config files include in temporary config file.
-#	list conf_inc '/etc/frp/frps.d/frps_full.ini'
-
-config conf 'common'
-	option bind_port 7000
-#	List options with name="_" will be directly appended to config file
-#	list _ '# Key-A=Value-A'
--- a/frp/files/frps.init
+++ b/frp/files/frps.init
@ -1,82 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-USE_PROCD=1
-
-NAME=frps
-PROG=/usr/bin/$NAME
-
-_err() {
-	echo "$*" >&2
-	logger -p daemon.err -t "$NAME" "$*"
-}
-
-config_cb() {
-	[ $# -eq 0 ] && return
-
-	local type="$1"
-	local name="$2"
-	if [ "$type" = "conf" ]; then
-		echo "[$name]" >> "$conf_file"
-		option_cb() {
-			local option="$1"
-			local value="$2"
-			echo "$option = $value" >> "$conf_file"
-		}
-		list_cb() {
-			local name="$1"
-			local value="$2"
-			[ "$name" = "_" ] && echo "$value" >> "$conf_file"
-		}
-	else
-		[ "$type" = "init" ] && init_cfg="$name"
-		option_cb() { return 0; }
-		list_cb() { return 0; }
-	fi
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "$NAME"
-}
-
-start_service() {
-	local init_cfg=" "
-	local conf_file="/var/etc/$NAME.ini"
-
-	> "$conf_file"
-	config_load "$NAME"
-
-	local stdout stderr user group respawn env conf_inc
-	uci_validate_section "$NAME" init "$init_cfg" \
-		'stdout:bool:1' \
-		'stderr:bool:1' \
-		'user:string' \
-		'group:string' \
-		'respawn:bool:1' \
-		'env:list(string)' \
-		'conf_inc:list(string)'
-
-	local err=$?
-	[ $err -ne 0 ] && {
-		_err "uci_validate_section returned $err"
-		return 1
-	}
-
-	[ -n "$conf_inc" ] && config_list_foreach "$init_cfg" conf_inc cat >> "$conf_file"
-
-	procd_open_instance
-	procd_set_param command "$PROG" -c "$conf_file"
-	procd_set_param stdout $stdout
-	procd_set_param stderr $stderr
-	[ -n "$user" ] && procd_set_param user "$user"
-	[ -n "$group" ] && procd_set_param group "$group"
-	[ $respawn -eq 1 ] && procd_set_param respawn
-	[ -n "$env" ] && config_list_foreach "$init_cfg" env "procd_append_param env"
-	procd_close_instance
-}
-
-reload_service() {
-	stop
-	start
-}
--- a/grpcurl/Makefile
+++ b/grpcurl/Makefile
@ -1,60 +0,0 @@
-#
-# Copyright (C) 2022 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=grpcurl
-PKG_VERSION:=1.8.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/fullstorydev/grpcurl/archive/refs/tags/
-PKG_HASH:=18b457f644baabeef0de350596dd8d23563586ee94a3ed3cb290063e097ab934
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Yannick Chabanois <ycarus@zugaina.org>
-
-PKG_BUILD_DEPENDS:=golang/host
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-GO_PKG:=github.com/fullstorydev/grpcurl
-GO_PKG_BUILD_PKG:=github.com/fullstorydev/grpcurl/cmd/grpcurl
-GO_PKG_LDFLAGS_X:= \
-    $(GO_PKG)/constant.Version=$(PKG_VERSION) \
-    $(GO_PKG)/constant.Commit=v$(PKG_VERSION)
-GO_PKG_LDFLAGS:=-s -w
-GO_PKG_TAGS:=master
-
-include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
-
-define Package/grpcurl
-  TITLE:=grpcurl is a command-line tool that lets you interact with gRPC servers
-  URL:=https://github.com/fullstorydev/grpcurl
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=$(GO_ARCH_DEPENDS) +protobuf
-endef
-
-define Package/grpcurl/description
-  grpcurl is a command-line tool that lets you interact with gRPC servers. It's basically curl for gRPC servers.
-
-  The main purpose for this tool is to invoke RPC methods on a gRPC server from the command-line. gRPC servers use a binary encoding on the wire (protocol buffers, or "protobufs" for short). So they are basically impossible to interact with using regular curl (and older versions of curl that do not support HTTP/2 are of course non-starters). This program accepts messages using JSON encoding, which is much more friendly for both humans and scripts.
-endef
-
-define Package/v2ray-core/install
-	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
-
-	$(INSTALL_DIR) $(1)/usr/bin
-
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/grpcurl $(1)/usr/bin
-endef
-
-$(eval $(call GoBinPackage,grpcurl))
-$(eval $(call BuildPackage,grpcurl))
--- a/lcd4linux/Config.in
+++ b/lcd4linux/Config.in
@ -1,490 +0,0 @@
-if PACKAGE_lcd4linux-custom
-
-config LCD4LINUX_CUSTOM_NEEDS_libdbus
-	bool
-
-#config LCD4LINUX_CUSTOM_NEEDS_libftdi
-#	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libgd
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libiconv
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libjpeg
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libmpdclient
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libmysqlclient
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libncurses
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libnmeap
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libsqlite3
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libusb
-	bool
-
-#config LCD4LINUX_CUSTOM_NEEDS_libX11
-#	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_ppp
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_python
-	bool
-
-
-comment "Drivers ---"
-
-config LCD4LINUX_CUSTOM_DRIVER_ASTUSB
-	bool
-	prompt "ASTUSB"
-
-config LCD4LINUX_CUSTOM_DRIVER_BeckmannEgle
-	bool
-	prompt "BeckmannEgle"
-
-config LCD4LINUX_CUSTOM_DRIVER_BWCT
-	bool
-	prompt "BWCT"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_CrystalFontz
-	bool
-	prompt "CrystalFontz"
-
-config LCD4LINUX_CUSTOM_DRIVER_Curses
-	bool
-	prompt "Curses"
-	select LCD4LINUX_CUSTOM_NEEDS_libncurses
-
-config LCD4LINUX_CUSTOM_DRIVER_Cwlinux
-	bool
-	prompt "Cwlinux"
-
-config LCD4LINUX_CUSTOM_DRIVER_D4D
-	bool
-	prompt "D4D"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_dpf
-	bool
-	prompt "dpf"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_EA232graphic
-	bool
-	prompt "EA232graphic"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_EFN
-	bool
-	prompt "EFN"
-
-config LCD4LINUX_CUSTOM_DRIVER_FutabaVFD
-	bool
-	prompt "FutabaVFD"
-
-config LCD4LINUX_CUSTOM_DRIVER_FW8888
-	bool
-	prompt "FW8888"
-
-config LCD4LINUX_CUSTOM_DRIVER_G15
-	bool
-	prompt "G15"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_GLCD2USB
-	bool
-	prompt "GLCD2USB"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_HD44780
-	bool
-	prompt "HD44780"
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_DRIVER_HD44780-I2C
-	bool
-	prompt "HD44780-I2C"
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_DRIVER_IRLCD
-	bool
-	prompt "IRLCD"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_LCD2USB
-	bool
-	prompt "LCD2USB"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_LCDLinux
-	bool
-	prompt "LCDLinux"
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_DRIVER_LCDTerm
-	bool
-	prompt "LCDTerm"
-
-config LCD4LINUX_CUSTOM_DRIVER_LEDMatrix
-	bool
-	prompt "LEDMatrix"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_LPH7508
-	bool
-	prompt "LPH7508"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_LUIse
-	bool
-	prompt "LUIse"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	#select LCD4LINUX_CUSTOM_NEEDS_libluise
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_DRIVER_LW_ABP
-	bool
-	prompt "LW_ABP"
-
-config LCD4LINUX_CUSTOM_DRIVER_M50530
-	bool
-	prompt "M50530"
-
-config LCD4LINUX_CUSTOM_DRIVER_MatrixOrbital
-	bool
-	prompt "MatrixOrbital"
-
-config LCD4LINUX_CUSTOM_DRIVER_MatrixOrbitalGX
-	bool
-	prompt "MatrixOrbitalGX"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_mdm166a
-	bool
-	prompt "mdm166a"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_MilfordInstruments
-	bool
-	prompt "MilfordInstruments"
-
-config LCD4LINUX_CUSTOM_DRIVER_Newhaven
-	bool
-	prompt "Newhaven"
-
-config LCD4LINUX_CUSTOM_DRIVER_Noritake
-	bool
-	prompt "Noritake"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_NULL
-	bool
-	prompt "NULL"
-	default y
-
-config LCD4LINUX_CUSTOM_DRIVER_Pertelian
-	bool
-	prompt "Pertelian"
-
-config LCD4LINUX_CUSTOM_DRIVER_PHAnderson
-	bool
-	prompt "PHAnderson"
-
-config LCD4LINUX_CUSTOM_DRIVER_PICGraphic
-	bool
-	prompt "PICGraphic"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_picoLCD
-	bool
-	prompt "picoLCD"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_picoLCDGraphic
-	bool
-	prompt "picoLCDGraphic"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_PNG
-	bool
-	prompt "PNG"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_PPM
-	bool
-	prompt "PPM"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_RouterBoard
-	bool
-	prompt "RouterBoard"
-	depends on TARGET_rb532
-
-config LCD4LINUX_CUSTOM_DRIVER_SamsungSPF
-	bool
-	prompt "SamsungSPF"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libjpeg
-
-config LCD4LINUX_CUSTOM_DRIVER_serdisplib
-	bool
-	prompt "serdisplib"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_serdisplib
-
-config LCD4LINUX_CUSTOM_DRIVER_ShuttleVFD
-	bool
-	prompt "ShuttleVFD"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_SimpleLCD
-	bool
-	prompt "SimpleLCD"
-
-config LCD4LINUX_CUSTOM_DRIVER_st2205
-	bool
-	prompt "st2205"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_st2205tool
-
-config LCD4LINUX_CUSTOM_DRIVER_T6963
-	bool
-	prompt "T6963"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_TeakLCM
-	bool
-	prompt "TeakLCM"
-
-config LCD4LINUX_CUSTOM_DRIVER_TEW673GRU
-	bool
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	depends on TARGET_ar71xx
-	default TARGET_ar71xx
-
-config LCD4LINUX_CUSTOM_DRIVER_Trefon
-	bool
-	prompt "Trefon"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-#config LCD4LINUX_CUSTOM_DRIVER_ULA200
-#	bool
-#	prompt "ULA200"
-#	select LCD4LINUX_CUSTOM_NEEDS_libftdi
-#	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_USBHUB
-	bool
-	prompt "USBHUB"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_USBLCD
-	bool
-	prompt "USBLCD"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_VNC
-	bool
-	prompt "VNC"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libvncserver
-
-config LCD4LINUX_CUSTOM_DRIVER_WincorNixdorf
-	bool
-	prompt "WincorNixdorf"
-
-#config LCD4LINUX_CUSTOM_DRIVER_X11
-#	bool
-#	prompt "X11"
-#	select LCD4LINUX_CUSTOM_NEEDS_libgd
-#	select LCD4LINUX_CUSTOM_NEEDS_libX11
-
-
-comment "Plugins ---"
-
-config LCD4LINUX_CUSTOM_PLUGIN_apm
-	bool
-	prompt "apm"
-
-config LCD4LINUX_CUSTOM_PLUGIN_asterisk
-	bool
-	prompt "asterisk"
-
-config LCD4LINUX_CUSTOM_PLUGIN_button_exec
-	bool
-	prompt "button_exec"
-
-config LCD4LINUX_CUSTOM_PLUGIN_cpuinfo
-	bool
-	prompt "cpuinfo"
-	default y
-
-config LCD4LINUX_CUSTOM_PLUGIN_dbus
-	bool
-	prompt "dbus"
-	select LCD4LINUX_CUSTOM_NEEDS_libdbus
-
-config LCD4LINUX_CUSTOM_PLUGIN_diskstats
-	bool
-	prompt "diskstats"
-
-config LCD4LINUX_CUSTOM_PLUGIN_dvb
-	bool
-	prompt "dvb"
-
-config LCD4LINUX_CUSTOM_PLUGIN_event
-	bool
-	prompt "event"
-
-config LCD4LINUX_CUSTOM_PLUGIN_exec
-	bool
-	prompt "exec"
-
-config LCD4LINUX_CUSTOM_PLUGIN_fifo
-	bool
-	prompt "fifo"
-
-config LCD4LINUX_CUSTOM_PLUGIN_file
-	bool
-	prompt "file"
-
-config LCD4LINUX_CUSTOM_PLUGIN_gps
-	bool
-	prompt "gps"
-	select LCD4LINUX_CUSTOM_NEEDS_libnmeap
-
-config LCD4LINUX_CUSTOM_PLUGIN_hddtemp
-	bool
-	prompt "hddtemp"
-
-config LCD4LINUX_CUSTOM_PLUGIN_huawei
-	bool
-	prompt "huawei"
-
-config LCD4LINUX_CUSTOM_PLUGIN_i2c_sensors
-	bool
-	prompt "i2c_sensors"
-
-config LCD4LINUX_CUSTOM_PLUGIN_iconv
-	bool
-	prompt "iconv"
-	select LCD4LINUX_CUSTOM_NEEDS_libiconv
-
-config LCD4LINUX_CUSTOM_PLUGIN_imon
-	bool
-	prompt "imon"
-
-config LCD4LINUX_CUSTOM_PLUGIN_isdn
-	bool
-	prompt "isdn"
-
-config LCD4LINUX_CUSTOM_PLUGIN_kvv
-	bool
-	prompt "kvv"
-
-config LCD4LINUX_CUSTOM_PLUGIN_loadavg
-	bool
-	prompt "loadavg"
-	default y
-
-config LCD4LINUX_CUSTOM_PLUGIN_meminfo
-	bool
-	prompt "meminfo"
-	default y
-
-config LCD4LINUX_CUSTOM_PLUGIN_mpd
-	bool
-	prompt "mpd"
-	select LCD4LINUX_CUSTOM_NEEDS_libmpdclient
-
-config LCD4LINUX_CUSTOM_PLUGIN_mpris_dbus
-	bool
-	prompt "mpris_dbus"
-	select LCD4LINUX_CUSTOM_NEEDS_libdbus
-
-config LCD4LINUX_CUSTOM_PLUGIN_mysql
-	bool
-	prompt "mysql"
-	select LCD4LINUX_CUSTOM_NEEDS_libmysqlclient
-
-config LCD4LINUX_CUSTOM_PLUGIN_netdev
-	bool
-	prompt "netdev"
-
-config LCD4LINUX_CUSTOM_PLUGIN_netinfo
-	bool
-	prompt "netinfo"
-
-config LCD4LINUX_CUSTOM_PLUGIN_pop3
-	bool
-	prompt "pop3"
-
-config LCD4LINUX_CUSTOM_PLUGIN_ppp
-	bool
-	prompt "ppp"
-	select LCD4LINUX_CUSTOM_NEEDS_ppp
-
-config LCD4LINUX_CUSTOM_PLUGIN_proc_stat
-	bool
-	prompt "proc_stat"
-	default y
-
-#config LCD4LINUX_CUSTOM_PLUGIN_python
-#	bool
-#	prompt "python"
-#	select LCD4LINUX_CUSTOM_NEEDS_python
-
-config LCD4LINUX_CUSTOM_PLUGIN_qnaplog
-	bool
-	prompt "qnaplog"
-	select LCD4LINUX_CUSTOM_NEEDS_libsqlite3
-
-config LCD4LINUX_CUSTOM_PLUGIN_seti
-	bool
-	prompt "seti"
-
-config LCD4LINUX_CUSTOM_PLUGIN_statfs
-	bool
-	prompt "statfs"
-
-config LCD4LINUX_CUSTOM_PLUGIN_uname
-	bool
-	prompt "uname"
-
-config LCD4LINUX_CUSTOM_PLUGIN_uptime
-	bool
-	prompt "uptime"
-	default y
-
-config LCD4LINUX_CUSTOM_PLUGIN_w1retap
-	bool
-	prompt "w1retap"
-
-config LCD4LINUX_CUSTOM_PLUGIN_wireless
-	bool
-	prompt "wireless"
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_PLUGIN_xmms
-	bool
-	prompt "xmms"
-
-endif
--- a/lcd4linux/Makefile
+++ b/lcd4linux/Makefile
@ -1,306 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-# Copyright (C) 2019 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lcd4linux
-PKG_REV:=f13470faf00e52d1458f2a88d498716240edc272
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-#PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/
-PKG_SOURCE_URL:=https://github.com/redblue-pkt/lcd4linux.git
-#PKG_SOURCE_SUBDIR:=lcd4linux-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=git
-
-LCD4LINUX_DRIVERS:= \
-	ASTUSB \
-	BeckmannEgle \
-	BWCT \
-	CrystalFontz \
-	Curses \
-	Cwlinux \
-	D4D \
-	DPF \
-	EA232graphic \
-	EFN \
-	FutabaVFD \
-	FW8888 \
-	GLCD2USB \
-	IRLCD \
-	$(if $(CONFIG_BROKEN),HD44780) \
-	$(if $(CONFIG_BROKEN),HD44780-I2C) \
-	LCD2USB \
-	$(if $(CONFIG_BROKEN),LCDLinux) \
-	LCDTerm \
-	LEDMatrix \
-	LPH7508 \
-	$(if $(CONFIG_BROKEN),LUIse) \
-	LW_ABP \
-	M50530 \
-	MatrixOrbital \
-	MatrixOrbitalGX \
-	MilfordInstruments \
-	Newhaven \
-	Noritake \
-	NULL \
-	Pertelian \
-	PHAnderson \
-	PICGraphic \
-	picoLCD \
-	picoLCDGraphic \
-	PNG \
-	PPM \
-	$(if $(CONFIG_TARGET_rb532),RouterBoard) \
-	$(if $(CONFIG_BROKEN),SamsungSPF) \
-	ShuttleVFD \
-	SimpleLCD \
-	st2205 \
-	T6963 \
-	TeakLCM \
-	$(if $(CONFIG_TARGET_ar71xx),TEW673GRU) \
-	Trefon \
-	USBHUB \
-	USBLCD \
-	VNC \
-	WincorNixdorf \
-	serdisplib \
-#	G15 \
-#	ULA200 \
-#	X11 \
-
-LCD4LINUX_PLUGINS:= \
-	apm \
-	asterisk \
-	button_exec \
-	cpuinfo \
-	dbus \
-	diskstats \
-	dvb \
-	event \
-	exec \
-	fifo \
-	file \
-	gps \
-	hddtemp \
-	huawei \
-	i2c_sensors \
-	iconv \
-	imon \
-	isdn \
-	kvv \
-	loadavg \
-	netdev \
-	netinfo \
-	meminfo \
-	mpris_dbus \
-	netdev \
-	pop3 \
-	ppp \
-	proc_stat \
-	qnaplog \
-	seti \
-	statfs \
-	uname \
-	uptime \
-	w1retap \
-	$(if $(CONFIG_BROKEN),wireless) \
-	xmms \
-#	mpd \
-#	mysql \
-#	python \
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_DEPENDS:= \
-#	ppp \
-#	libftdi \
-#	libX11 \
-#	python \
-
-PKG_CONFIG_DEPENDS:= \
-	$(patsubst %,CONFIG_LCD4LINUX_CUSTOM_DRIVER_%,$(LCD4LINUX_DRIVERS)) \
-	$(patsubst %,CONFIG_LCD4LINUX_CUSTOM_PLUGIN_%,$(LCD4LINUX_PLUGINS)) \
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/lcd4linux/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
-  TITLE:=LCD display utility
-  URL:=http://lcd4linux.bulix.org/
-endef
-
-define Package/lcd4linux/Default/description
- LCD4Linux is a small program that grabs information from the kernel and
- some subsystems and displays it on an external liquid crystal display.
-endef
-
-
-define Package/lcd4linux-custom
-$(call Package/lcd4linux/Default)
-  DEPENDS:= \
-	+LCD4LINUX_CUSTOM_NEEDS_libdbus:libdbus \
-	+LCD4LINUX_CUSTOM_NEEDS_libgd:libgd \
-	$(if $(ICONV_FULL),+LCD4LINUX_CUSTOM_NEEDS_libiconv:libiconv-full) \
-	+LCD4LINUX_CUSTOM_NEEDS_libjpeg:libjpeg \
-	+LCD4LINUX_CUSTOM_NEEDS_libncurses:libncurses \
-	+LCD4LINUX_CUSTOM_NEEDS_libsqlite3:libsqlite3 \
-	+LCD4LINUX_CUSTOM_NEEDS_libusb:libusb-compat \
-#	+LCD4LINUX_CUSTOM_NEEDS_libmpdclient:libmpdclient \
-#	+LCD4LINUX_CUSTOM_NEEDS_libmysqlclient:libmysqlclient \
-#	+LCD4LINUX_CUSTOM_NEEDS_libftdi:libftdi \
-#	+LCD4LINUX_CUSTOM_NEEDS_libX11:libX11 \
-#	+LCD4LINUX_CUSTOM_NEEDS_python:python
-  MENU:=1
-  PROVIDES:=lcd4linux
-  VARIANT=custom
-endef
-
-define Package/lcd4linux-custom/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/lcd4linux-custom/description
-$(call Package/lcd4linux/Default/description)
- .
- This package contains a customized version of LCD4Linux.
-endef
-
-
-define Package/lcd4linux-full
-$(call Package/lcd4linux/Default)
-  DEPENDS:= \
-	+libdbus \
-	+libgd \
-	$(if $(ICONV_FULL),+libiconv-full) \
-	+libncurses \
-	+libsqlite3 \
-	+libusb-compat \
-	+serdisplib
-#	+libmpdclient \
-#	+libmysqlclient \
-#	+libftdi \
-#	+libX11 \
-#	+python
-  PROVIDES:=lcd4linux
-  VARIANT=full
-endef
-
-define Package/lcd4linux-full/description
-$(call Package/lcd4linux/Default/description)
- .
- This package contains a version of LCD4Linux built with all supported
- drivers and plugins.
-endef
-
-
-CONFIGURE_ARGS+= \
-	--disable-rpath \
-
-EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
-
-ifeq ($(BUILD_VARIANT),custom)
-
-  LCD4LINUX_CUSTOM_DRIVERS:= $(strip $(foreach c, $(LCD4LINUX_DRIVERS), \
-    $(if $(CONFIG_LCD4LINUX_CUSTOM_DRIVER_$(c)),$(c),) \
- ))
-  ifeq ($(LCD4LINUX_CUSTOM_DRIVERS),)
-    LCD4LINUX_CUSTOM_DRIVERS:=Sample
-  endif
-
-  LCD4LINUX_CUSTOM_PLUGINS:= $(strip $(foreach c, $(LCD4LINUX_PLUGINS), \
-    $(if $(CONFIG_LCD4LINUX_CUSTOM_PLUGIN_$(c)),$(c)) \
-  ))
-  ifeq ($(LCD4LINUX_CUSTOM_PLUGINS),)
-    LCD4LINUX_CUSTOM_PLUGINS:=sample
-  endif
-
-  CONFIGURE_ARGS+= \
-	--with-drivers="$(LCD4LINUX_CUSTOM_DRIVERS)" \
-	--with-plugins="$(LCD4LINUX_CUSTOM_PLUGINS)" \
-
-  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libiconv),)
-    CONFIGURE_ARGS+= --with-libiconv-prefix="$(ICONV_PREFIX)"
-  else
-    CONFIGURE_ARGS+= --without-libiconv-prefix
-  endif
-
-  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libmysqlclient),)
-    EXTRA_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql
-  endif
-
-#  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_python),)
-#    CONFIGURE_ARGS+= --with-python
-#  else
-    CONFIGURE_ARGS+= --without-python
-#  endif
-
-#  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libX11),)
-#    CONFIGURE_ARGS+= --with-x
-#  else
-    CONFIGURE_ARGS+= --without-x
-#  endif
-
-endif
-
-ifeq ($(BUILD_VARIANT),full)
-
-  LCD4LINUX_FULL_DRIVERS:= $(strip $(foreach c, $(LCD4LINUX_DRIVERS), \
-    $(c) \
-  ))
-
-  LCD4LINUX_FULL_PLUGINS:= $(strip $(foreach c, $(LCD4LINUX_PLUGINS), \
-    $(c) \
-  ))
-
-  CONFIGURE_ARGS+= \
-	--with-drivers="$(LCD4LINUX_FULL_DRIVERS)" \
-	--with-plugins="$(LCD4LINUX_FULL_PLUGINS)" \
-	--with-libiconv-prefix="$(ICONV_PREFIX)" \
-	--without-python \
-	--without-x \
-
-  EXTRA_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql
-
-endif
-
-
-define Package/lcd4linux/conffiles
-/etc/lcd4linux.conf
-endef
-
-define Package/lcd4linux/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/lcd4linux $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/lcd4linux.conf.sample $(1)/etc/lcd4linux.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/lcd4linux.init $(1)/etc/init.d/lcd4linux
-	$(SED) "s|^\(Display 'GLCD2USB'\)|#\1|g" \
-	    -e "s|^\(Layout 'TestLayer'\)|#\1|g" \
-	    -e "s|^#\(Display 'Image'\)|\1|g" \
-	    -e "s|^#\(Layout 'Default'\)|\1|g" \
-	     $(1)/etc/lcd4linux.conf
-endef
-
-Package/lcd4linux-custom/conffiles = $(Package/lcd4linux/conffiles)
-Package/lcd4linux-custom/install = $(Package/lcd4linux/install)
-
-Package/lcd4linux-full/conffiles = $(Package/lcd4linux/conffiles)
-Package/lcd4linux-full/install = $(Package/lcd4linux/install)
-
-$(eval $(call BuildPackage,lcd4linux-custom))
-$(eval $(call BuildPackage,lcd4linux-full))
--- a/lcd4linux/files/lcd4linux.init
+++ b/lcd4linux/files/lcd4linux.init
@ -1,15 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007-2015 OpenWrt.org
-
-START=98
-
-SERVICE_USE_PID=1
-
-start() {
-	service_start /usr/bin/lcd4linux -o /tmp/lcd4linux.png -q
-}
-
-stop() {
-	service_stop /usr/bin/lcd4linux
-}
-
--- a/lcd4linux/patches/120-remove-as-needed-linker-option.patch
+++ b/lcd4linux/patches/120-remove-as-needed-linker-option.patch
@ -1,11 +0,0 @@
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,7 +18,7 @@ ACLOCAL_AMFLAGS=-I m4
- # use this for lots of warnings
- #AM_CFLAGS = -D_GNU_SOURCE -std=c99 -m64 -Wall -W -pedantic -Wno-variadic-macros -fno-strict-aliasing
- 
-lcd4linux_LDFLAGS ="-Wl,--as-needed"
-+lcd4linux_LDFLAGS = 
- lcd4linux_LDADD   = @DRIVERS@ @PLUGINS@ @DRVLIBS@ @PLUGINLIBS@
- lcd4linux_DEPENDENCIES = @DRIVERS@ @PLUGINS@
- 
--- a/lcd4linux/patches/140-no_repnop_T6963.patch
+++ b/lcd4linux/patches/140-no_repnop_T6963.patch
@ -1,22 +0,0 @@
--- a/drv_T6963.c
-+++ b/drv_T6963.c
-@@ -114,7 +114,9 @@ static void drv_T6_status1(void)
-     /* wait for STA0=1 and STA1=1 */
-     n = 0;
-     do {
-+#if 0
- 	rep_nop();
-+#endif
- 	if (++n > 1000) {
- 	    debug("hang in status1");
- 	    bug = 1;
-@@ -150,7 +152,9 @@ static void drv_T6_status2(void)
-     /* wait for STA3=1 */
-     n = 0;
-     do {
-+#if 0
- 	rep_nop();
-+#endif
- 	if (++n > 1000) {
- 	    debug("hang in status2");
- 	    bug = 1;
--- a/lcd4linux/patches/150-addlibmpdclient.patch
+++ b/lcd4linux/patches/150-addlibmpdclient.patch
--- a/lcd4linux/patches/160-uinput_defs.patch
+++ b/lcd4linux/patches/160-uinput_defs.patch
@ -1,24 +0,0 @@
--- a/drv_G15.c
-+++ b/drv_G15.c
-@@ -42,6 +42,7 @@
- 
- #include <usb.h>
- #include <fcntl.h>
-+#include <linux/version.h>
- #include <linux/input.h>
- #include <linux/uinput.h>
- 
-@@ -269,8 +270,13 @@ void drv_G15_initKeyHandling(char *devic
-     }
-     memset(&device, 0, sizeof(device));
-     strncpy(device.name, "G15 Keys", UINPUT_MAX_NAME_SIZE);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-     device.id.bustype = BUS_USB;
-     device.id.version = 4;
-+#else
-+    device.idbus = BUS_USB;
-+    device.idversion = 4;
-+#endif
- 
-     ioctl(uinput_fd, UI_SET_EVBIT, EV_KEY);
- 
--- a/lcd4linux/patches/170-add-generic-spidev-driver.patch
+++ b/lcd4linux/patches/170-add-generic-spidev-driver.patch
@ -1,195 +0,0 @@
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -71,6 +71,8 @@ drv_generic_i2c.c             \
- drv_generic_i2c.h             \
- drv_generic_keypad.c          \
- drv_generic_keypad.h          \
-+drv_generic_spidev.c          \
-+drv_generic_spidev.h          \
- drv_ASTUSB.c                  \
- drv_BeckmannEgle.c            \
- drv_BWCT.c                    \
--- /dev/null
-+++ b/drv_generic_spidev.c
-@@ -0,0 +1,89 @@
-+/* $Id$
-+ * $URL$
-+ *
-+ * generic driver helper for displays connected via SPI bus
-+ *
-+ * Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ * This file is part of LCD4Linux.
-+ *
-+ * LCD4Linux is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * LCD4Linux is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+#include "config.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+
-+#include "debug.h"
-+#include "qprintf.h"
-+#include "cfg.h"
-+#include "drv_generic_spidev.h"
-+
-+static char *generic_spidev_section = "";
-+static char *generic_spidev_driver = "";
-+static int generic_spidev_fd;
-+
-+int drv_generic_spidev_open(const char *section, const char *driver)
-+{
-+    char *spidev;
-+
-+    udelay_init();
-+
-+    generic_spidev_section = (char *) section;
-+    generic_spidev_driver = (char *) driver;
-+
-+    spidev = cfg_get(generic_spidev_section, "Port", NULL);
-+
-+    info("%s: initializing SPI device %s", generic_spidev_driver, spidev);
-+    generic_spidev_fd = open(spidev, O_WRONLY);
-+    if (generic_spidev_fd < 0) {
-+	error("%s: unable to open SPI device %s!\n", generic_spidev_driver, spidev);
-+	goto exit_error;
-+    }
-+
-+    return 0;
-+
-+  exit_error:
-+    free(spidev);
-+    return -1;
-+}
-+
-+int drv_generic_spidev_close(void)
-+{
-+    close(generic_spidev_fd);
-+    return 0;
-+}
-+
-+int drv_generic_spidev_transfer(const int count, struct spi_ioc_transfer *tr)
-+{
-+    int ret;
-+
-+    ret = ioctl(generic_spidev_fd, SPI_IOC_MESSAGE(count), tr);
-+    if (ret < count) {
-+	error("%s: can't send SPI message! (%s)\n",
-+		generic_spidev_driver, strerror(errno));
-+	return -1;
-+    }
-+
-+    return 0;
-+}
--- /dev/null
-+++ b/drv_generic_spidev.h
-@@ -0,0 +1,54 @@
-+/* $Id$
-+ * $URL$
-+ *
-+ * generic driver helper for displays connected via SPI bus
-+ *
-+ * Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2012 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
-+ *
-+ * This file is part of LCD4Linux.
-+ *
-+ * LCD4Linux is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * LCD4Linux is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+/*
-+ *
-+ * exported fuctions:
-+ *
-+ * int drv_generic_spidev_open (const char *section, const char *driver)
-+ *   reads 'Port' entry from config and opens
-+ *   the SPI device
-+ *   returns 0 if ok, -1 on failure
-+ *
-+ * int drv_generic_spidev_close (void)
-+ *   closes SPI device
-+ *   returns 0 if ok, -1 on failure
-+ *
-+ * void drv_generic_spidev_transfer (int count, struct spi_ioc_transfer *tr)
-+ *   transfer data to/from the SPI device
-+ *
-+ */
-+
-+#ifndef _DRV_GENERIC_SPIDEV_H_
-+#define _DRV_GENERIC_SPIDEV_H_
-+
-+#include <linux/spi/spidev.h>
-+
-+int drv_generic_spidev_open(const char *section, const char *driver);
-+int drv_generic_spidev_close(void);
-+int drv_generic_spidev_transfer(const int count, struct spi_ioc_transfer *tr);
-+
-+#endif /* _DRV_GENERIC_SPIDEV_H_ */
--- a/drivers.m4
-+++ b/drivers.m4
-@@ -301,6 +301,7 @@ PARPORT="no"
- SERIAL="no"
- I2C="no"
- KEYPAD="no"
-+SPIDEV="no"
- 
- # generic libraries
- LIBUSB="no"
-@@ -936,6 +937,12 @@ if test "$LIBJPEG" = "yes"; then
-    DRVLIBS="$DRVLIBS -ljpeg"
- fi
- 
-+# generic spidev driver
-+if test "$SPIDEV" = "yes"; then
-+   DRIVERS="$DRIVERS drv_generic_spidev.o"
-+   AC_DEFINE(WITH_SPIDEV, 1, [SPIDEV driver])
-+fi
-+
- # libusb
- if test "$LIBUSB" = "yes"; then
-    DRVLIBS="$DRVLIBS -lusb"
--- a/configure.ac
-+++ b/configure.ac
-@@ -115,6 +115,9 @@ AC_ARG_WITH(outb,
- 
- AC_CHECK_HEADERS([asm/io.h] [linux/parport.h linux/ppdev.h], [has_parport="true"], [has_parport="false"])
- 
-+# check for spidev
-+AC_CHECK_HEADERS([linux/spi/spidev.h], [has_spidev="true"], [has_spidev="false"])
-+
- # drivers
- sinclude(drivers.m4)
- 
--- a/lcd4linux/patches/173-glcd2usb-bigendian-fix.patch
+++ b/lcd4linux/patches/173-glcd2usb-bigendian-fix.patch
@ -1,20 +0,0 @@
--- a/drv_GLCD2USB.c
-+++ b/drv_GLCD2USB.c
-@@ -48,6 +48,7 @@
- #include <fcntl.h>
- #include <sys/time.h>
- #include <usb.h>
-+#include <endian.h>
- 
- #include "debug.h"
- #include "cfg.h"
-@@ -487,6 +488,9 @@ static int drv_GLCD2USB_start(const char
- 	return -1;
-     }
- 
-+    buffer.display_info.width = le16toh(buffer.display_info.width);
-+    buffer.display_info.height = le16toh(buffer.display_info.height);
-+
-     info("%s: display name = %s", Name, buffer.display_info.name);
-     info("%s: display resolution = %d * %d", Name, buffer.display_info.width, buffer.display_info.height);
-     info("%s: display flags: %x", Name, buffer.display_info.flags);
--- a/libmbim/Makefile
+++ b/libmbim/Makefile
@ -8,28 +8,29 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libmbim
-PKG_VERSION:=1.26.2
+PKG_SOURCE_VERSION:=1.26.2
 PKG_RELEASE:=$(AUTORELEASE)

-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://www.freedesktop.org/software/libmbim
-PKG_HASH:=10c77bf5b5eb8c92ba80e9b519923ad9b898362bc8e1928e2bc9a17eeba649af
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
+PKG_MIRROR_HASH:=47eb6511818271be66336fb67ec97de7925119b09ddbd0ffd06b3f76893a461e

 PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>

 PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1

 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
+include $(INCLUDE_DIR)/meson.mk

-CONFIGURE_ARGS += \
-	--disable-static \
-	--disable-gtk-doc \
-	--disable-gtk-doc-html \
-	--disable-gtk-doc-pdf \
-	--disable-silent-rules \
-	--enable-more-warnings=yes
+TARGET_CFLAGS += -ffunction-sections -fdata-sections -fno-merge-all-constants -fmerge-constants
+TARGET_LDFLAGS += -Wl,--gc-sections
+
+MESON_ARGS += \
+	-Dintrospection=false \
+	-Dman=false \
+	-Dbash_completion=false \
+	-Db_lto=true

 define Package/libmbim
  SECTION:=libs
@ -56,10 +57,6 @@ define Package/mbim-utils
  LICENSE_FILES:=COPYING
 endef

-CONFIGURE_ARGS += \
-	--without-udev \
-	--without-udev-base-dir
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) \
@ -78,11 +75,15 @@ define Build/InstallDev
 endef

 define Package/libmbim/install
-	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) \
+		$(1)/usr/lib \
+		$(1)/usr/libexec
+
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/lib/libmbim*.so.* \
 		$(1)/usr/lib/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/mbim-proxy $(1)/usr/lib/
+
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/mbim-proxy $(1)/usr/libexec/
 endef

 define Package/mbim-utils/install
--- a/libqmi/Config.in
+++ b/libqmi/Config.in
@ -13,4 +13,19 @@ config LIBQMI_WITH_QRTR_GLIB
 	help
 	  Compile libqmi with QRTR support

+choice
+	prompt "Select QMI message collection to build"
+	default LIBQMI_COLLECTION_BASIC
+
+	config LIBQMI_COLLECTION_MINIMAL
+		depends on !MODEMMANAGER_WITH_QMI
+		bool "minimal"
+
+	config LIBQMI_COLLECTION_BASIC
+		bool "basic (default)"
+
+	config LIBQMI_COLLECTION_FULL
+		bool "full"
+endchoice
+
 endmenu
--- a/libqmi/Makefile
+++ b/libqmi/Makefile
@ -8,20 +8,23 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libqmi
-PKG_VERSION:=1.30.4
+PKG_SOURCE_VERSION:=1.30.4
 PKG_RELEASE:=$(AUTORELEASE)

-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://www.freedesktop.org/software/libqmi
-PKG_HASH:=00d7da30a4f8d1185f37cba289cfaf1dfcd04a58f2f76d6acfdf5b85312d6ed6
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
+PKG_MIRROR_HASH:=537eae29c36aba9757afd86e48b91c37c3fe3232037ad11fdd426297f6040a6b

 PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>

 PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1

 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
+include $(INCLUDE_DIR)/meson.mk
+
+TARGET_CFLAGS += -ffunction-sections -fdata-sections -fno-merge-all-constants -fmerge-constants
+TARGET_LDFLAGS += -Wl,--gc-sections

 define Package/libqmi/config
  source "$(SOURCE)/Config.in"
@ -59,28 +62,16 @@ define Package/libqmi-utils/description
  Utils to talk to QMI enabled modems
 endef

-CONFIGURE_ARGS += \
-	--disable-static \
-	--disable-gtk-doc \
-	--disable-gtk-doc-html \
-	--disable-gtk-doc-pdf \
-	--disable-silent-rules \
-	--enable-firmware-update \
-	--enable-more-warnings=yes \
-	--without-udev \
-	--without-udev-base-dir
-
-ifeq ($(CONFIG_LIBQMI_WITH_MBIM_QMUX),y)
-	CONFIGURE_ARGS += --enable-mbim-qmux
-else
-	CONFIGURE_ARGS += --disable-mbim-qmux
-endif
-
-ifeq ($(CONFIG_LIBQMI_WITH_QRTR_GLIB),y)
-	CONFIGURE_ARGS += --enable-qrtr
-else
-	CONFIGURE_ARGS += --disable-qrtr
-endif
+MESON_ARGS += \
+	-Dudev=false \
+	-Dintrospection=false \
+	-Dman=false \
+	-Dbash_completion=false \
+	-Db_lto=true \
+	-Dmbim_qmux=$(if $(CONFIG_LIBQMI_WITH_MBIM_QMUX),true,false) \
+	-Dqrtr=$(if $(CONFIG_LIBQMI_WITH_QRTR_GLIB),true,false) \
+	-Dcollection=$(if $(CONFIG_LIBQMI_COLLECTION_MINIMAL),minimal\
+		    ,$(if $(CONFIG_LIBQMI_COLLECTION_BASIC),basic,full))

 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
@ -100,12 +91,15 @@ define Build/InstallDev
 endef

 define Package/libqmi/install
-	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) \
+		$(1)/usr/lib \
+		$(1)/usr/libexec
+
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/lib/libqmi*.so.* \
 		$(1)/usr/lib/

-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/qmi-proxy $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/qmi-proxy $(1)/usr/libexec/
 endef

 define Package/qmi-utils/install
--- a/modemmanager/Config.in
+++ b/modemmanager/Config.in
@ -13,9 +13,18 @@ depends on PACKAGE_modemmanager
 	help
 	  Compile ModemManager with QMI support

+config MODEMMANAGER_WITH_QRTR
+	bool "Include QRTR support"
+	default y
+	depends on MODEMMANAGER_WITH_QMI
+	select LIBQMI_WITH_QRTR_GLIB
+	help
+	  Compile ModemManager with QRTR support
+
 config MODEMMANAGER_WITH_AT_COMMAND_VIA_DBUS
 	bool "Allow AT commands via DBus"
 	default n
 	help
 	  Compile ModemManager allowing AT commands without debug flag
+
 endmenu
--- a/modemmanager/Makefile
+++ b/modemmanager/Makefile
@ -8,23 +8,26 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=modemmanager
-PKG_VERSION:=1.18.6
-PKG_RELEASE:=1
+PKG_SOURCE_VERSION:=1.18.6
+PKG_RELEASE:=$(AUTORELEASE)

-PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager
-PKG_HASH:=d4f804b31cf504239c5f1d4973c62095c00cba1ee9abb503718dac6d146a470a
-PKG_BUILD_DIR:=$(BUILD_DIR)/ModemManager-$(PKG_VERSION)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
+PKG_MIRROR_HASH:=72f1a865153745d05c482ed3a77f2045d24387f1f9a37177fe7bc35ab7663765

-PKG_MAINTAINER:=Nicholas Smith <nicholas.smith@telcoantennas.com.au>
+PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING

 PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
+PKG_BUILD_DEPENDS:=glib2/host libxslt/host

 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
+include $(INCLUDE_DIR)/meson.mk
+
+TARGET_CFLAGS += -ffunction-sections -fdata-sections -fno-merge-all-constants -fmerge-constants
+TARGET_LDFLAGS += -Wl,--gc-sections

 define Package/modemmanager/config
  source "$(SOURCE)/Config.in"
@ -41,7 +44,8 @@ define Package/modemmanager
 	+dbus \
 	+ppp \
 	+MODEMMANAGER_WITH_MBIM:libmbim \
-	+MODEMMANAGER_WITH_QMI:libqmi
+	+MODEMMANAGER_WITH_QMI:libqmi \
+	+MODEMMANAGER_WITH_QRTR:libqrtr-glib
 endef

 define Package/modemmanager/description
@ -50,35 +54,21 @@ define Package/modemmanager/description
  Select Utilities/usb-modeswitch if needed.
 endef

-CONFIGURE_ARGS += \
-	--without-polkit \
-	--without-udev \
-	--without-systemdsystemunitdir \
-	--disable-rpath \
-	--disable-gtk-doc
-
-ifeq ($(CONFIG_MODEMMANAGER_WITH_AT_COMMAND_VIA_DBUS),y)
-  CONFIGURE_ARGS += --with-at-command-via-dbus
-endif
-
-ifdef CONFIG_MODEMMANAGER_WITH_MBIM
-  CONFIGURE_ARGS += --with-mbim
-else
-  CONFIGURE_ARGS += --without-mbim
-endif
-
-ifdef CONFIG_MODEMMANAGER_WITH_QMI
-  CONFIGURE_ARGS += --with-qmi
-else
-  CONFIGURE_ARGS += --without-qmi
-endif
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	( cd "$(PKG_BUILD_DIR)"; \
-		printf "all:\ninstall:\n" >po/Makefile.in.in; \
-	)
-endef
+MESON_ARGS += \
+	-Dudev=false \
+	-Dudevdir=/lib/udev \
+	-Dsystemdsystemunitdir=no \
+	-Dsystemd_suspend_resume=false \
+	-Dsystemd_journal=false \
+	-Dpolkit=no \
+	-Dintrospection=false \
+	-Dman=false \
+	-Dbash_completion=false \
+	-Db_lto=true \
+	-Dmbim=$(if $(CONFIG_MODEMMANAGER_WITH_MBIM),true,false) \
+	-Dqmi=$(if $(CONFIG_MODEMMANAGER_WITH_QMI),true,false) \
+	-Dqrtr=$(if $(CONFIG_MODEMMANAGER_WITH_QRTR),true,false) \
+	-Dat_command_via_dbus=$(if $(CONFIG_MODEMMANAGER_WITH_AT_COMMAND_VIA_DBUS),true,false)

 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/ModemManager
--- a/modemmanager/files/modemmanager.common
+++ b/modemmanager/files/modemmanager.common
@ -20,7 +20,8 @@ MODEMMANAGER_EVENTS_CACHE="${MODEMMANAGER_RUNDIR}/events.cache"
 # Common logging

 mm_log() {
-	[ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && logger -t "ModemManager" "hotplug: $*"
+	local level="$1"; shift
+	logger -p "daemon.${level}" -t "ModemManager[$$]" "hotplug: $*"
 }

 ################################################################################
@ -39,7 +40,7 @@ mm_find_physdev_sysfs_path() {
 		# avoid infinite loops iterating
 		[ -z "${tmp_path}" ] || [ "${tmp_path}" = "/" ] && return

-		# for USB devices, the physical device will be that with a idVendor
+		# For USB devices, the physical device will be that with a idVendor
 		# and idProduct pair of files
 		[ -f "${tmp_path}"/idVendor ] && [ -f "${tmp_path}"/idProduct ] && {
 			tmp_path=$(readlink -f "$tmp_path")
@ -169,7 +170,7 @@ mm_wait_for_modem() {

 	while [ $n -ge 0 ]; do
 		[ -d "${sysfspath}" ] || {
-			mm_log "error: ignoring modem detection request: no device at ${sysfspath}"
+			mm_log "error" "ignoring modem detection request: no device at ${sysfspath}"
 			proto_set_available "${cfg}" 0
 			return 1
 		}
@ -177,10 +178,10 @@ mm_wait_for_modem() {
 		# Check if the modem exists at the given sysfs path
 		if ! mmcli -m "${sysfspath}" > /dev/null 2>&1
 		then
-			mm_log "error: modem not detected at sysfs path"
+			mm_log "error" "modem not detected at sysfs path"
 		else
-			mm_log "modem exported successfully at ${sysfspath}"
-			mm_log "setting interface '${cfg}' as available"
+			mm_log "info" "modem exported successfully at ${sysfspath}"
+			mm_log "info" "setting interface '${cfg}' as available"
 			proto_set_available "${cfg}" 1
 			return 0
 		fi
@ -189,7 +190,7 @@ mm_wait_for_modem() {
 		n=$((n-step))
 	done

-	mm_log "error: timed out waiting for the modem to get exported at ${sysfspath}"
+	mm_log "error" "timed out waiting for the modem to get exported at ${sysfspath}"
 	proto_set_available "${cfg}" 0
 	return 2
 }
@ -201,7 +202,7 @@ mm_report_modem_wait() {

 	parent_sysfspath=$(mm_find_physdev_sysfs_path "$sysfspath")
 	[ -n "${parent_sysfspath}" ] || {
-		mm_log "error: parent device sysfspath not found"
+		mm_log "error" "parent device sysfspath not found"
 		return
 	}

@ -212,23 +213,23 @@ mm_report_modem_wait() {

 			cfg=$(mm_get_modem_config "${parent_sysfspath}")
 			if [ -n "${cfg}" ]; then
-				mm_log "interface '${cfg}' is set to configure device '${parent_sysfspath}'"
-				mm_log "now waiting for modem at sysfs path ${parent_sysfspath}"
+				mm_log "info" "interface '${cfg}' is set to configure device '${parent_sysfspath}'"
+				mm_log "info" "now waiting for modem at sysfs path ${parent_sysfspath}"
 				mm_set_modem_wait_status "${parent_sysfspath}" "processed"
 				# Launch subshell for the explicit wait
 				( mm_wait_for_modem "${cfg}" "${parent_sysfspath}" ) > /dev/null 2>&1 &
 			else
-				mm_log "no need to wait for modem at sysfs path ${parent_sysfspath}"
+				mm_log "info" "no need to wait for modem at sysfs path ${parent_sysfspath}"
 				mm_set_modem_wait_status "${parent_sysfspath}" "ignored"
 			fi
 			;;
 		"processed")
-			mm_log "already waiting for modem at sysfs path ${parent_sysfspath}"
+			mm_log "info" "already waiting for modem at sysfs path ${parent_sysfspath}"
 			;;
 		"ignored")
 			;;
 		*)
-			mm_log "error: unknown status read for device at sysfs path ${parent_sysfspath}"
+			mm_log "error" "unknown status read for device at sysfs path ${parent_sysfspath}"
 			;;
 	esac
 }
@ -258,7 +259,7 @@ mm_cleanup_interface_by_sysfspath() {
 	cfg=$(mm_get_modem_config "$dev")
 	[ -n "${cfg}" ] || return

-	mm_log "setting interface '$cfg' as unavailable"
+	mm_log "info" "setting interface '$cfg' as unavailable"
 	proto_set_available "${cfg}" 0
 }

@ -286,7 +287,7 @@ mm_report_event() {
 	esac

 	# Report the event
-	mm_log "event reported: action=${action}, name=${name}, subsystem=${subsystem}"
+	mm_log "debug" "event reported: action=${action}, name=${name}, subsystem=${subsystem}"
 	mmcli --report-kernel-event="action=${action},name=${name},subsystem=${subsystem}" 1>/dev/null 2>&1 &

 	# Wait for added modem if a sysfspath is given
@ -302,7 +303,7 @@ mm_report_event_from_cache_line() {
 	subsystem=$(echo "${event_line}" | awk -F ',' '{ print $3 }')
 	sysfspath=$(echo "${event_line}" | awk -F ',' '{ print $4 }')

-	mm_log "cached event found: action=${action}, name=${name}, subsystem=${subsystem}, sysfspath=${sysfspath}"
+	mm_log "debug" "cached event found: action=${action}, name=${name}, subsystem=${subsystem}, sysfspath=${sysfspath}"
 	mm_report_event "${action}" "${name}" "${subsystem}" "${sysfspath}"
 }

@ -317,11 +318,11 @@ mm_report_events_from_cache() {
 	# Wait for ModemManager to be available in the bus
 	while [ $n -ge 0 ]; do
 		sleep $step
-		mm_log "checking if ModemManager is available..."
+		mm_log "info" "checking if ModemManager is available..."

 		if ! mmcli -L >/dev/null 2>&1
 		then
-			mm_log "ModemManager not yet available"
+			mm_log "info" "ModemManager not yet available"
 		else
 			mmrunning=1
 			break
@ -330,7 +331,7 @@ mm_report_events_from_cache() {
 	done

 	[ ${mmrunning} -eq 1 ] || {
-		mm_log "error: couldn't report initial kernel events: ModemManager not running"
+		mm_log "error" "couldn't report initial kernel events: ModemManager not running"
 		return
 	}

--- a/modemmanager/files/modemmanager.init
+++ b/modemmanager/files/modemmanager.init
@ -4,6 +4,8 @@
 USE_PROCD=1
 START=70

+LOG_LEVEL="INFO"
+
 stop_service() {
 	# Load common utils
 	. /usr/share/ModemManager/modemmanager.common
@ -28,6 +30,8 @@ start_service() {
 	. /usr/share/ModemManager/modemmanager.common
 	procd_open_instance
 	procd_set_param command /usr/sbin/ModemManager-wrapper
+	procd_append_param command --log-level="$LOG_LEVEL"
+	[ "$LOG_LEVEL" = "DEBUG" ] && procd_append_param command --debug
 	procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
 	procd_set_param pidfile "${MODEMMANAGER_PID_FILE}"
 	procd_close_instance
--- a/modemmanager/files/modemmanager.proto
+++ b/modemmanager/files/modemmanager.proto
@ -197,7 +197,6 @@ modemmanager_connected_method_dhcp_ipv4() {
 	local interface="$1"
 	local wwan="$2"
 	local metric="$3"
-	local defaultroute="$4"

 	proto_init_update "${wwan}" 1
 	proto_set_keep 1
@ -223,7 +222,6 @@ modemmanager_connected_method_static_ipv4() {
 	local dns1="$7"
 	local dns2="$8"
 	local metric="$9"
-	local defaultroute="$10"

 	local mask=""

@ -244,9 +242,8 @@ modemmanager_connected_method_static_ipv4() {
 	proto_set_keep 1
 	echo "adding IPv4 address ${address}, netmask ${mask}"
 	proto_add_ipv4_address "${address}" "${mask}"
-	[ -n "${gateway}" ] && [ "${defaultroute}" != 0 ] && {
+	[ -n "${gateway}" ] && {
 		echo "adding default IPv4 route via ${gateway}"
-		logger -t "modemmanager.proto" "adding default IPv4 route via ${gateway} ${address}"
 		proto_add_ipv4_route "0.0.0.0" "0" "${gateway}" "${address}"
 	}
 	[ -n "${dns1}" ] && {
@ -265,7 +262,6 @@ modemmanager_connected_method_dhcp_ipv6() {
 	local interface="$1"
 	local wwan="$2"
 	local metric="$3"
-	local defaultroute="$4"

 	proto_init_update "${wwan}" 1
 	proto_set_keep 1
@ -292,7 +288,6 @@ modemmanager_connected_method_static_ipv6() {
 	local dns1="$7"
 	local dns2="$8"
 	local metric="$9"
-	local defaultroute="$10"

 	[ -n "${address}" ] || {
 		proto_notify_error "${interface}" ADDRESS_MISSING
@ -311,7 +306,7 @@ modemmanager_connected_method_static_ipv6() {
 	echo "adding IPv6 address ${address}, prefix ${prefix}"
 	proto_add_ipv6_address "${address}" "128"
 	proto_add_ipv6_prefix "${address}/${prefix}"
-	[ -n "${gateway}" ] && [ "$defaultroute" != 0 ] && {
+	[ -n "${gateway}" ] && {
 		echo "adding default IPv6 route via ${gateway}"
 		proto_add_ipv6_route "${gateway}" "128"
 		proto_add_ipv6_route "::0" "0" "${gateway}" "" "" "${address}/${prefix}"
@ -362,9 +357,9 @@ proto_modemmanager_setup() {

 	local device apn allowedauth username password pincode iptype metric signalrate

-	local address prefix gateway mtu dns1 dns2 defaultroute
+	local address prefix gateway mtu dns1 dns2

-	json_get_vars device apn allowedauth username password pincode iptype metric signalrate defaultroute
+	json_get_vars device apn allowedauth username password pincode iptype metric signalrate

 	# validate sysfs path given in config
 	[ -n "${device}" ] || {
@ -452,7 +447,7 @@ proto_modemmanager_setup() {
 		echo "IPv4 connection setup required in interface ${interface}: ${bearermethod_ipv4}"
 		case "${bearermethod_ipv4}" in
 		"dhcp")
-			modemmanager_connected_method_dhcp_ipv4 "${interface}" "${beareriface}" "${metric}" "${defaultroute}"
+			modemmanager_connected_method_dhcp_ipv4 "${interface}" "${beareriface}" "${metric}"
 			;;
 		"static")
 			address=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.address")
@ -461,7 +456,7 @@ proto_modemmanager_setup() {
 			mtu=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.mtu")
 			dns1=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.dns.value\[1\]")
 			dns2=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.dns.value\[2\]")
-			modemmanager_connected_method_static_ipv4 "${interface}" "${beareriface}" "${address}" "${prefix}" "${gateway}" "${mtu}" "${dns1}" "${dns2}" "${metric}" "${defaultroute}"
+			modemmanager_connected_method_static_ipv4 "${interface}" "${beareriface}" "${address}" "${prefix}" "${gateway}" "${mtu}" "${dns1}" "${dns2}" "${metric}"
 			;;
 		"ppp")
 			modemmanager_connected_method_ppp_ipv4 "${interface}" "${beareriface}" "${username}" "${password}" "${allowedauth}"
@ -479,7 +474,7 @@ proto_modemmanager_setup() {
 		echo "IPv6 connection setup required in interface ${interface}: ${bearermethod_ipv6}"
 		case "${bearermethod_ipv6}" in
 		"dhcp")
-			modemmanager_connected_method_dhcp_ipv6 "${interface}" "${beareriface}" "${metric}" "${defaultroute}"
+			modemmanager_connected_method_dhcp_ipv6 "${interface}" "${beareriface}" "${metric}"
 			;;
 		"static")
 			address=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.address")
@ -488,7 +483,7 @@ proto_modemmanager_setup() {
 			mtu=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.mtu")
 			dns1=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.dns.value\[1\]")
 			dns2=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv6-config.dns.value\[2\]")
-			modemmanager_connected_method_static_ipv6 "${interface}" "${beareriface}" "${address}" "${prefix}" "${gateway}" "${mtu}" "${dns1}" "${dns2}" "${metric}" "${defaultroute}"
+			modemmanager_connected_method_static_ipv6 "${interface}" "${beareriface}" "${address}" "${prefix}" "${gateway}" "${mtu}" "${dns1}" "${dns2}" "${metric}"
 			;;
 		"ppp")
 			proto_notify_error "${interface}" "unsupported method"
--- a/modemmanager/files/usr/sbin/ModemManager-wrapper
+++ b/modemmanager/files/usr/sbin/ModemManager-wrapper
--- a/modemmanager/patches/001-plugins-Fix-port-enums-includes.patch
+++ b/modemmanager/patches/001-plugins-Fix-port-enums-includes.patch
@ -0,0 +1,88 @@
+--- a/plugins/broadmobi/mm-plugin-broadmobi.c
+++ b/plugins/broadmobi/mm-plugin-broadmobi.c
+@@ -19,7 +19,6 @@
+ #define _LIBMM_INSIDE_MM
+ #include <libmm-glib.h>
+ 
+-#include "mm-port-enums-types.h"
+ #include "mm-log-object.h"
+ #include "mm-plugin-broadmobi.h"
+ #include "mm-broadband-modem.h"
+--- a/plugins/dlink/mm-plugin-dlink.c
+++ b/plugins/dlink/mm-plugin-dlink.c
+@@ -19,7 +19,6 @@
+ #define _LIBMM_INSIDE_MM
+ #include <libmm-glib.h>
+ 
+-#include "mm-port-enums-types.h"
+ #include "mm-log-object.h"
+ #include "mm-plugin-dlink.h"
+ #include "mm-broadband-modem.h"
+--- a/plugins/meson.build
+++ b/plugins/meson.build
+@@ -461,7 +461,7 @@ if plugins_options['huawei']
+   plugins += {'plugin-huawei': {
+     'plugin': true,
+     'helper': {'sources': files('huawei/mm-modem-helpers-huawei.c'), 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
+-    'module': {'sources': sources + enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
+    'module': {'sources': sources + enums_sources + port_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
+     'test': {'sources': files('huawei/tests/test-modem-helpers-huawei.c') + enums_sources, 'include_directories': huawei_inc, 'dependencies': libhelpers_dep},
+   }}
+ 
+--- a/plugins/telit/mm-plugin-telit.c
+++ b/plugins/telit/mm-plugin-telit.c
+@@ -21,7 +21,6 @@
+ #define _LIBMM_INSIDE_MM
+ #include <libmm-glib.h>
+ 
+-#include "mm-port-enums-types.h"
+ #include "mm-log-object.h"
+ #include "mm-modem-helpers.h"
+ #include "mm-plugin-telit.h"
+--- a/plugins/tplink/mm-plugin-tplink.c
+++ b/plugins/tplink/mm-plugin-tplink.c
+@@ -19,7 +19,6 @@
+ #define _LIBMM_INSIDE_MM
+ #include <libmm-glib.h>
+ 
+-#include "mm-port-enums-types.h"
+ #include "mm-log-object.h"
+ #include "mm-plugin-tplink.h"
+ #include "mm-broadband-modem.h"
+--- a/src/meson.build
+++ b/src/meson.build
+@@ -147,15 +147,15 @@ endif
+ 
+ enums_types = 'mm-port-enums-types'
+ 
+-enums_sources = []
+-enums_sources += gnome.mkenums(
+port_enums_sources = []
+port_enums_sources += gnome.mkenums(
+   enums_types + '.c',
+   sources: headers,
+   c_template: build_aux_dir / enums_types + '.c.template',
+   fhead: '#include "mm-port-enums-types.h"',
+ )
+ 
+-enums_sources += gnome.mkenums(
+port_enums_sources += gnome.mkenums(
+   enums_types + '.h',
+   sources: headers,
+   h_template: build_aux_dir / enums_types + '.h.template',
+@@ -165,13 +165,13 @@ enums_sources += gnome.mkenums(
+ 
+ libport = static_library(
+   'port',
+-  sources: sources + enums_sources,
+  sources: sources + port_enums_sources,
+   include_directories: top_inc,
+   dependencies: deps + private_deps,
+ )
+ 
+ libport_dep = declare_dependency(
+-  sources: enums_sources[1],
+  sources: port_enums_sources[1],
+   include_directories: '.',
+   dependencies: deps,
+   link_with: libport,
--- a/modemmanager/patches/002-build-meson-Fix-daemon-enums-dependencies.patch
+++ b/modemmanager/patches/002-build-meson-Fix-daemon-enums-dependencies.patch
@ -0,0 +1,96 @@
+--- a/plugins/meson.build
+++ b/plugins/meson.build
+@@ -88,7 +88,7 @@ if plugins_shared['icera']
+   plugins += {'shared-icera': {
+     'plugin': false,
+     'helper': {'sources': files('icera/mm-modem-helpers-icera.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
+-    'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args},
+    'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': common_c_args},
+     'test': {'sources': files('icera/tests/test-modem-helpers-icera.c'), 'include_directories': plugins_incs + [icera_inc], 'dependencies': libhelpers_dep},
+   }}
+ endif
+@@ -185,7 +185,7 @@ if plugins_shared['telit']
+   plugins += {'shared-telit': {
+     'plugin': false,
+     'helper': {'sources': files('telit/mm-modem-helpers-telit.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
+-    'module': {'sources': sources, 'include_directories': plugins_incs + [telit_inc], 'c_args': common_c_args},
+    'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs + [telit_inc], 'c_args': common_c_args},
+     'test': {'sources': files('telit/tests/test-mm-modem-helpers-telit.c'), 'include_directories': telit_inc, 'dependencies': libmm_test_common_dep},
+   }}
+ endif
+@@ -285,7 +285,7 @@ if plugins_options['cinterion']
+   plugins += {'plugin-cinterion': {
+     'plugin': true,
+     'helper': {'sources': files('cinterion/mm-modem-helpers-cinterion.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
+-    'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args},
+    'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': common_c_args},
+     'test': {'sources': files('cinterion/tests/test-modem-helpers-cinterion.c'), 'include_directories': plugins_incs + [include_directories('cinterion')], 'dependencies': libport_dep},
+   }}
+ 
+@@ -460,8 +460,8 @@ if plugins_options['huawei']
+ 
+   plugins += {'plugin-huawei': {
+     'plugin': true,
+-    'helper': {'sources': files('huawei/mm-modem-helpers-huawei.c'), 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
+-    'module': {'sources': sources + enums_sources + port_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
+    'helper': {'sources': files('huawei/mm-modem-helpers-huawei.c') + daemon_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
+    'module': {'sources': sources + enums_sources + port_enums_sources + daemon_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
+     'test': {'sources': files('huawei/tests/test-modem-helpers-huawei.c') + enums_sources, 'include_directories': huawei_inc, 'dependencies': libhelpers_dep},
+   }}
+ 
+@@ -534,7 +534,7 @@ if plugins_options['mbm']
+   plugins += {'plugin-ericsson-mbm': {
+     'plugin': true,
+     'helper': {'sources': files('mbm/mm-modem-helpers-mbm.c'), 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="ericsson-mbm"']},
+-    'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="ericsson-mbm"']},
+    'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="ericsson-mbm"']},
+     'test': {'sources': files('mbm/tests/test-modem-helpers-mbm.c'), 'include_directories': plugins_incs + [include_directories('mbm')], 'dependencies': libhelpers_dep},
+   }}
+ 
+@@ -644,7 +644,7 @@ if plugins_options['option-hso']
+ 
+   plugins += {'plugin-option-hso': {
+     'plugin': true,
+-    'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': '-DMM_MODULE_NAME="option-hso"'},
+    'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': '-DMM_MODULE_NAME="option-hso"'},
+   }}
+ endif
+ 
+@@ -852,7 +852,7 @@ if plugins_options['ublox']
+   plugins += {'plugin-ublox': {
+     'plugin': true,
+     'helper': {'sources': files('ublox/mm-modem-helpers-ublox.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
+-    'module': {'sources': sources, 'include_directories': plugins_incs + [ublox_inc], 'c_args': common_c_args},
+    'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs + [ublox_inc], 'c_args': common_c_args},
+     'test': {'sources': files('ublox/tests/test-modem-helpers-ublox.c'), 'include_directories': ublox_inc, 'dependencies': libmm_test_common_dep},
+   }}
+ 
+--- a/src/meson.build
+++ b/src/meson.build
+@@ -225,14 +225,15 @@ sources = files(
+ 
+ enums_types = 'mm-daemon-enums-types'
+ 
+-sources += gnome.mkenums(
+daemon_enums_sources = []
+daemon_enums_sources += gnome.mkenums(
+   enums_types + '.c',
+   sources: headers,
+   c_template: build_aux_dir / enums_types + '.c.template',
+   fhead: '#include "mm-daemon-enums-types.h"',
+ )
+ 
+-sources += gnome.mkenums(
+daemon_enums_sources += gnome.mkenums(
+   enums_types + '.h',
+   sources: headers,
+   h_template: build_aux_dir / enums_types + '.h.template',
+@@ -296,7 +297,7 @@ endif
+ 
+ executable(
+   'ModemManager',
+-  sources: sources,
+  sources: sources + daemon_enums_sources,
+   include_directories: top_inc,
+   dependencies: deps,
+   c_args: c_args,
--- a/xtables-addons/Makefile
+++ b/xtables-addons/Makefile
@ -0,0 +1,200 @@
+#
+# Copyright (C) 2009-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=xtables-addons
+PKG_VERSION:=3.19
+PKG_RELEASE:=$(AUTORELEASE)
+PKG_HASH:=5e36ea027ab15a84d9af1f3f8e84a78b80a617093657f08089bd44657722f661
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=https://inai.de/files/xtables-addons/
+PKG_BUILD_DEPENDS:=iptables
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
+PKG_LICENSE:=GPL-2.0
+
+PKG_FIXUP:=autoreconf
+PKG_ASLR_PIE:=0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/xtables-addons
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Firewall
+  TITLE:=Extensions not distributed in the main Xtables
+  URL:=https://inai.de/projects/xtables-addons/
+endef
+
+# uses GNU configure
+
+CONFIGURE_ARGS+= \
+	--with-kbuild="$(LINUX_DIR)" \
+	--with-xtlibdir="/usr/lib/iptables"
+
+ifdef CONFIG_EXTERNAL_TOOLCHAIN
+MAKE_FLAGS:= \
+	$(patsubst ARCH=%,ARCH=$(LINUX_KARCH),$(MAKE_FLAGS)) \
+	DEPMOD="/bin/true"
+
+MAKE_INSTALL_FLAGS:= \
+	$(patsubst ARCH=%,ARCH=$(LINUX_KARCH),$(MAKE_FLAGS)) \
+	DEPMOD="/bin/true"
+else
+define Build/Compile
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		$(KERNEL_MAKE_FLAGS) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		DEPMOD="/bin/true" \
+		all
+endef
+
+define Build/Install
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(KERNEL_MAKE_FLAGS) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		DEPMOD="/bin/true" \
+		install
+endef
+endif
+
+# 1: extension/module suffix used in package name
+# 2: extension/module display name used in package title/description
+# 3: list of extensions to package
+# 4: list of modules to package
+# 5: module load priority
+# 6: module depends
+define BuildTemplate
+
+ ifneq ($(3),)
+  define Package/iptables-mod-$(1)
+    $$(call Package/xtables-addons)
+    CATEGORY:=Network
+    TITLE:=$(2) iptables extension
+    DEPENDS:=iptables $(if $(4),+kmod-ipt-$(1))
+  endef
+
+  define Package/iptables-mod-$(1)/install
+	$(INSTALL_DIR) $$(1)/usr/lib/iptables
+	for m in $(3); do \
+		$(CP) \
+			$(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so \
+			$$(1)/usr/lib/iptables/ ; \
+	done
+  endef
+
+  $$(eval $$(call BuildPackage,iptables-mod-$(1)))
+ endif
+
+ ifneq ($(4),)
+  define KernelPackage/ipt-$(1)
+    SUBMENU:=Netfilter Extensions
+    TITLE:=$(2) netfilter module
+    DEPENDS:=+kmod-ipt-core $(5)
+    FILES:=$(foreach mod,$(4),$(PKG_BUILD_DIR)/extensions/$(mod).$(LINUX_KMOD_SUFFIX))
+    AUTOLOAD:=$(call AutoProbe,$(notdir $(4)))
+  endef
+
+  $$(eval $$(call KernelPackage,ipt-$(1)))
+ endif
+
+endef
+
+
+define Package/iptaccount
+  $(call Package/xtables-addons)
+  CATEGORY:=Network
+  TITLE:=iptables-mod-account control utility
+  DEPENDS:=iptables +iptables-mod-account
+endef
+
+define Package/iptaccount/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libxt_ACCOUNT_cl.so* \
+		$(1)/usr/lib/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/sbin/iptaccount \
+		$(1)/usr/sbin/
+endef
+
+
+define Package/iptgeoip
+  $(call Package/xtables-addons)
+  CATEGORY:=Network
+  TITLE:=iptables-mod-geoip support scripts for MaxMind GeoIP databases
+  DEPENDS:=iptables +iptables-mod-geoip \
+		+perl +perlbase-getopt +perlbase-io +perl-text-csv_xs \
+		+perl-net-cidr-lite \
+		+wget-ssl +!BUSYBOX_CONFIG_ZCAT:gzip
+endef
+
+define Package/iptgeoip/config
+	menu "Select iptgeoip options"
+		config IPTGEOIP_PRESERVE
+			bool "Preserve across sysupgrades"
+			default n
+			help
+			  Backup and restore during sysupgrade (requires >7MB)
+	endmenu
+endef
+
+ifeq ($(CONFIG_IPTGEOIP_PRESERVE),y)
+define Package/iptgeoip/conffiles
+/usr/share/xt_geoip/
+endef
+endif
+
+define Package/iptgeoip/install
+	$(INSTALL_DIR) $(1)/usr/lib/xtables-addons
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/xtables-addons/xt_geoip_{build,dl} \
+		$(1)/usr/lib/xtables-addons/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/bin/xt_geoip_query \
+		$(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/share/xt_geoip
+	touch $(1)/usr/share/xt_geoip/.keep
+endef
+
+
+#$(eval $(call BuildTemplate,SUFFIX,DESCRIPTION,EXTENSION,MODULE,PRIORITY,DEPENDS))
+
+$(eval $(call BuildTemplate,compat-xtables,API compatibilty layer,,compat_xtables,+IPV6:kmod-ip6tables))
+$(eval $(call BuildTemplate,nathelper-rtsp,RTSP Conntrack and NAT,,rtsp/nf_conntrack_rtsp rtsp/nf_nat_rtsp,+kmod-ipt-conntrack-extra +kmod-ipt-nat))
+
+$(eval $(call BuildTemplate,account,ACCOUNT,xt_ACCOUNT,ACCOUNT/xt_ACCOUNT,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,chaos,CHAOS,xt_CHAOS,xt_CHAOS,+kmod-ipt-compat-xtables +kmod-ipt-delude +kmod-ipt-tarpit))
+$(eval $(call BuildTemplate,condition,Condition,xt_condition,xt_condition,))
+$(eval $(call BuildTemplate,delude,DELUDE,xt_DELUDE,xt_DELUDE,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,dhcpmac,DHCPMAC,xt_DHCPMAC,xt_DHCPMAC,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,dnetmap,DNETMAP,xt_DNETMAP,xt_DNETMAP,+kmod-ipt-compat-xtables +kmod-ipt-nat))
+$(eval $(call BuildTemplate,fuzzy,fuzzy,xt_fuzzy,xt_fuzzy,))
+$(eval $(call BuildTemplate,geoip,geoip,xt_geoip,xt_geoip,))
+$(eval $(call BuildTemplate,iface,iface,xt_iface,xt_iface,))
+$(eval $(call BuildTemplate,ipmark,IPMARK,xt_IPMARK,xt_IPMARK,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,ipp2p,IPP2P,xt_ipp2p,xt_ipp2p,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,ipv4options,ipv4options,xt_ipv4options,xt_ipv4options,))
+$(eval $(call BuildTemplate,length2,length2,xt_length2,xt_length2,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,logmark,LOGMARK,xt_LOGMARK,xt_LOGMARK,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,lscan,lscan,xt_lscan,xt_lscan,))
+$(eval $(call BuildTemplate,lua,Lua PacketScript,xt_LUA,LUA/xt_LUA,+kmod-ipt-conntrack-extra))
+$(eval $(call BuildTemplate,proto,PROTO,xt_PROTO,xt_PROTO,))
+$(eval $(call BuildTemplate,psd,psd,xt_psd,xt_psd,))
+$(eval $(call BuildTemplate,quota2,quota2,xt_quota2,xt_quota2,))
+$(eval $(call BuildTemplate,sysrq,SYSRQ,xt_SYSRQ,xt_SYSRQ,+kmod-ipt-compat-xtables +kmod-crypto-hash))
+$(eval $(call BuildTemplate,tarpit,TARPIT,xt_TARPIT,xt_TARPIT,+kmod-ipt-compat-xtables))
+
+$(eval $(call BuildPackage,iptaccount))
+$(eval $(call BuildPackage,iptgeoip))
--- a/xtables-addons/patches/001-fix-kernel-version-detection.patch
+++ b/xtables-addons/patches/001-fix-kernel-version-detection.patch
@ -0,0 +1,11 @@
+--- a/configure.ac
+++ b/configure.ac
+@@ -42,7 +42,7 @@ regular_CFLAGS="-Wall -Waggregate-return
+ 
+ AS_IF([test -n "$kbuilddir"], [
+ 	AC_MSG_CHECKING([kernel version that we will build against])
+-	krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')"
+	krel="$(make -sC "$kbuilddir" M=$PWD kernelversion | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')"
+ 	save_IFS="$IFS"
+ 	IFS='.'
+ 	set x $krel
--- a/xtables-addons/patches/100-add-rtsp-conntrack.patch
+++ b/xtables-addons/patches/100-add-rtsp-conntrack.patch
--- a/xtables-addons/patches/200-add-lua-packetscript.patch
+++ b/xtables-addons/patches/200-add-lua-packetscript.patch
--- a/xtables-addons/patches/201-fix-lua-packetscript.patch
+++ b/xtables-addons/patches/201-fix-lua-packetscript.patch
@ -0,0 +1,136 @@
+--- a/extensions/LUA/xt_LUA_target.c
+++ b/extensions/LUA/xt_LUA_target.c
+@@ -19,7 +19,7 @@
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+ #include <linux/module.h>
+-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
+ #include <net/ip.h>
+ #include <linux/netfilter/x_tables.h>
+ #include "xt_LUA.h"
+@@ -64,10 +64,10 @@ uint32_t  lua_state_refs[LUA_STATE_ARRAY
+  * XT_CONTINUE inside the *register_lua_packet_lib* function.
+  */
+ 
+-spinlock_t lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(lock);
+ 
+ static uint32_t 
+-lua_tg(struct sk_buff *pskb, const struct xt_target_param *par)
+lua_tg(struct sk_buff *pskb, const struct xt_action_param *par)
+ {
+ 	uint32_t  verdict;
+ 	lua_packet_segment *p;
+@@ -79,7 +79,7 @@ lua_tg(struct sk_buff *pskb, const struc
+ 
+ 	L = lua_envs[info->state_id]->L;
+ 
+-	if (!skb_make_writable(pskb, pskb->len))
+	if (skb_ensure_writable(pskb, pskb->len))
+ 		return NF_DROP;
+ 
+ 	/* call the function provided by --function parameter or the default 'process_packet' defined in Lua */
+@@ -88,11 +88,11 @@ lua_tg(struct sk_buff *pskb, const struc
+ 	/* push the lua_packet_segment as a parameter */
+ 	p = (lua_packet_segment *)lua_newuserdata(L, sizeof(lua_packet_segment));
+ 	if (pskb->mac_header)
+-		p->start = pskb->mac_header;
+		p->start = skb_mac_header(pskb);
+ 	else if (pskb->network_header)
+-		p->start = pskb->network_header;
+		p->start = skb_network_header(pskb);
+ 	else if (pskb->transport_header)
+-		p->start = pskb->transport_header;
+		p->start = skb_transport_header(pskb);
+ 	p->offset = 0;
+ 	p->length = (unsigned long)pskb->tail - (unsigned long)p->start;
+ 	p->changes = NULL;
+@@ -208,16 +208,16 @@ static bool load_script_into_state(uint3
+  * some workqueue initialization. So far this is done each time this function
+  * is called, subject to change.
+  */
+-static bool
+static int
+ lua_tg_checkentry(const struct xt_tgchk_param *par)
+ {
+ 	const struct xt_lua_tginfo *info = par->targinfo;
+ 
+ 	if (load_script_into_state(info->state_id, info->script_size, (char *)info->buf)) {
+ 		lua_state_refs[info->state_id]++;
+-		return true;
+		return 0;
+ 	}
+-	return false;
+	return -EINVAL;
+ }
+ 
+ /*::*
+--- a/extensions/LUA/lua/llimits.h
+++ b/extensions/LUA/lua/llimits.h
+@@ -8,7 +8,6 @@
+ #define llimits_h
+ 
+ #include <stddef.h>
+-#include <limits.h>
+ 
+ #include "lua.h"
+ 
+--- a/extensions/LUA/lua/lapi.c
+++ b/extensions/LUA/lua/lapi.c
+@@ -4,9 +4,6 @@
+ ** See Copyright Notice in lua.h
+ */
+ 
+-#include <stdarg.h>
+-#include <math.h>
+-#include <assert.h>
+ #include <string.h>
+ 
+ #define lapi_c
+--- a/extensions/LUA/lua/ltable.c
+++ b/extensions/LUA/lua/ltable.c
+@@ -18,7 +18,6 @@
+ ** Hence even when the load factor reaches 100%, performance remains good.
+ */
+ 
+-#include <math.h>
+ #include <string.h>
+ 
+ #define ltable_c
+--- a/extensions/LUA/lua/luaconf.h
+++ b/extensions/LUA/lua/luaconf.h
+@@ -13,8 +13,12 @@
+ #if !defined(__KERNEL__)
+ #include <limits.h>
+ #else
+#include <linux/kernel.h>
+
+#undef UCHAR_MAX
+#undef BUFSIZ
+#undef NO_FPU
+ #define UCHAR_MAX	255
+-#define SHRT_MAX        32767
+ #define BUFSIZ 		8192
+ #define NO_FPU
+ #endif
+@@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l;
+ */
+ #if defined(__KERNEL__)
+ #undef LUA_USE_ULONGJMP
+#define setjmp __builtin_setjmp
+#define longjmp __builtin_longjmp
+ #endif
+ 
+ #if defined(__cplusplus)
+--- a/extensions/LUA/lua/llex.h
+++ b/extensions/LUA/lua/llex.h
+@@ -10,6 +10,8 @@
+ #include "lobject.h"
+ #include "lzio.h"
+ 
+/* prevent conflict with definition from asm/current.h */
+#undef current
+ 
+ #define FIRST_RESERVED	257
+ 
--- a/xtables-addons/patches/210-freebsd-build-fix.patch
+++ b/xtables-addons/patches/210-freebsd-build-fix.patch
@ -0,0 +1,11 @@
+--- a/extensions/LUA/Makefile
+++ b/extensions/LUA/Makefile
+@@ -110,7 +110,7 @@ PKG_CONFIG = /usr/bin/pkg-config
+ RANLIB = ranlib
+ SED = /bin/sed
+ SET_MAKE = 
+-SHELL = /bin/bash
+SHELL = /bin/sh
+ STRIP = strip
+ VERSION = 1.21
+ abs_builddir = /home/andre/Dropbox/xtables-addons/extensions/LUA